@ -97,13 +97,13 @@ client_map_t *cliMap()
DCOPClient * DCOPClient : : findLocalClient ( const TQCString & _appId )
{
return cliMap ( ) - > find ( _appId . data ( ) ) ;
return cliMap ( ) - > tq find( _appId . data ( ) ) ;
}
static
void registerLocalClient ( const TQCString & _appId , DCOPClient * client )
{
cliMap ( ) - > replace ( _appId . data ( ) , client ) ;
cliMap ( ) - > tq replace( _appId . data ( ) , client ) ;
}
static
@ -141,7 +141,7 @@ public:
TQCString * replyType ;
TQByteArray * replyData ;
int replyId ;
Q_INT32 transactionId ;
T Q_INT32 transactionId ;
TQCString calledApp ;
TQGuardedPtr < TQObject > replyObject ;
TQCString replySlot ;
@ -173,7 +173,7 @@ public:
TQCString defaultObject ;
TQPtrList < DCOPClientTransaction > * transactionList ;
bool transaction ;
Q_INT32 transactionId ;
T Q_INT32 transactionId ;
int opcode ;
// Special key values:
@ -205,7 +205,7 @@ public:
class DCOPClientTransaction
{
public :
Q_INT32 id ;
T Q_INT32 id ;
CARD32 key ;
TQCString senderId ;
} ;
@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
disp = " NODISPLAY " ;
int i ;
if ( ( i = disp . findRev ( ' . ' ) ) > disp . findRev ( KPATH_SEPARATOR ) & & i > = 0 )
if ( ( i = disp . tq findRev( ' . ' ) ) > disp . tq findRev( KPATH_SEPARATOR ) & & i > = 0 )
disp . truncate ( i ) ;
if ( ! old )
{
while ( ( i = disp . find ( KPATH_SEPARATOR ) ) > = 0 )
while ( ( i = disp . tq find( KPATH_SEPARATOR ) ) > = 0 )
disp [ i ] = ' _ ' ;
}
@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
case DCOPReplyWait :
if ( replyStruct ) {
TQCString calledApp , app ;
Q_INT32 id ;
T Q_INT32 id ;
TQDataStream ds ( dataReceived , IO_ReadOnly ) ;
ds > > calledApp > > app > > id ;
replyStruct - > transactionId = id ;
@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
{
TQDataStream ds ( dataReceived , IO_ReadOnly ) ;
TQCString calledApp , app ;
Q_INT32 id ;
T Q_INT32 id ;
ds > > calledApp > > app > > id ;
if ( replyStruct & & ( id = = replyStruct - > transactionId ) & & ( calledApp = = replyStruct - > calledApp ) )
@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
TQByteArray reply ;
TQDataStream replyStream ( reply , IO_WriteOnly ) ;
Q_INT32 id = c - > transactionId ( ) ;
T Q_INT32 id = c - > transactionId ( ) ;
if ( id ) {
// Call delayed. Send back the transaction ID.
replyStream < < d - > appId < < fromApp < < id ;
@ -672,9 +672,9 @@ bool DCOPClient::attach()
void DCOPClient : : bindToApp ( )
{
// check if we have a qApp instantiated. If we do,
// check if we have a t qApp instantiated. If we do,
// we can create a TQSocketNotifier and use it for receiving data.
if ( qApp ) {
if ( t qApp) {
if ( d - > notifier )
delete d - > notifier ;
d - > notifier = new TQSocketNotifier ( socket ( ) ,
@ -690,7 +690,7 @@ void DCOPClient::suspend()
if ( ! d - > notifier )
return ;
# endif
assert ( d - > notifier ) ; // Suspending makes no sense if we didn't had a qApp yet
assert ( d - > notifier ) ; // Suspending makes no sense if we didn't had a t qApp yet
d - > notifier - > setEnabled ( false ) ;
}
@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount ,
const_cast < char * * > ( DCOPAuthNames ) ,
DCOPClientAuthProcs , 0L ) ) < 0 ) {
emit attachFailed ( TQString : : fromLatin1 ( " Communications could not be established. " ) ) ;
emit attachFailed ( TQString : : tq 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 : : fromLatin1 ( " Could not read network connection list. \n " ) + TQFile : : decodeName ( fName ) ) ;
emit attachFailed ( TQString : : tq fromLatin1( " Could not read network connection list. \n " ) + TQFile : : decodeName ( fName ) ) ;
return false ;
}
int size = QMIN ( ( qint64 ) 1024 , f . size ( ) ) ; // protection against a huge file
@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
// Should we abort ?
}
contents [ size ] = ' \0 ' ;
int pos = contents . find ( ' \n ' ) ;
int pos = contents . tq find( ' \n ' ) ;
if ( pos = = - 1 ) // Shouldn't happen
{
qDebug ( " Only one line in dcopserver file !: %s " , contents . data ( ) ) ;
@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [ ] d - > serverAddr ;
d - > serverAddr = 0 ;
}
emit attachFailed ( TQString : : fromLatin1 ( errBuf ) ) ;
emit attachFailed ( TQString : : tq 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 : : fromLatin1 ( errBuf ) ) ;
emit attachFailed ( TQString : : tq 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 : : fromLatin1 ( " internal error in IceOpenConnection " ) ) ;
emit attachFailed ( TQString : : tq 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 : : fromLatin1 ( " DCOP server did not accept the connection. " ) ) ;
emit attachFailed ( TQString : : tq fromLatin1( " DCOP server did not accept the connection. " ) ) ;
return false ;
}
@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) {
if ( fun . isEmpty ( ) ) // nothing to do
return fun . copy ( ) ;
TQCString result ( fun . size ( ) ) ;
char * from = fun . data ( ) ;
char * from = const_cast < TQCString & > ( fun ) . data ( ) ;
char * to = result . data ( ) ;
char * first = to ;
char last = 0 ;
@ -1056,7 +1056,7 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId,
if ( localClient ) {
bool saveTransaction = d - > transaction ;
Q_INT32 saveTransactionId = d - > transactionId ;
T Q_INT32 saveTransactionId = d - > transactionId ;
TQCString saveSenderId = d - > senderId ;
d - > senderId = 0 ; // Local call
@ -1167,13 +1167,13 @@ bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj,
if ( ( phase = = 1 ) & & localClient ) {
// In phase 1 we do all local clients
bool saveTransaction = d - > transaction ;
Q_INT32 saveTransactionId = d - > transactionId ;
T Q_INT32 saveTransactionId = d - > transactionId ;
TQCString saveSenderId = d - > senderId ;
d - > senderId = 0 ; // Local call
result = localClient - > find ( remApp , remObj , remFun , data , replyType , replyData ) ;
Q_INT32 id = localClient - > transactionId ( ) ;
T Q_INT32 id = localClient - > transactionId ( ) ;
if ( id ) {
// Call delayed. We have to wait till it has been processed.
do {
@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled)
{
TQByteArray data ;
TQDataStream ds ( data , IO_WriteOnly ) ;
ds < < static_cast < Q_INT8 > ( enabled ) ;
ds < < static_cast < T Q_INT8> ( enabled ) ;
TQCString replyType ;
TQByteArray reply ;
@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode )
{
TQByteArray data ;
TQDataStream ds ( data , IO_WriteOnly ) ;
ds < < static_cast < Q_INT8 > ( daemonMode ) ;
ds < < static_cast < T Q_INT8> ( daemonMode ) ;
TQCString replyType ;
TQByteArray reply ;