summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:57:02 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:04:59 +0200
commit41b1d53a0144afe4c31425c18af25c2d6ade881b (patch)
tree4bf4a434c5db64325f317e56cc9d8d2a729df3e4 /dcop
parente2867c1f1eec514d56386f2fc5350eaaf760532a (diff)
downloadtdelibs-41b1d53a0144afe4c31425c18af25c2d6ade881b.tar.gz
tdelibs-41b1d53a0144afe4c31425c18af25c2d6ade881b.zip
Remove additional unneeded tq method conversions
(cherry picked from commit a51cd9949c4e6c726a84a61de3cfadd30cefb5c7)
Diffstat (limited to 'dcop')
-rw-r--r--dcop/KDE-ICE/ICElib.h4
-rw-r--r--dcop/KDE-ICE/ICEmsg.h4
-rw-r--r--dcop/KDE-ICE/shutdown.c4
-rw-r--r--dcop/client/dcop.cpp2
-rw-r--r--dcop/client/dcopfind.cpp2
-rw-r--r--dcop/dcopref.h2
-rw-r--r--dcop/dcopserver.cpp8
7 files changed, 13 insertions, 13 deletions
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 4086d75b3..5904c461d 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 c7fa69822..92cb921bb 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");