summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/folderrequester.cpp2
-rw-r--r--kmail/kmail_part.cpp4
-rw-r--r--kmail/kmcomposewin.cpp18
-rw-r--r--kmail/kmheaders.cpp2
-rw-r--r--kmail/kmmessage.cpp10
-rw-r--r--kmail/kmreaderwin.cpp2
-rw-r--r--kmail/messagecomposer.cpp2
-rw-r--r--kmail/objecttreeparser.cpp22
8 files changed, 31 insertions, 31 deletions
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index b04022bbe..93472437b 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -57,7 +57,7 @@ FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree )
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
- setFocusPolicy( Qt::StrongFocus );
+ setFocusPolicy( TQ_StrongFocus );
}
//-----------------------------------------------------------------------------
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 0a895d9b9..1b7a508f0 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -100,7 +100,7 @@ KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
- canvas->setFocusPolicy(Qt::ClickFocus);
+ canvas->setFocusPolicy(TQ_ClickFocus);
setWidget(canvas);
KGlobal::iconLoader()->addAppDir("kmail");
#if 0
@@ -125,7 +125,7 @@ KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
kapp->config());
TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
topLayout->addWidget(mainWidget);
- mainWidget->setFocusPolicy(Qt::ClickFocus);
+ mainWidget->setFocusPolicy(TQ_ClickFocus);
mStatusBar = new KMailStatusBarExtension(this);
mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false );
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index ff4659c86..42d55dcda 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -250,10 +250,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
TQToolTip::add( mBtnCc, tip );
TQToolTip::add( mBtnBcc, tip );
- mBtnTo->setFocusPolicy(Qt::NoFocus);
- mBtnCc->setFocusPolicy(Qt::NoFocus);
- mBtnBcc->setFocusPolicy(Qt::NoFocus);
- //mBtnFrom->setFocusPolicy(Qt::NoFocus);
+ mBtnTo->setFocusPolicy(TQ_NoFocus);
+ mBtnCc->setFocusPolicy(TQ_NoFocus);
+ mBtnBcc->setFocusPolicy(TQ_NoFocus);
+ //mBtnFrom->setFocusPolicy(TQ_NoFocus);
connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
@@ -386,10 +386,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
setCaption( i18n("Composer") );
setMinimumSize(200,200);
- mBtnIdentity->setFocusPolicy(Qt::NoFocus);
- mBtnFcc->setFocusPolicy(Qt::NoFocus);
- mBtnTransport->setFocusPolicy(Qt::NoFocus);
- mBtnDictionary->setFocusPolicy( Qt::NoFocus );
+ mBtnIdentity->setFocusPolicy(TQ_NoFocus);
+ mBtnFcc->setFocusPolicy(TQ_NoFocus);
+ mBtnTransport->setFocusPolicy(TQ_NoFocus);
+ mBtnDictionary->setFocusPolicy( TQ_NoFocus );
mAtmListView = new AttachmentListView( this, mSplitter,
"attachment list view" );
@@ -888,7 +888,7 @@ void KMComposeWin::slotView(void)
//This sucks awfully, but no, I cannot get an activated(int id) from
// actionContainer()
- if (!TQT_TQOBJECT(sender())->isA("KToggleAction"))
+ if (!TQT_TQOBJECT_CONST(sender())->isA("KToggleAction"))
return;
KToggleAction *act = (KToggleAction *) sender();
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index fc282fec3..987da0c60 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -144,7 +144,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *tqparent,
connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int)));
setShowSortIndicator(true);
- setFocusPolicy( Qt::WheelFocus );
+ setFocusPolicy( TQ_WheelFocus );
if (!pixmapsLoaded)
{
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 04af3d65b..e44d253bb 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -2367,11 +2367,11 @@ void KMMessage::setHeaderField( const TQCString& aName, const TQString& bValue,
kdDebug(5006) << "aValue: \"" << aValue << "\"" << endl;
#endif
}
- str = TQString(aName);
+ str = aName.data();
if (str[str.length()-1] != ':') str += ": ";
else str += ' ';
if ( !aValue.isEmpty() )
- str += TQString(aValue);
+ str += aValue.data();
if (str[str.length()-1] != '\n') str += '\n';
field = new DwField(str, mMsg);
@@ -3261,8 +3261,8 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
iM = parAV.tqfind('=');
if( -1 < iM )
{
- parA = TQString(parAV.left( iM ));
- parV = TQString(parAV.right( parAV.length() - iM - 1 ));
+ parA = parAV.left( iM ).data();
+ parV = parAV.right( parAV.length() - iM - 1 ).data();
if( ('"' == parV.at(0)) && ('"' == parV.at(parV.length()-1)) )
{
parV.erase( 0, 1);
@@ -3271,7 +3271,7 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
}
else
{
- parA = TQString(parAV);
+ parA = parAV.data();
parV = "";
}
DwParameter *param;
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 5b80dc0ab..1d2edb509 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -988,7 +988,7 @@ void KMReaderWin::writeConfig( bool sync ) const {
//-----------------------------------------------------------------------------
void KMReaderWin::initHtmlWidget(void)
{
- mViewer->widget()->setFocusPolicy(Qt::WheelFocus);
+ mViewer->widget()->setFocusPolicy(TQ_WheelFocus);
// Let's better be paranoid and disable plugins (it defaults to enabled):
mViewer->setPluginsEnabled(false);
mViewer->setJScriptEnabled(false); // just make this explicit
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index c7c4af6ed..cf3357fa3 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -1952,7 +1952,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
//kdDebug(5006) << "processStructuringInfo: mainHeader=" << mainHeader << endl;
DwString mainDwStr;
- mainDwStr = TQString(mainHeader + "\n\n");
+ mainDwStr = TQCString(mainHeader + "\n\n").data();
DwBodyPart mainDwPa( mainDwStr, 0 );
mainDwPa.Parse();
KMMessage::bodyPart( &mainDwPa, &resultingPart );
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 2cb44ab9b..cb9c420ac 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -1047,21 +1047,21 @@ namespace KMail {
const TQCString delimZ2("--__--__--\n\n_____________");
const TQCString delimZ1("--__--__--\r\n\r\n_____________");
TQCString partStr, digestHeaderStr;
- int thisDelim = cstr.tqfind(TQString(delim1), 0, false);
+ int thisDelim = cstr.tqfind(delim1.data(), 0, false);
if ( thisDelim == -1 )
- thisDelim = cstr.tqfind(TQString(delim2), 0, false);
+ thisDelim = cstr.tqfind(delim2.data(), 0, false);
if ( thisDelim == -1 ) {
kdDebug(5006) << " Sorry: Old style Mailman message but no delimiter found." << endl;
return false;
}
- int nextDelim = cstr.tqfind(TQString(delim1), thisDelim+1, false);
+ int nextDelim = cstr.tqfind(delim1.data(), thisDelim+1, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(TQString(delim2), thisDelim+1, false);
+ nextDelim = cstr.tqfind(delim2.data(), thisDelim+1, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(TQString(delimZ1), thisDelim+1, false);
+ nextDelim = cstr.tqfind(delimZ1.data(), thisDelim+1, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(TQString(delimZ2), thisDelim+1, false);
+ nextDelim = cstr.tqfind(delimZ2.data(), thisDelim+1, false);
if ( nextDelim < 0)
return false;
@@ -1101,7 +1101,7 @@ namespace KMail {
partStr += cstr.mid( thisDelim, nextDelim-thisDelim );
TQCString subject("embedded message");
TQCString subSearch("\nSubject:");
- int subPos = partStr.tqfind(TQString(subSearch), 0, false);
+ int subPos = partStr.tqfind(subSearch.data(), 0, false);
if ( -1 < subPos ){
subject = partStr.mid(subPos+subSearch.length());
thisEoL = subject.tqfind('\n');
@@ -1114,13 +1114,13 @@ namespace KMail {
subject, true );
//mReader->queueHtml("<br><hr><br>");
thisDelim = nextDelim+1;
- nextDelim = cstr.tqfind(TQString(delim1), thisDelim, false);
+ nextDelim = cstr.tqfind(delim1.data(), thisDelim, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(TQString(delim2), thisDelim, false);
+ nextDelim = cstr.tqfind(delim2.data(), thisDelim, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(TQString(delimZ1), thisDelim, false);
+ nextDelim = cstr.tqfind(delimZ1.data(), thisDelim, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(TQString(delimZ2), thisDelim, false);
+ nextDelim = cstr.tqfind(delimZ2.data(), thisDelim, false);
}
// reset curent node's Content-Type
curNode->setType( DwMime::kTypeText );