TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

[kdepim] revert some accidental renamed classes/methods and strings (fix quote reply)

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1230817 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent 42c6ef8e50
commit 87e9213ec5
26 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File

4
kmail/accountmanager.cpp
Unescape View File

@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
if ( mAcctChecking.isEmpty() ) {
// all checks finished, display summary
if ( mDisplaySummary )
KPIM::BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
KPIM::BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
mTotalNewMailsArrived );
emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
mTotalNewMailsArrived = 0;
@ -222,7 +222,7 @@ void AccountManager::processNextCheck( bool _newMail )
connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( processNextCheck( bool ) ) );
KPIM::BroadcastqStatus::instance()->seStatusMsg(
KPIM::BroadcastStatus::instance()->seStatusMsg(
i18n("Checking account %1 for new mail").tqarg(curAccount->name()));
kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;

8
kmail/compactionjob.cpp
Unescape View File

@ -28,7 +28,7 @@
#include "compactionjob.h"
#include "kmfolder.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmfoldermbox.h"
#include "kmfoldermaildir.h"
@ -97,7 +97,7 @@ int MboxCompactionJob::executeNow( bool silent )
kdDebug(5006) << storage->location() << " compaction skipped." << endl;
if ( !mSilent ) {
TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() );
BroadcastqStatus::instance()->seStatusMsg( str );
BroadcastStatus::instance()->seStatusMsg( str );
}
return 0;
}
@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
mErrorCode = rc;
if ( !mSilent )
BroadcastqStatus::instance()->seStatusMsg( str );
BroadcastStatus::instance()->seStatusMsg( str );
mFolderOpen = false;
deleteLater(); // later, because of the "return mErrorCode"
@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
if ( storage->isOpened() )
storage->updateIndex();
if ( !mSilent )
BroadcastqStatus::instance()->seStatusMsg( str );
BroadcastStatus::instance()->seStatusMsg( str );
mFolderOpen = false;
deleteLater(); // later, because of the "return mErrorCode"

6
kmail/expirejob.cpp
Unescape View File

@ -31,7 +31,7 @@
#include "globalsettings.h"
#include "folderstorage.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmcommands.h"
#include <kdebug.h>
@ -190,7 +190,7 @@ void ExpireJob::done()
}
}
if ( !str.isEmpty() )
BroadcastqStatus::instance()->seStatusMsg( str );
BroadcastStatus::instance()->seStatusMsg( str );
KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
}
default: ;
}
BroadcastqStatus::instance()->seStatusMsg( msg );
BroadcastStatus::instance()->seStatusMsg( msg );
deleteLater();
}

8
kmail/imapaccountbase.cpp
Unescape View File

@ -32,7 +32,7 @@ using KMail::SieveConfig;
using KMail::AccountManager;
#include "kmfolder.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmmainwin.h"
#include "kmfolderimap.h"
#include "kmmainwidget.h"
@ -354,7 +354,7 @@ namespace KMail {
checkDone( false, CheckOK );
}
if ( showStatusMsg )
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
name(), newMails);
}
@ -961,10 +961,10 @@ namespace KMail {
KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
// Show it in the status bar, in case the user has ticked "don't show again"
if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
KPIM::BroadcastqStatus::instance()->seStatusMsg(
KPIM::BroadcastStatus::instance()->seStatusMsg(
i18n( "The connection to account %1 was broken." ).tqarg( name() ) );
else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
KPIM::BroadcastqStatus::instance()->seStatusMsg(
KPIM::BroadcastStatus::instance()->seStatusMsg(
i18n( "The connection to account %1 timed out." ).tqarg( name() ) );
} else {
if ( !errors.isEmpty() )

6
kmail/kmaccount.cpp
Unescape View File

@ -12,7 +12,7 @@ using KMail::AccountManager;
#include "messagesender.h"
#include "kmmessage.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmfoldercachedimap.h"
#include "progressmanager.h"
@ -45,7 +45,7 @@ using KMail::FolderJob;
KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
: TQObject(tqparent), mPrecommand(precommand)
{
BroadcastqStatus::instance()->seStatusMsg(
BroadcastStatus::instance()->seStatusMsg(
i18n("Executing precommand %1").tqarg(precommand ));
mPrecommandProcess.setUseShell(true);
@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
KMPrecommand precommandProcess(precommand, this);
BroadcastqStatus::instance()->seStatusMsg(
BroadcastStatus::instance()->seStatusMsg(
i18n("Executing precommand %1").tqarg(precommand ));
connect(&precommandProcess, TQT_SIGNAL(finished(bool)),

2
kmail/kmacctimap.cpp
Unescape View File

@ -28,7 +28,7 @@ using KMail::SieveConfig;
#include "kmmessage.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmfoldertree.h"
#include "kmfoldermgr.h"
#include "kmfolderimap.h"

22
kmail/kmacctlocal.cpp
Unescape View File

@ -8,7 +8,7 @@
#include "kmfoldermbox.h"
#include "kmacctfolder.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "progressmanager.h"
using KPIM::ProgressManager;
@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
if ( precommand().isEmpty() ) {
TQFileInfo fi( location() );
if ( fi.size() == 0 ) {
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
checkDone( mHasNewMail, CheckOK );
return false;
}
@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
if (!mFolder) {
checkDone( mHasNewMail, CheckError );
BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return false;
}
//BroadcastqStatus::instance()->reset();
BroadcastqStatus::instance()->seStatusMsg(
//BroadcastStatus::instance()->reset();
BroadcastStatus::instance()->seStatusMsg(
i18n("Preparing transmission from \"%1\"...").tqarg(mName));
@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
{
kdDebug(5006) << "cannot run precommand " << precommand() << endl;
checkDone( mHasNewMail, CheckError );
BroadcastqStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
BroadcastStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
return false;
}
@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
<< mMailFolder->name() << endl;
checkDone( mHasNewMail, CheckError );
BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return false;
}
@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess()
checkDone( mHasNewMail, CheckError );
TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
.tqarg( mMailFolder->location() );
BroadcastqStatus::instance()->seStatusMsg( errMsg );
BroadcastStatus::instance()->seStatusMsg( errMsg );
return false;
}
@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
.tqarg(mMailFolder->location()).tqarg( mNumMsgs );
//BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
//BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true );
return true;
}
@ -193,7 +193,7 @@ bool KMAcctLocal::fetchMsg()
if (kmkernel->mailCheckAborted()) break; */
const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched );
//BroadcastqStatus::instance()->seStatusMsg( statusMsg );
//BroadcastStatus::instance()->seStatusMsg( statusMsg );
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
mMailCheckProgressItem->setqStatus( statusMsg );
@ -249,7 +249,7 @@ void KMAcctLocal::postProcess()
}
if( mMailCheckProgressItem ) { // do this only once...
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from mailbox %1.",
"Fetched %n messages from mailbox %1.",

18
kmail/kmacctmaildir.cpp
Unescape View File

@ -9,7 +9,7 @@
#include "kmfoldermaildir.h"
#include "kmacctfolder.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "progressmanager.h"
using KPIM::ProgressManager;
@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
TQFileInfo fi( location() );
if ( !fi.exists() ) {
checkDone( hasNewMail, CheckOK );
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
return;
}
}
@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
if (!mFolder) {
checkDone( hasNewMail, CheckError );
BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return;
}
BroadcastqStatus::instance()->seStatusMsg(
BroadcastStatus::instance()->seStatusMsg(
i18n("Preparing transmission from \"%1\"...").tqarg(mName));
Q_ASSERT( !mMailCheckProgressItem );
@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
{
kdDebug(5006) << "cannot run precommand " << precommand() << endl;
checkDone( hasNewMail, CheckError );
BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return;
}
@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool)
KMessageBox::sorry(0, aStr);
kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
checkDone( hasNewMail, CheckError );
BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return;
}
@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
{
if( kmkernel->mailCheckAborted() ) {
BroadcastqStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
BroadcastStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
num = i;
addedOk = false;
}
@ -188,7 +188,7 @@ void KMAcctMaildir::processNewMail(bool)
}
if( mMailCheckProgressItem ) { // do this only once...
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( num );
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num );
mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from maildir folder %1.",
"Fetched %n messages from maildir folder %1.",
@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
}
if (addedOk)
{
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
}
// else warning is written already

8
kmail/kmcommands.cpp
Unescape View File

@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
clip->setText( address );
clip->setSelectionMode( false );
clip->setText( address );
KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
} else {
// put the url into the mouse selection and the clipboard
clip->setSelectionMode( true );
clip->setText( mUrl.url() );
clip->setSelectionMode( false );
clip->setText( mUrl.url() );
KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
}
return OK;
@ -1742,7 +1742,7 @@ KMCommand::Result KMFilterActionCommand::execute()
progressItem->updateProgress();
TQString statusMsg = i18n("Filtering message %1 of %2");
statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
}
@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
(mUrl.protocol() == "smb") || (mUrl.protocol() == "fish") ||
(mUrl.protocol() == "news"))
{
KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n("Opening URL..."));
KPIM::BroadcastStatus::instance()->seStatusMsg( i18n("Opening URL..."));
KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
if (mime->name() == "application/x-desktop" ||
mime->name() == "application/x-executable" ||

2
kmail/kmfoldercachedimap.cpp
Unescape View File

@ -49,7 +49,7 @@ using KMail::AccountManager;
#include "kmglobal.h"
#include "acljobs.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "progressmanager.h"
using KMail::CachedImapJob;

6
kmail/kmfoldermbox.cpp
Unescape View File

@ -55,7 +55,7 @@
#include <sys/stat.h>
#include <sys/file.h>
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#ifndef MAX_LINE
#define MAX_LINE 4096
@ -1238,9 +1238,9 @@ int KMFolderMbox::compact( bool silent )
// If this is the current folder, the changed signal will ultimately call
// KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it
TQString statusMsg = BroadcastqStatus::instance()->statusMsg();
TQString statusMsg = BroadcastStatus::instance()->statusMsg();
emit changed();
BroadcastqStatus::instance()->seStatusMsg( statusMsg );
BroadcastStatus::instance()->seStatusMsg( statusMsg );
return rc;
}

20
kmail/kmheaders.cpp
Unescape View File

@ -22,7 +22,7 @@ using KMail::ActionScheduler;
#include "messagecopyhelper.h"
using KMail::MessageCopyHelper;
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "progressmanager.h"
using KPIM::ProgressManager;
using KPIM::ProgressItem;
@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
disconnect(mFolder, TQT_SIGNAL(closed()),
this, TQT_SLOT(folderClosed()));
disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
writeSortOrder();
mFolder->close("kmheaders");
@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
connect(mFolder, TQT_SIGNAL(closed()),
this, TQT_SLOT(folderClosed()));
connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
this, TQT_SLOT(setFolderInfotqStatus()));
connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfotqStatus ()
: i18n( "0 messages" ); // no need for "0 unread" to be added here
if ( mFolder->isReadOnly() )
str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str );
BroadcastqStatus::instance()->seStatusMsg(str);
BroadcastStatus::instance()->seStatusMsg(str);
}
//-----------------------------------------------------------------------------
@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
progressItem->updateProgress();
TQString statusMsg = i18n("Filtering message %1 of %2");
statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg );
KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
}
@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
command->start();
BroadcastqStatus::instance()->seStatusMsg("");
BroadcastStatus::instance()->seStatusMsg("");
// triggerUpdate();
}
@ -1620,7 +1620,7 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
if ( command->result() == KMCommand::OK ) {
// make sure the current item is shown
makeHeaderVisible();
BroadcastqStatus::instance()->seStatusMsg(
BroadcastStatus::instance()->seStatusMsg(
deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
} else {
/* The move failed or the user canceled it; reset the state of all
@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
}
triggerUpdate();
if ( command->result() == KMCommand::Failed )
BroadcastqStatus::instance()->seStatusMsg(
BroadcastStatus::instance()->seStatusMsg(
deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
else
BroadcastqStatus::instance()->seStatusMsg(
BroadcastStatus::instance()->seStatusMsg(
deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
}
mOwner->updateMessageActions();
@ -2135,7 +2135,7 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
return;
}
BroadcastqStatus::instance()->seStatusMsg("");
BroadcastStatus::instance()->seStatusMsg("");
if (markitread && idx >= 0) setMsgRead(idx);
mItems[idx]->irefresh();
mItems[idx]->tqrepaint();

6
kmail/kmkernel.cpp
Unescape View File

@ -11,7 +11,7 @@
#include "globalsettings.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmstartup.h"
#include "index.h"
#include "kmmainwin.h"
@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
return;
GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
BroadcastStatus::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 );
BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
if ( kmkernel->msgSender()->sendImmediate() ) {

10
kmail/kmmainwidget.cpp
Unescape View File

@ -46,7 +46,7 @@
#include "globalsettings.h"
#include "kcursorsaver.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "kmfoldermgr.h"
#include "kmfolderdia.h"
#include "accountmanager.h"
@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
if (mMsgView) mMsgView->clearCache();
if ( !isTrash )
BroadcastqStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
BroadcastStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
updateMessageActions();
@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder()
KCursorSaver busy(KBusyPtr::busy());
mFolder->compact( KMFolder::CompactNow );
// setCurrentItemByIndex will override the statusbar message, so save/restore it
TQString statusMsg = BroadcastqStatus::instance()->statusMsg();
TQString statusMsg = BroadcastStatus::instance()->statusMsg();
mHeaders->setCurrentItemByIndex(idx);
BroadcastqStatus::instance()->seStatusMsg( statusMsg );
BroadcastStatus::instance()->seStatusMsg( statusMsg );
}
}
@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
"Removed %n duplicate messages.", numDuplicates );
else
msg = i18n("No duplicate messages found.");
BroadcastqStatus::instance()->seStatusMsg( msg );
BroadcastStatus::instance()->seStatusMsg( msg );
}

2
kmail/kmmainwin.cpp
Unescape View File

@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *)
applyMainWindowSettings(KMKernel::config(), "Main Window");
connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
connect(kmkernel, TQT_SIGNAL(configChanged()),

4
kmail/kmreaderwin.cpp
Unescape View File

@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
}
if ( aUrl.stripWhiteSpace().isEmpty() ) {
KPIM::BroadcastqStatus::instance()->reset();
KPIM::BroadcastStatus::instance()->reset();
mHoveredUrl = KURL();
mLastClickImagePath = TQString();
return;
@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this );
kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl;
KPIM::BroadcastqStatus::instance()->setTransienStatusMsg( msg );
KPIM::BroadcastStatus::instance()->setTransienStatusMsg( msg );
}

4
kmail/popaccount.cpp
Unescape View File

@ -27,7 +27,7 @@
#include "popaccount.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
#include "progressmanager.h"
#include "kmfoldermgr.h"
#include "kmfiltermgr.h"
@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
if( mMailCheckProgressItem ) { // do this only once...
bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
// set mMailCheckProgressItem = 0 before calling setComplete() to prevent
// a race condition

8
kmail/templateparser.cpp
Unescape View File

@ -297,11 +297,11 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
tqarg( path ).tqarg(file.errorString() ));
}
} else if ( cmd.startsWith( "TQUOTEPIPE=" ) ) {
} else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
// pipe message body throw command and insert it as quotation
kdDebug() << "Command: TQUOTEPIPE=" << endl;
TQString q;
int len = parseQuotes( "TQUOTEPIPE=", cmd, q );
int len = parseQuotes( "QUOTEPIPE=", cmd, q );
i += len;
TQString pipe_cmd = q;
if ( mOrigMsg ) {
@ -311,9 +311,9 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
body.append( quote );
}
} else if ( cmd.startsWith( "TQUOTE" ) ) {
} else if ( cmd.startsWith( "QUOTE" ) ) {
kdDebug() << "Command: TQUOTE" << endl;
i += strlen( "TQUOTE" );
i += strlen( "QUOTE" );
if ( mOrigMsg ) {
TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, messageText( true ),
shouldStripSignature(), mAllowDecryption );

12
kmail/templatesconfiguration.cpp
Unescape View File

@ -323,7 +323,7 @@ void TemplatesConfiguration::loadFromPhrases()
str = replyPhrases.phraseReplySender();
if ( !str.isEmpty() ) {
textEdit_reply->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
textEdit_reply->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
}
else {
textEdit_reply->setText( defaultReply() );
@ -331,7 +331,7 @@ void TemplatesConfiguration::loadFromPhrases()
str = replyPhrases.phraseReplyAll();
if ( !str.isEmpty() ) {
textEdit_reply_all->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
textEdit_reply_all->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
}
else {
textEdit_reply_all->setText( defaultReplyAll() );
@ -372,7 +372,7 @@ void TemplatesConfiguration::importFromPhrases()
str = replyPhrases.phraseReplySender();
if ( !str.isEmpty() ) {
GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
}
else {
GlobalSettings::self()->setTemplateReply( defaultReply() );
@ -380,7 +380,7 @@ void TemplatesConfiguration::importFromPhrases()
str = replyPhrases.phraseReplyAll();
if ( !str.isEmpty() ) {
GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" );
GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" );
}
else {
GlobalSettings::self()->setTemplateReplyAll( defaultReplyAll() );
@ -521,7 +521,7 @@ TQString TemplatesConfiguration::defaultReply() {
"%BLANK\n"
"%REM=\"Default reply template\"%-\n"
"On %ODATEEN %OTIMELONGEN you wrote:\n"
"%TQUOTE\n"
"%QUOTE\n"
);
}
@ -531,7 +531,7 @@ TQString TemplatesConfiguration::defaultReplyAll() {
"%BLANK\n"
"%REM=\"Default reply all template\"%-\n"
"On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
"%TQUOTE\n"
"%QUOTE\n"
);
}

4
kmail/templatesinsertcommand.cpp
Unescape View File

@ -334,7 +334,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
emit insertCommand( static_cast<Command>( cmd ) );
switch( cmd ) {
case TemplatesInsertCommand::CQuote: emit insertCommand("%TQUOTE"); break;
case TemplatesInsertCommand::CQuote: emit insertCommand("%QUOTE"); break;
case TemplatesInsertCommand::CText: emit insertCommand("%TEXT"); break;
case TemplatesInsertCommand::COMsgId: emit insertCommand("%OMSGID"); break;
case TemplatesInsertCommand::CODate: emit insertCommand("%ODATE"); break;
@ -384,7 +384,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
case TemplatesInsertCommand::CFullSubject: emit insertCommand("%FULLSUBJECT"); break;
case TemplatesInsertCommand::CHeader: emit insertCommand("%HEADER=\"\"", -1); break;
case TemplatesInsertCommand::CSystem: emit insertCommand("%SYSTEM=\"\"", -1); break;
case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%TQUOTEPIPE=\"\"", -1); break;
case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%QUOTEPIPE=\"\"", -1); break;
case TemplatesInsertCommand::CTextPipe: emit insertCommand("%TEXTPIPE=\"\"", -1); break;
case TemplatesInsertCommand::CMsgPipe: emit insertCommand("%MSGPIPE=\"\"", -1); break;
case TemplatesInsertCommand::CBodyPipe: emit insertCommand("%BODYPIPE=\"\"", -1); break;

8
knode/knmainwidget.cpp
Unescape View File

@ -34,7 +34,7 @@
#include "broadcaststatus.h"
#include "krsqueezedtextlabel.h"
#include "recentaddresses.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
using KRecentAddress::RecentAddresses;
//GUI
@ -324,13 +324,13 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id)
bar->clear();
if (text.isEmpty() && (id==SB_MAIN)) {
if (knGlobals.netAccess()->currentMsg().isEmpty())
BroadcastqStatus::instance()->seStatusMsg(i18n(" Ready"));
BroadcastStatus::instance()->seStatusMsg(i18n(" Ready"));
else
BroadcastqStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg());
BroadcastStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg());
} else {
switch(id) {
case SB_MAIN:
BroadcastqStatus::instance()->seStatusMsg(text); break;
BroadcastStatus::instance()->seStatusMsg(text); break;
case SB_GROUP:
s_tatusGroup->setText(text); break;
case SB_FILTER:

2
knode/knode.cpp
Unescape View File

@ -55,7 +55,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
TQT_SLOT( setCaption(const TQString&)) );
setCentralWidget( m_mainWidget );
setupStatusBar();
connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
this, TQT_SLOT(slotShowStatusMsg(const TQString& )) );
createGUI( "knodeui.rc" );
knGlobals.instance = 0;

4
kontact/plugins/summary/summaryview_part.cpp
Unescape View File

@ -58,7 +58,7 @@
#include "summaryview_part.h"
#include "broadcaststatus.h"
using KPIM::BroadcastqStatus;
using KPIM::BroadcastStatus;
namespace Kontact
{
@ -177,7 +177,7 @@ void SummaryViewPart::updateWidgets()
mSummaries.insert( plugin->identifier(), summary );
connect( summary, TQT_SIGNAL( message( const TQString& ) ),
BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );

2
kontact/src/mainwindow.cpp
Unescape View File

@ -187,7 +187,7 @@ void MainWindow::initObject()
// done initializing
slotShowStatusMsg( TQString() );
connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) );
// launch commandline specified module if any

24
libkdepim/broadcaststatus.cpp
Unescape View File

@ -23,37 +23,37 @@
#include "broadcaststatus.h"
#include "progressmanager.h"
KPIM::BroadcastqStatus* KPIM::BroadcastqStatus::instance_ = 0;
static KStaticDeleter<KPIM::BroadcastqStatus> broadcasStatusDeleter;
KPIM::BroadcastStatus* KPIM::BroadcastStatus::instance_ = 0;
static KStaticDeleter<KPIM::BroadcastStatus> broadcasStatusDeleter;
namespace KPIM {
BroadcastqStatus* BroadcastqStatus::instance()
BroadcastStatus* BroadcastStatus::instance()
{
if (!instance_)
broadcasStatusDeleter.setObject( instance_, new BroadcastqStatus() );
broadcasStatusDeleter.setObject( instance_, new BroadcastStatus() );
return instance_;
}
BroadcastqStatus::BroadcastqStatus()
BroadcastStatus::BroadcastStatus()
:mTransientActive( false )
{
}
BroadcastqStatus::~BroadcastqStatus()
BroadcastStatus::~BroadcastStatus()
{
instance_ = 0;
}
void BroadcastqStatus::seStatusMsg( const TQString& message )
void BroadcastStatus::seStatusMsg( const TQString& message )
{
mStatusMsg = message;
if( !mTransientActive )
emit statusMsg( message );
}
void BroadcastqStatus::seStatusMsgWithTimestamp( const TQString& message )
void BroadcastStatus::seStatusMsgWithTimestamp( const TQString& message )
{
KLocale* locale = KGlobal::locale();
seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
@ -62,7 +62,7 @@ void BroadcastqStatus::seStatusMsgWithTimestamp( const TQString& message )
.tqarg( message ) );
}
void BroadcastqStatus::seStatusMsgTransmissionCompleted( int numMessages,
void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages,
int numBytes,
int numBytesRead,
int numBytesToRead,
@ -99,7 +99,7 @@ void BroadcastqStatus::seStatusMsgTransmissionCompleted( int numMessages,
item->setqStatus( statusMsg );
}
void BroadcastqStatus::seStatusMsgTransmissionCompleted( const TQString& account,
void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account,
int numMessages,
int numBytes,
int numBytesRead,
@ -147,13 +147,13 @@ void BroadcastqStatus::seStatusMsgTransmissionCompleted( const TQString& account
item->setqStatus( statusMsg );
}
void BroadcastqStatus::setTransienStatusMsg( const TQString& msg )
void BroadcastStatus::setTransienStatusMsg( const TQString& msg )
{
mTransientActive = true;
emit statusMsg( msg );
}
void BroadcastqStatus::reset()
void BroadcastStatus::reset()
{
mTransientActive = false;
// restore

10
libkdepim/broadcaststatus.h
Unescape View File

@ -29,17 +29,17 @@ class ProgressItem;
*/
class KDE_EXPORT BroadcastqStatus : public TQObject
class KDE_EXPORT BroadcastStatus : public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
virtual ~BroadcastqStatus();
virtual ~BroadcastStatus();
/** Return the instance of the singleton object for this class */
static BroadcastqStatus *instance();
static BroadcastStatus *instance();
/** Return the last status message from seStatusMsg() */
TQString statusMsg() const { return mStatusMsg; }
@ -83,10 +83,10 @@ signals:
protected:
BroadcastqStatus();
BroadcastStatus();
TQString mStatusMsg;
bool mTransientActive;
static BroadcastqStatus* instance_;
static BroadcastStatus* instance_;
};

Write Preview
Loading…
Cancel
Save