summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
Diffstat (limited to 'dcop')
-rw-r--r--dcop/KDE-ICE/ICEmsg.h4
-rw-r--r--dcop/client/dcop.cpp6
-rw-r--r--dcop/client/dcopfind.cpp4
-rw-r--r--dcop/client/dcopstart.cpp2
-rw-r--r--dcop/dcopclient.cpp28
-rw-r--r--dcop/dcopidl2cpp/main.cpp2
-rw-r--r--dcop/dcopidl2cpp/skel.cpp2
-rw-r--r--dcop/dcopidl2cpp/stub.cpp2
-rw-r--r--dcop/dcopidl2cpp/stubimpl.cpp2
-rw-r--r--dcop/dcopidl2cpp/type.h2
-rw-r--r--dcop/dcopref.h2
-rw-r--r--dcop/dcopserver.cpp10
12 files changed, 33 insertions, 33 deletions
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/client/dcop.cpp b/dcop/client/dcop.cpp
index 0eafb5055..46a6e64bf 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqimage.h>
#include <tqmap.h>
#include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvariant.h>
#include "../dcopclient.h"
@@ -158,7 +158,7 @@ void queryFunctions( const char* app, const char* obj )
int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
- TQString f = func; // Qt is better with tqunicode strings, so use one.
+ TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );
@@ -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..cd3e4d517 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -40,7 +40,7 @@ static bool bLaunchApp = 0;
bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- TQString f = func; // Qt is better with tqunicode strings, so use one.
+ TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );
@@ -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/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index f46531735..5741ef775 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
void startApp(const char *_app, int argc, const char **args)
{
const char *function = 0;
- TQString app = TQString::tqfromLatin1(_app);
+ TQString app = TQString::fromLatin1(_app);
if (app.endsWith(".desktop"))
function = "start_service_by_desktop_path(TQString,TQStringList)";
else
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index ae1b85f9f..1cb439b5e 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -54,7 +54,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define QT_CLEAN_NAMESPACE
#endif
#include <tqguardedptr.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqdir.h>
#include <tqapplication.h>
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount,
const_cast<char **>(DCOPAuthNames),
DCOPClientAuthProcs, 0L)) < 0) {
- emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
+ emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
return false;
}
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
TQCString fName = dcopServerFile();
TQFile f(TQFile::decodeName(fName));
if (!f.open(IO_ReadOnly)) {
- emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
+ emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
return false;
}
int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::tqfromLatin1( errBuf ));
+ emit attachFailed(TQString::fromLatin1( errBuf ));
return false;
}
fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::tqfromLatin1( errBuf ));
+ emit attachFailed(TQString::fromLatin1( errBuf ));
return false;
} else if (setupstat == IceProtocolAlreadyActive) {
if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
d->serverAddr = 0;
}
/* should not happen because 3rd arg to IceOpenConnection was 0. */
- emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
+ emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
return false;
}
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
+ emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
return false;
}
@@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
l << "QCStringList properties()";
l << "bool setProperty(TQCString,TQVariant)";
l << "TQVariant property(TQCString)";
- TQStrList lst = o->tqmetaObject()->slotNames( true );
+ TQStrList lst = o->metaObject()->slotNames( true );
int i = 0;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
+ if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
continue;
TQCString slot = it.current();
if ( slot.contains( "()" ) ) {
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
- TQMetaObject *meta = o->tqmetaObject();
+ TQMetaObject *meta = o->metaObject();
while ( meta ) {
l.prepend( meta->className() );
- meta = meta->tqsuperClass();
+ meta = meta->superClass();
}
reply << l;
return true;
@@ -1498,9 +1498,9 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
- TQStrList lst = o->tqmetaObject()->propertyNames( true );
+ TQStrList lst = o->metaObject()->propertyNames( true );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
if ( !p )
continue;
@@ -1532,7 +1532,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
reply << (TQ_INT8) o->setProperty( name, value );
return true;
} else {
- int slot = o->tqmetaObject()->findSlot( fun, true );
+ int slot = o->metaObject()->findSlot( fun, true );
if ( slot != -1 ) {
replyType = "void";
TQUObject uo[ 1 ];
diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp
index 5e0f27525..b4df274a9 100644
--- a/dcop/dcopidl2cpp/main.cpp
+++ b/dcop/dcopidl2cpp/main.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <string.h>
diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp
index 5cc30de3e..b8612eac4 100644
--- a/dcop/dcopidl2cpp/skel.cpp
+++ b/dcop/dcopidl2cpp/skel.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp
index 887945262..445c468e0 100644
--- a/dcop/dcopidl2cpp/stub.cpp
+++ b/dcop/dcopidl2cpp/stub.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp
index 5cdd2a00d..700437f2a 100644
--- a/dcop/dcopidl2cpp/stubimpl.cpp
+++ b/dcop/dcopidl2cpp/stubimpl.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/dcop/dcopidl2cpp/type.h b/dcop/dcopidl2cpp/type.h
index 2a99c83a9..173b7fca0 100644
--- a/dcop/dcopidl2cpp/type.h
+++ b/dcop/dcopidl2cpp/type.h
@@ -1,7 +1,7 @@
#ifndef TYPE_H
#define TYPE_H
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdom.h>
static TQString writeType( TQTextStream& str, const TQDomElement& r )
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..fe08871bf 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define QT_CLEAN_NAMESPACE 1
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatastream.h>
#include <tqptrstack.h>
#include <tqtimer.h>
@@ -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");
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 11:32:33 +0000