diff options
author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-07 21:52:03 +0000 |
---|---|---|
committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-07 21:52:03 +0000 |
commit | 87e9213ec5e89eb135a483f7635ea3d0c663e891 (patch) | |
tree | 102f615eec745b55747a2d97997f72315630a76f /libkdepim | |
parent | 42c6ef8e5041733f6eaed7a133802e63ee1c05e5 (diff) | |
download | tdepim-87e9213ec5e89eb135a483f7635ea3d0c663e891.tar.gz tdepim-87e9213ec5e89eb135a483f7635ea3d0c663e891.zip |
[kdepim] revert some accidental renamed classes/methods and strings (fix quote reply)
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1230817 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdepim')
-rw-r--r-- | libkdepim/broadcaststatus.cpp | 24 | ||||
-rw-r--r-- | libkdepim/broadcaststatus.h | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp index e3f16c32d..a50479195 100644 --- a/libkdepim/broadcaststatus.cpp +++ b/libkdepim/broadcaststatus.cpp @@ -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 diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h index 24365580b..93e789430 100644 --- a/libkdepim/broadcaststatus.h +++ b/libkdepim/broadcaststatus.h @@ -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_; }; |