summaryrefslogtreecommitdiffstats
path: root/libemailfunctions
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /libemailfunctions
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'libemailfunctions')
-rw-r--r--libemailfunctions/networkstatus.cpp36
-rw-r--r--libemailfunctions/networkstatus.h20
-rw-r--r--libemailfunctions/tests/testemail.cpp2
3 files changed, 29 insertions, 29 deletions
diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp
index e5e311f94..100d99227 100644
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@@ -29,58 +29,58 @@
using namespace KPIM;
-static KStaticDeleter<NetworkStatus> networkStatusDeleter;
-NetworkStatus *NetworkStatus::mSelf = 0;
+static KStaticDeleter<NetworktqStatus> networkStatusDeleter;
+NetworktqStatus *NetworktqStatus::mSelf = 0;
-NetworkStatus::NetworkStatus()
+NetworktqStatus::NetworktqStatus()
: TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" )
{
KConfigGroup group( KGlobal::config(), "NetworkStatus" );
if ( group.readBoolEntry( "Online", true ) == true )
- mStatus = Online;
+ mtqStatus = Online;
else
- mStatus = Offline;
+ mtqStatus = Offline;
connectDCOPSignal( 0, 0, "onlineStatusChanged()", "onlineStatusChanged()", false );
}
-NetworkStatus::~NetworkStatus()
+NetworktqStatus::~NetworktqStatus()
{
KConfigGroup group( KGlobal::config(), "NetworkStatus" );
- group.writeEntry( "Online", mStatus == Online );
+ group.writeEntry( "Online", mtqStatus == Online );
}
-void NetworkStatus::seStatus( Status status )
+void NetworktqStatus::setqStatus( tqStatus status )
{
- mStatus = status;
+ mtqStatus = status;
- emit statusChanged( mStatus );
+ emit statusChanged( mtqStatus );
}
-NetworkStatus::Status NetworkStatus::status() const
+NetworktqStatus::tqStatus NetworktqStatus::status() const
{
- return mStatus;
+ return mtqStatus;
}
-void NetworkStatus::onlineStatusChanged()
+void NetworktqStatus::onlineStatusChanged()
{
DCOPRef dcopCall( "kded", "networkstatus" );
DCOPReply reply = dcopCall.call( "onlineStatus()", true );
if ( reply.isValid() ) {
int status = reply;
if ( status == 3 )
- seStatus( Online );
+ setqStatus( Online );
else {
- if ( mStatus != Offline )
- seStatus( Offline );
+ if ( mtqStatus != Offline )
+ setqStatus( Offline );
}
}
}
-NetworkStatus *NetworkStatus::self()
+NetworktqStatus *NetworktqStatus::self()
{
if ( !mSelf )
- networkStatusDeleter.setObject( mSelf, new NetworkStatus );
+ networkStatusDeleter.setObject( mSelf, new NetworktqStatus );
return mSelf;
}
diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h
index 7a8b3c1b2..963aa6fed 100644
--- a/libemailfunctions/networkstatus.h
+++ b/libemailfunctions/networkstatus.h
@@ -32,7 +32,7 @@ namespace KPIM {
the machine KDE is running on going from "online" mode to
offline. What this means is left as an exercise for the reader.
*/
-class NetworkStatus : public TQObject, public DCOPObject
+class NetworktqStatus : public TQObject, public DCOPObject
{
Q_OBJECT
@@ -40,7 +40,7 @@ class NetworkStatus : public TQObject, public DCOPObject
/**
* The possible states.
*/
- enum Status {
+ enum tqStatus {
Online, //< The machine now has internet connectivity
Offline //< The machine has no internet connectivity
};
@@ -48,24 +48,24 @@ class NetworkStatus : public TQObject, public DCOPObject
/**
* Destructor.
*/
- ~NetworkStatus();
+ ~NetworktqStatus();
/**
* Returns the only instance of this class.
*/
- static NetworkStatus *self();
+ static NetworktqStatus *self();
/**
* Sets a new status.
*
* @param status The new status.
*/
- void seStatus( Status status );
+ void setqStatus( tqStatus status );
/**
* Returns the current status.
*/
- Status status() const;
+ tqStatus status() const;
k_dcop:
/**
@@ -79,18 +79,18 @@ class NetworkStatus : public TQObject, public DCOPObject
*
* @param status The new status.
*/
- void statusChanged( Status status );
+ void statusChanged( tqStatus status );
protected:
/**
* Constructor. This is protected, so you must use self()
* to get the singleton object of this class.
*/
- NetworkStatus();
+ NetworktqStatus();
private:
- Status mStatus;
- static NetworkStatus *mSelf;
+ tqStatus mtqStatus;
+ static NetworktqStatus *mSelf;
};
}
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index c7205ab86..90a6a862e 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -57,7 +57,7 @@ static bool checkGetNameAndEmail(const TQString& input, const TQString& expName,
{
TQString name, email;
bool retVal = KPIM::getNameAndMail(input, name, email);
- check( "getNameAndMail " + input + " retVal", retVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ), expRetVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ) );
+ check( "getNameAndMail " + input + " retVal", retVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ), expRetVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ) );
check( "getNameAndMail " + input + " name", name, expName );
check( "getNameAndMail " + input + " email", email, expEmail );
return true;