3 files changed, 29 insertions, 29 deletions

diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp
index 100d99227..e5e311f94 100644
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@@ -29,58 +29,58 @@
 
 using namespace KPIM;
 
-static KStaticDeleter<NetworktqStatus> networkStatusDeleter;
-NetworktqStatus *NetworktqStatus::mSelf = 0;
+static KStaticDeleter<NetworkStatus> networkStatusDeleter;
+NetworkStatus *NetworkStatus::mSelf = 0;
 
-NetworktqStatus::NetworktqStatus()
+NetworkStatus::NetworkStatus()
   : TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" )
 {
   KConfigGroup group( KGlobal::config(), "NetworkStatus" );
   if ( group.readBoolEntry( "Online", true ) == true )
-    mtqStatus = Online;
+    mStatus = Online;
   else
-    mtqStatus = Offline;
+    mStatus = Offline;
 
   connectDCOPSignal( 0, 0, "onlineStatusChanged()", "onlineStatusChanged()", false );
 }
 
-NetworktqStatus::~NetworktqStatus()
+NetworkStatus::~NetworkStatus()
 {
   KConfigGroup group( KGlobal::config(), "NetworkStatus" );
-  group.writeEntry( "Online", mtqStatus == Online );
+  group.writeEntry( "Online", mStatus == Online );
 }
 
-void NetworktqStatus::setqStatus( tqStatus status )
+void NetworkStatus::seStatus( Status status )
 {
-  mtqStatus = status;
+  mStatus = status;
 
-  emit statusChanged( mtqStatus );
+  emit statusChanged( mStatus );
 }
 
-NetworktqStatus::tqStatus NetworktqStatus::status() const
+NetworkStatus::Status NetworkStatus::status() const
 {
-  return mtqStatus;
+  return mStatus;
 }
 
-void NetworktqStatus::onlineStatusChanged()
+void NetworkStatus::onlineStatusChanged()
 {
   DCOPRef dcopCall( "kded", "networkstatus" );
   DCOPReply reply = dcopCall.call( "onlineStatus()", true );
   if ( reply.isValid() ) {
     int status = reply;
     if ( status == 3 )
-      setqStatus( Online );
+      seStatus( Online );
     else {
-      if ( mtqStatus != Offline )
-        setqStatus( Offline );
+      if ( mStatus != Offline )
+        seStatus( Offline );
     }
   }
 }
 
-NetworktqStatus *NetworktqStatus::self()
+NetworkStatus *NetworkStatus::self()
 {
   if ( !mSelf )
-    networkStatusDeleter.setObject( mSelf, new NetworktqStatus );
+    networkStatusDeleter.setObject( mSelf, new NetworkStatus );
 
   return mSelf;
 }
diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h
index 963aa6fed..7a8b3c1b2 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 NetworktqStatus : public TQObject, public DCOPObject
+class NetworkStatus : public TQObject, public DCOPObject
 {
   Q_OBJECT
 
@@ -40,7 +40,7 @@ class NetworktqStatus : public TQObject, public DCOPObject
     /**
      * The possible states.
      */
-    enum tqStatus {
+    enum Status {
       Online,     //< The machine now has internet connectivity
       Offline     //< The machine has no internet connectivity
     };
@@ -48,24 +48,24 @@ class NetworktqStatus : public TQObject, public DCOPObject
     /**
      * Destructor.
      */
-    ~NetworktqStatus();
+    ~NetworkStatus();
 
     /**
      * Returns the only instance of this class.
      */
-    static NetworktqStatus *self();
+    static NetworkStatus *self();
 
     /**
      * Sets a new status.
      *
      * @param status The new status.
      */
-    void setqStatus( tqStatus status );
+    void seStatus( Status status );
 
     /**
      * Returns the current status.
      */
-    tqStatus status() const;
+    Status status() const;
 
   k_dcop:
     /**
@@ -79,18 +79,18 @@ class NetworktqStatus : public TQObject, public DCOPObject
      *
      * @param status The new status.
      */
-    void statusChanged( tqStatus status );
+    void statusChanged( Status status );
 
   protected:
     /**
      * Constructor. This is protected, so you must use self()
      * to get the singleton object of this class.
      */
-    NetworktqStatus();
+    NetworkStatus();
 
   private:
-    tqStatus mtqStatus;
-    static NetworktqStatus *mSelf;
+    Status mStatus;
+    static NetworkStatus *mSelf;
 };
 
 }
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index 90a6a862e..c7205ab86 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::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ), expRetVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ) );
+  check( "getNameAndMail " + input + " retVal", retVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ), expRetVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ) );
   check( "getNameAndMail " + input + " name", name, expName );
   check( "getNameAndMail " + input + " email", email, expEmail );
   return true;