diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kmail/kmkernel.cpp | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmkernel.cpp')
-rw-r--r-- | kmail/kmkernel.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index d0e706f90..b464913b6 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -11,7 +11,7 @@ #include "globalsettings.h" #include "broadcaststatus.h" -using KPIM::BroadcastStatus; +using KPIM::BroadcasStatus; #include "kmstartup.h" #include "index.h" #include "kmmainwin.h" @@ -814,7 +814,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, int retval; bool readFolderMsgIds = false; TQString _foldername = foldername.stripWhiteSpace(); - _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences + _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences if ( foldername != mAddMessageLastFolder ) { mAddMessageMsgIds.clear(); @@ -840,7 +840,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, msg->fromString( messageText ); if (readFolderMsgIds) { - if ( foldername.contains("/")) { + if ( foldername.tqcontains("/")) { TQString tmp_fname = ""; KMFolder *folder = NULL; KMFolderDir *subfolder; @@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, if ( !MsgStatusFlags.isEmpty() ) { KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->setStatus(status); + if (status) msg->seStatus(status); } int index; @@ -1000,7 +1000,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, bool createNewFolder = false; TQString _foldername = foldername.stripWhiteSpace(); - _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences + _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences if ( foldername != mAddMessageLastFolder ) { createNewFolder = true; @@ -1018,7 +1018,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, msg->fromString( messageText ); if (createNewFolder) { - if ( foldername.contains("/")) { + if ( foldername.tqcontains("/")) { TQString tmp_fname = ""; KMFolder *folder = NULL; KMFolderDir *subfolder; @@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, if( !MsgStatusFlags.isEmpty() ) { KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->setStatus(status); + if (status) msg->seStatus(status); } if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) { @@ -1121,7 +1121,7 @@ void KMKernel::raise() kmail.call( "newInstance" ); } -bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ ) +bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ ) { KMMainWidget *mainWidget = 0; if (KMainWindow::memberList) { @@ -1170,7 +1170,7 @@ bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ ) return false; } -TQString KMKernel::getFrom( Q_UINT32 serialNumber ) +TQString KMKernel::getFrom( TQ_UINT32 serialNumber ) { int idx = -1; KMFolder *folder = 0; @@ -1195,7 +1195,7 @@ TQString KMKernel::debugScheduler() return res; } -TQString KMKernel::debugSernum( Q_UINT32 serialNumber ) +TQString KMKernel::debugSernum( TQ_UINT32 serialNumber ) { TQString res; if (serialNumber != 0) { @@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline ); - BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); + BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); } @@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online ); - BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); + BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); if ( kmkernel->msgSender()->sendImmediate() ) { @@ -1597,7 +1597,7 @@ void KMKernel::init() bool KMKernel::isCodecAsciiCompatible( const TQTextCodec *codec ) { - return !mNonAsciiCompatibleCodecs.contains( codec ); + return !mNonAsciiCompatibleCodecs.tqcontains( codec ); } void KMKernel::readConfig() @@ -1880,7 +1880,7 @@ bool KMKernel::transferMail( TQString & destinationDir ) "%1 now uses the <i>%5</i> folder for " "its messages.<p>" "%2 can move the contents of <i>%6<i> into this folder for " - "you, though this may replace any existing files with " + "you, though this may tqreplace any existing files with " "the same name in <i>%7</i>.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) @@ -1975,7 +1975,7 @@ void KMKernel::dumpDeadLetters() // yes, this is ugly and potentially dangerous, but the alternative is losing // currently composed messages... while ( win->isComposing() ) - qApp->processEvents(); + tqApp->processEvents(); } } } @@ -2046,7 +2046,7 @@ void KMKernel::slotResult(KIO::Job *job) if (job->error() == KIO::ERR_FILE_ALREADY_EXIST) { if (KMessageBox::warningContinueCancel(0, - i18n("File %1 exists.\nDo you want to replace it?") + i18n("File %1 exists.\nDo you want to tqreplace it?") .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) byteArrayToRemoteFile((*it).data, (*it).url, true); @@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath ) KMMainWidget *KMKernel::getKMMainWidget() { //This could definitely use a speadup - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = kapp->tqtopLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; while ( ( wid = it.current() ) != 0 ) { ++it; - TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" ); + TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" ); if (l2 && l2->first()) { KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() ); Q_ASSERT( kmmw ); @@ -2466,10 +2466,10 @@ Wallet *KMKernel::wallet() { // find an appropriate parent window for the wallet dialog WId window = 0; - if ( qApp->activeWindow() ) - window = qApp->activeWindow()->winId(); + if ( tqApp->activeWindow() ) + window = tqApp->activeWindow()->winId(); else if ( getKMMainWidget() ) - window = getKMMainWidget()->topLevelWidget()->winId(); + window = getKMMainWidget()->tqtopLevelWidget()->winId(); delete mWallet; mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window ); |