From a51cd9949c4e6c726a84a61de3cfadd30cefb5c7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:57:02 -0600
Subject: Remove additional unneeded tq method conversions

---
 dcop/KDE-ICE/ICElib.h    | 4 ++--
 dcop/KDE-ICE/ICEmsg.h    | 4 ++--
 dcop/KDE-ICE/shutdown.c  | 4 ++--
 dcop/client/dcop.cpp     | 2 +-
 dcop/client/dcopfind.cpp | 2 +-
 dcop/dcopref.h           | 2 +-
 dcop/dcopserver.cpp      | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'dcop')

diff --git a/dcop/KDE-ICE/ICElib.h b/dcop/KDE-ICE/ICElib.h
index 69c2c2228..f22a36f4f 100644
--- a/dcop/KDE-ICE/ICElib.h
+++ b/dcop/KDE-ICE/ICElib.h
@@ -89,7 +89,7 @@ typedef enum {
     IceClosedASAP,
     IceConnectionInUse,
     IceStartedShutdownNegotiation
-} IceCloseStatus;
+} IceClosetStatus;
 
 typedef enum {
     IceProcessMessagesSuccess,
@@ -398,7 +398,7 @@ extern Bool IceCheckShutdownNegotiation (
 
 #define IceCloseConnection KDE_IceCloseConnection
 
-extern IceCloseStatus IceCloseConnection (
+extern IceClosetStatus IceCloseConnection (
 #if NeedFunctionPrototypes
     IceConn		/* iceConn */
 #endif
diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h
index 666d776b6..cf4d98975 100644
--- a/dcop/KDE-ICE/ICEmsg.h
+++ b/dcop/KDE-ICE/ICEmsg.h
@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
 
 
 /*
- * Write pad bytes.  Used to force 32 or 64 bit tqalignment.
+ * Write pad bytes.  Used to force 32 or 64 bit alignment.
  * A maxium of 7 pad bytes can be specified.
  */
 
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
 
 
 /*
- * Read pad bytes (for 32 or 64 bit tqalignment).
+ * Read pad bytes (for 32 or 64 bit alignment).
  * A maxium of 7 pad bytes can be specified.
  */
 
diff --git a/dcop/KDE-ICE/shutdown.c b/dcop/KDE-ICE/shutdown.c
index 740126fa4..8059dec76 100644
--- a/dcop/KDE-ICE/shutdown.c
+++ b/dcop/KDE-ICE/shutdown.c
@@ -102,14 +102,14 @@ IceConn     iceConn;
 
 
 
-IceCloseStatus
+IceClosetStatus
 IceCloseConnection (iceConn)
 
 IceConn     iceConn;
 
 {
     int refCountReachedZero;
-    IceCloseStatus status;
+    IceClosetStatus status;
 
     /*
      * If this connection object was never valid, we can close
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 0eafb5055..14cae2609 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -262,7 +262,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 		}
 		if ( s == static_cast<int>(partl.count())-1)
 		{
-			partl.remove(partl.tqat(s));
+			partl.remove(partl.at(s));
 		}
 
 		lt = partl.join(" ");
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index bde116f65..17bf7d727 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -98,7 +98,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 		}
 		if (s==(int)partl.count()-1)
 		{
-			partl.remove(partl.tqat(s));
+			partl.remove(partl.at(s));
 		}
 
 	    	lt = partl.join(" ");
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index f1f2f5af5..46116124d 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -396,7 +396,7 @@ public:
      * Flag for allowing entering the event loop if the call blocks too long.
      * @p NoEventLoop disables entering the event loop.
      * @p UseEventLoop allows entering the event loop while waiting for long
-     * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
+     * blocking DCOP call, thus making the GUI repaint if needed, and possibly
      * allowing also other code in the application to be executed.
      * @see DCOPClient::call()
      */
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index 8da59df04..a4c123b85 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -126,8 +126,8 @@ static TQCString readQCString(TQDataStream &ds)
    TQCString result;
    TQ_UINT32 len;
    ds >> len;
-   TQIODevice *device = ds.tqdevice();
-   int bytesLeft = device->size()-device->tqat();
+   TQIODevice *device = ds.device();
+   int bytesLeft = device->size()-device->at();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
       qWarning("Corrupt data!\n");
@@ -145,8 +145,8 @@ static TQByteArray readQByteArray(TQDataStream &ds)
    TQByteArray result;
    TQ_UINT32 len;
    ds >> len;
-   TQIODevice *device = ds.tqdevice();
-   int bytesLeft = device->size()-device->tqat();
+   TQIODevice *device = ds.device();
+   int bytesLeft = device->size()-device->at();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
       qWarning("Corrupt data!\n");
-- 
cgit v1.2.1