summaryrefslogtreecommitdiffstats
path: root/kmail/kmkernel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmkernel.cpp')
-rw-r--r--kmail/kmkernel.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index e6c641300..22b3c584e 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData )
return 1;
}
-KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags)
+KMMsgStatus KMKernel::strToStatus(const TQString &flags)
{
- KMMsgtqStatus status = 0;
+ KMMsgStatus status = 0;
if (!flags.isEmpty()) {
for (uint n = 0; n < flags.length() ; n++) {
switch (flags[n]) {
@@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
}
if ( !MsgStatusFlags.isEmpty() ) {
- KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
- if (status) msg->setqStatus(status);
+ KMMsgStatus status = strToStatus(MsgStatusFlags);
+ if (status) msg->seStatus(status);
}
int index;
@@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
int index;
if( !MsgStatusFlags.isEmpty() ) {
- KMMsgtqStatus status = strTotqStatus(MsgStatusFlags);
- if (status) msg->setqStatus(status);
+ KMMsgStatus status = strToStatus(MsgStatusFlags);
+ if (status) msg->seStatus(status);
}
if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber )
msg = folder->getMsgBase( idx );
if (msg) {
res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" )
- .tqarg( msg->subject() )
- .tqarg( msg->fromStrip() )
- .tqarg( msg->dateStr() ) );
+ .arg( msg->subject() )
+ .arg( msg->fromStrip() )
+ .arg( msg->dateStr() ) );
} else {
res.append( TQString( "Invalid serial number." ) );
}
@@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name)
KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n"
"please make sure that you can view and "
"modify the content of the folder '%2'.")
- .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) );
+ .arg( foldersPath ).arg( TQDir::homeDirPath() ) );
::exit(-1);
}
}
@@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name)
"incorrect;\n"
"please make sure that you can view and modify "
"the content of this folder.")
- .tqarg( foldersPath ) );
+ .arg( foldersPath ) );
::exit(-1);
}
}
@@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders()
cfld = static_cast<KMFolderCachedImap*>(the_dimapFolderMgr->createFolder(TQString::number(acct->id()),
false, KMFolderTypeCachedImap)->storage());
if (!cfld) {
- KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath())));
+ KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath())));
exit(-1);
}
cfld->folder()->setId( acct->id() );
@@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles()
if ( !folder || folder->isDir() || folder->isOpened() )
continue;
KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() );
- if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) {
+ if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) {
foldersWithBrokenIndex.append( index );
}
}
@@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
"the same name in <i>%7</i>.<p>"
"<strong>Would you like %3 to move the mail "
"files now?</strong></qt>" )
- .tqarg( kmailName, kmailName, kmailName )
- .tqarg( dir, destinationDir, dir, destinationDir );
+ .arg( kmailName, kmailName, kmailName )
+ .arg( dir, destinationDir, dir, destinationDir );
} else {
msg = i18n( "%1-%3 is the application name, %4-%6 are folder path",
"<qt>The <i>%4</i> folder exists. "
@@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
"this folder for you.<p>"
"<strong>Would you like %3 to move the mail "
"files now?</strong></qt>" )
- .tqarg( kmailName, kmailName, kmailName )
- .tqarg( dir, destinationDir, dir );
+ .arg( kmailName, kmailName, kmailName )
+ .arg( dir, destinationDir, dir );
}
TQString title = i18n( "Migrate Mail Files?" );
TQString buttonText = i18n( "Move" );
@@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job)
{
if (KMessageBox::warningContinueCancel(0,
i18n("File %1 exists.\nDo you want to replace it?")
- .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+ .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
== KMessageBox::Continue)
byteArrayToRemoteFile((*it).data, (*it).url, true);
}
@@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason )
mesg = i18n("KMail encountered a fatal error and will terminate now");
} else {
mesg = i18n("KMail encountered a fatal error and will "
- "terminate now.\nThe error was:\n%1").tqarg( reason );
+ "terminate now.\nThe error was:\n%1").arg( reason );
}
kdWarning() << mesg << endl;
@@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath )
KMMainWidget *KMKernel::getKMMainWidget()
{
//This could definitely use a speadup
- TQWidgetList *l = kapp->tqtopLevelWidgets();
+ TQWidgetList *l = kapp->topLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;
while ( ( wid = it.current() ) != 0 ) {
++it;
- TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" );
+ TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" );
if (l2 && l2->first()) {
KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() );
Q_ASSERT( kmmw );
@@ -2469,7 +2469,7 @@ Wallet *KMKernel::wallet() {
if ( tqApp->activeWindow() )
window = tqApp->activeWindow()->winId();
else if ( getKMMainWidget() )
- window = getKMMainWidget()->tqtopLevelWidget()->winId();
+ window = getKMMainWidget()->topLevelWidget()->winId();
delete mWallet;
mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );