Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

KDE2PORTING.html

@@ -18,7 +18,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <UL>
 <LI><A HREF="#gettingstarted">Getting Started</A></LI>
 <LI><A HREF="#general">Global changes</A></LI>
-<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
+<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI>
 <LI><A HREF="#KApplication">KApplication</A></LI>
 <LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
 <LI><A HREF="#KLocale">KLocale</A></LI>
@@ -95,12 +95,12 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3>
+<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3>
 
-  On the subject of the compilation framework, automoc has been removed from
+  On the subject of the compilation framework, autotqmoc has been removed from
   the admin directory. It has been replaced by am_edit which provides a lot of
   additional features.<P>
-  METASOURCES=AUTO still does the job of generating the appropriate moc files,
+  METASOURCES=AUTO still does the job of generating the appropriate tqmoc files,
   but in addition, you should use KDE_ICON for the icons representing the application
   (and naming those icons conforming to lo16-app-&lt;appname&gt;.png), and install
   the application-specific icons under $(kde_datadir)/&lt;appname&gt;/pics.
@@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   to klocale-&gt;translate with i18n.<P>
 
   The return value of i18n is also no longer a const char*,
-  but a unicode TQString.<P>
+  but a tqunicode TQString.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 

KDE3PORTING.html

@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.
 
 <p>The API for Kicker panel applets and extensions has changed. Panels can now be
 left/top, center, or right/bottom aligned, and applets and extensions may receive
-notification about a change in alignment.
+notification about a change in tqalignment.
 
 <H4>KPanelApplet</H4>
 
 <p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
-Instead you should reimplement positionChange() and alignmentChange() to be
-notified of changes in the position and alignment of the panel on which your applet
+Instead you should reimplement positionChange() and tqalignmentChange() to be
+notified of changes in the position and tqalignment of the panel on which your applet
 resides. In addition, the popupDirection() method and the Direction enum are
 deprecated. Instead you should use the position() method and Position enum. Applets that use
 the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -661,8 +661,8 @@ a future version.
 
 <H4>KPanelExtension</H4>
 
-<p>There is a new method alignmentChange() that your extension should reimplement if
-it needs to know about changes in alignment.
+<p>There is a new method tqalignmentChange() that your extension should reimplement if
+it needs to know about changes in tqalignment.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 <p>

arts/kde/kartsdispatcher.h

@@ -61,7 +61,7 @@ namespace Arts
  * }
  * \endcode
  */
-class KDE_EXPORT KArtsDispatcher : public QObject
+class KDE_EXPORT KArtsDispatcher : public TQObject
 {
 Q_OBJECT
 public:

arts/kde/kartsserver.cpp

@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
 
 	X11CommConfig.sync();
 	
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
+	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
 
 	if(rt)
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
 	else
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
 
 	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
 

arts/kde/kartsserver.h

@@ -34,7 +34,7 @@
  * artsd on KDE startup, but at the very least there will always be third
  * party PlayObjects that will crash.  So, this is necessary.
  */
-class KDE_ARTS_EXPORT KArtsServer : public QObject
+class KDE_ARTS_EXPORT KArtsServer : public TQObject
 {
 Q_OBJECT
 

arts/kde/kaudioconverter.h

@@ -29,7 +29,7 @@
 class KURL;
 class TQString;
 
-class KAudioConverter : public QObject
+class KAudioConverter : public TQObject
 {
 Q_OBJECT
 public:

arts/kde/kaudiorecordstream.h

@@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; }
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
 */
-class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
+class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
 {
 	Q_OBJECT
 

arts/kde/kconverttest.h

@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 
-class KConvertTest : public QObject
+class KConvertTest : public TQObject
 {
 Q_OBJECT
 public:

arts/kde/kioinputstream_impl.cpp

@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
 	m_job = KIO::get(m_url, false, false);
 
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
-	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
+	m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
 
 	TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
 			 this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));		     
@@ -213,7 +213,7 @@ void KIOInputStream_impl::processQueue()
 void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
 {
 	processQueue();
-	packet->size = std::min(m_packetSize, m_data.size());
+	packet->size = std::min(m_packetSize, (unsigned int)m_data.size());
 	kdDebug( 400 ) << "STREAMING: Filling one DataPacket with " << packet->size << " bytes of the stream!" << endl;
 
 	if (!m_finished) {

arts/kde/kplayobject.cc

@@ -65,7 +65,7 @@ void KPlayObject::halt()
 
 TQString KPlayObject::description()
 {
-	return TQString::fromLatin1(object().description().c_str());
+	return TQString::tqfromLatin1(object().description().c_str());
 }
 
 Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
 
 TQString KPlayObject::mediaName()
 {
-	return TQString::fromLatin1(object().mediaName().c_str());
+	return TQString::tqfromLatin1(object().mediaName().c_str());
 }
 
 Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
 {
 	if ( object().isNull() )
 		return TQString();
-	return TQString::fromLatin1(object().description().c_str());
+	return TQString::tqfromLatin1(object().description().c_str());
 }
 
 Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
 {
 	if ( object().isNull() )
 		return TQString();
-	return TQString::fromLatin1(object().mediaName().c_str());
+	return TQString::tqfromLatin1(object().mediaName().c_str());
 }
 
 Arts::poState KDE::PlayObject::state()

arts/kde/kplayobject.h

@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tqobject.h>
 
-class KDE_EXPORT KPlayObject : public QObject
+class KDE_EXPORT KPlayObject : public TQObject
 {
 Q_OBJECT
 public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
   * internal state until the real Arts::PlayObject got created, afterwards
   * the state of the Arts::PlayObject will be returned.
   */
-class KDE_EXPORT PlayObject : public QObject
+class KDE_EXPORT PlayObject : public TQObject
 {
 Q_OBJECT
 public:

arts/kde/kplayobjectcreator.h

@@ -29,7 +29,7 @@
 
 namespace KDE {
 
-class PlayObjectCreator : public QObject
+class PlayObjectCreator : public TQObject
 {
 Q_OBJECT
 public:

arts/kde/kplayobjectfactory.cc

@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
 	}
 
 	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
-	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
+	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
 	{
 		// we rely on the delivered mimetype if it's a local file
 		d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );
@@ -202,7 +202,7 @@ TQStringList KDE::PlayObjectFactory::mimeTypes(void)
 		for(vector<string>::iterator mimetype = mimetypes->begin();
 		    mimetype != mimetypes->end(); ++mimetype)
 		{
-			TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
+			TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace();
 			if(KMimeType::mimeType(name))
 				results.append(name);
 		}

arts/kde/kplayobjectfactory_p.h

@@ -29,7 +29,7 @@ namespace KDE
 /**
  * @internal
  */
-class POFHelper : public QObject
+class POFHelper : public TQObject
 {
 	friend class PlayObjectFactory;
 	Q_OBJECT

arts/kde/kvideowidget.cpp

@@ -92,8 +92,8 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
 void KVideoWidget::init(void)
 {
     setMinimumSize(0, 0);
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-    setFocusPolicy( ClickFocus );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+    setFocusPolicy( TQ_ClickFocus );
 
     fullscreenWidget = 0;
     poVideo	     = Arts::VideoPlayObject::null();
@@ -102,16 +102,16 @@ void KVideoWidget::init(void)
 
     // Setup actions
     new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
-		       CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
+		       CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
 		       actionCollection(), "fullscreen_mode" );
     new KRadioAction( i18n("&Half Size"), ALT+Key_0,
-		      this, TQT_SLOT(halfSizeActivated()),
+		      TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
 		      actionCollection(), "half_size" );
     new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
-		      this, TQT_SLOT(normalSizeActivated()),
+		      TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
 		      actionCollection(), "normal_size" );
     new KRadioAction( i18n("&Double Size"), ALT+Key_2,
-		      this, TQT_SLOT(doubleSizeActivated()),
+		      TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
 		      actionCollection(), "double_size" );
 
     ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
 	}
 
 	setBackgroundMode( PaletteBackground );
-	repaint();
+	tqrepaint();
 
 	// Resize GUI
 	videoWidth  = 0;
@@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
     doubleSizeActivated();
 }
 
-TQSize KVideoWidget::sizeHint() const
+TQSize KVideoWidget::tqsizeHint() const
 {
     return TQSize( videoWidth, videoHeight );
 }
@@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
 	emit mouseButtonPressed( event->button(), pos, event->state() );
 
 	// ### Remove in KDE4
-	if ( event->button() == RightButton )
+	if ( event->button() == Qt::RightButton )
 		emit rightButtonPressed( pos );
 }
 

arts/kde/kvideowidget.h

@@ -36,7 +36,7 @@ public:
     bool isNormalSize();
     bool isDoubleSize();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     virtual int heightForWidth ( int w ) const;
 

arts/knotify/knotify.cpp

@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
     if ( !event.isEmpty() ) {
 
         // get config file
-        if ( d->events.contains( fromApp ) ) {
+        if ( d->events.tqcontains( fromApp ) ) {
             eventsFile = d->events[fromApp];
         } else {
             eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
             d->events.insert( fromApp, eventsFile );
         }
-        if ( d->configs.contains( fromApp) ) {
+        if ( d->configs.tqcontains( fromApp) ) {
             configFile = d->configs[fromApp];
         } else {
             configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -550,7 +550,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
            return false; // Skip
         }
         proc->clearArguments();
-        (*proc) << d->externalPlayer << TQFile::encodeName( soundFile );
+        (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
         d->externalPlayerEventId = eventId;
         proc->start(KProcess::NotifyOnExit);
         return true;
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
 
     // append msg
     TQTextStream strm( &logFile );
-    strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+    strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
     strm << text << endl;
 
     // close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
     TQTextStream strm( stderr, IO_WriteOnly );
 
     // output msg
-    strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+    strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
     strm << text << endl;
 
     return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
         ++it;
         if ( (*current)->state() != Arts::posPlaying )
         {
-            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
+            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
             if ( eit != d->playObjectEventMap.end() )
             {
                 soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
 void KNotify::abortFirstPlayObject()
 {
 #ifndef WITHOUT_ARTS
-    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
+    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
     if ( it != d->playObjectEventMap.end() )
     {
         soundFinished( it.data(), Aborted );

dcop/KDE-ICE/ICEmsg.h

@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
 
 
 /*
- * Write pad bytes.  Used to force 32 or 64 bit alignment.
+ * Write pad bytes.  Used to force 32 or 64 bit tqalignment.
  * A maxium of 7 pad bytes can be specified.
  */
 
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
 
 
 /*
- * Read pad bytes (for 32 or 64 bit alignment).
+ * Read pad bytes (for 32 or 64 bit tqalignment).
  * A maxium of 7 pad bytes can be specified.
  */
 

dcop/client/dcop.cpp

@@ -158,9 +158,9 @@ 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 unicode strings, so use one.
-    int left = f.find( '(' );
-    int right = f.find( ')' );
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
+    int left = f.tqfind( '(' );
+    int right = f.tqfind( ')' );
 
     if ( right <  left )
     {
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 	    return( 1 );
 	}
 	for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
-	    int l = (*it).find( '(' );
+	    int l = (*it).tqfind( '(' );
 	    int s;
 	    if (l > 0)
-	        s = (*it).findRev( ' ', l);
+	        s = (*it).tqfindRev( ' ', l);
 	    else
-	        s = (*it).find( ' ' );
+	        s = (*it).tqfind( ' ' );
 
 	    if ( s < 0 )
 		s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 
 	    if ( l > 0 && (*it).mid( s, l - s ) == func ) {
 		realfunc = (*it).mid( s );
-		const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
-		uint a = arguments.contains(',');
+		const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
+		uint a = arguments.tqcontains(',');
 		if ( (a==0 && !arguments.isEmpty()) || a>0)
 			a++;
 		if ( a == args.count()  )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 	    return( 1 );
 	}
 	f = realfunc;
-	left = f.find( '(' );
-	right = f.find( ')' );
+	left = f.tqfind( '(' );
+	right = f.tqfind( ')' );
     }
 
  doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
 	    TQString lt = (*it).simplifyWhiteSpace();
 
-	    int s = lt.find(' ');
+	    int s = lt.tqfind(' ');
 
 	    // If there are spaces in the name, there may be two
 	    // reasons: the parameter name is still there, ie.
@@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 		//
 		s=1;
 
-		while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
+		while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
 		{
 			s++;
 		}
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
     QCStringList params;
     DCOPClient *client = 0L;
     int retval = 0;
-    if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+    if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
     {
-	int delimPos = args[ 0 ].findRev( ',' );
+	int delimPos = args[ 0 ].tqfindRev( ',' );
 	if( delimPos == -1 )
         {
 	    cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
 	    }
 	    else if( !sessionName.isEmpty() )
 	    {
-		if( sessions.contains( sessionName ) )
+		if( sessions.tqcontains( sessionName ) )
 		{
 		    sessions.clear();
 		    sessions.append( sessionName );
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
           if (prog[prog.length()-1] != '*')
           {
              // Strip a trailing -<PID> part.
-             int i = prog.findRev('-');
+             int i = prog.tqfindRev('-');
              if ((i >= 0) && prog.mid(i+1).toLong())
              {
                 prog = prog.left(i);      

dcop/client/dcopfind.cpp

@@ -40,9 +40,9 @@ static bool bLaunchApp = 0;
 
 bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
 {
-    TQString f = func; // Qt is better with unicode strings, so use one.
-    int left = f.find( '(' );
-    int right = f.find( ')' );
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
+    int left = f.tqfind( '(' );
+    int right = f.tqfind( ')' );
 
     if ( right <  left )
     {
@@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
 	    TQString lt = (*it).simplifyWhiteSpace();
 
-	    int s = lt.find(' ');
+	    int s = lt.tqfind(' ');
 
 	    // If there are spaces in the name, there may be two
 	    // reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 		//
 	    	s=1;
 
-		while (s < (int)partl.count() && intTypes.contains(partl[s]))
+		while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
 		{
 			s++;
 		}

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::fromLatin1(_app);
+    TQString app = TQString::tqfromLatin1(_app);
     if (app.endsWith(".desktop"))
        function = "start_service_by_desktop_path(TQString,TQStringList)";
     else

dcop/client/marshall.cpp

@@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
 {
     TQCString result;
 
-    if ( type == "int" || type == "Q_INT32" )
+    if ( type == "int" || type == "TQ_INT32" )
     {
         int i;
         stream >> i;
         result.setNum( i );
-    } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
+    } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
     {
         uint i;
         stream >> i;
@@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         double d;
         stream >> d;
         result.setNum( d, 'f' );
-    } else if ( type == "Q_INT64" ) {
-        Q_INT64 i;
+    } else if ( type == "TQ_INT64" ) {
+        TQ_INT64 i;
         stream >> i;
         result.sprintf( "%lld", i );
-    } else if ( type == "Q_UINT64" ) {
-        Q_UINT64 i;
+    } else if ( type == "TQ_UINT64" ) {
+        TQ_UINT64 i;
         stream >> i;
         result.sprintf( "%llu", i );
     } else if ( type == "bool" )
@@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
     {
         TQColor c;
         stream >> c;
-        result = c.name().local8Bit();
+        result = TQString(c.name()).local8Bit();
     } else if ( type == "TQSize" )
     {
         TQSize s;
@@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
     } else if ( type == "TQVariant" )
     {
-        Q_INT32 type;
+        TQ_INT32 type;
         stream >> type;
         return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
     } else if ( type == "DCOPRef" )
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         result = r.url().local8Bit();
     } else if ( type.left( 11 ) == "TQValueList<" )
     {
-        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
+        if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
             return result;
 
         TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         if ( nestedType.isEmpty() )
             return result;
 
-        Q_UINT32 count;
+        TQ_UINT32 count;
         stream >> count;
 
-        Q_UINT32 i = 0;
+        TQ_UINT32 i = 0;
         for (; i < count; ++i )
         {
             TQCString arg = demarshal( stream, nestedType );
@@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         }
     } else if ( type.left( 5 ) == "TQMap<" )
     {
-        int commaPos = type.find( ',', 5 );
+        int commaPos = type.tqfind( ',', 5 );
 
         if ( commaPos == -1 )
             return result;
 
-        if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
+        if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
             return result;
 
         TQString keyType = type.mid( 5, commaPos - 5 );
         TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
 
-        Q_UINT32 count;
+        TQ_UINT32 count;
         stream >> count;
 
-        Q_UINT32 i = 0;
+        TQ_UINT32 i = 0;
         for (; i < count; ++i )
         {
             TQCString key = demarshal( stream, keyType );
@@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	arg << s.toUInt();
     else if ( type == "unsigned int" )
 	arg << s.toUInt();
-    else if ( type == "Q_INT32" )
+    else if ( type == "TQ_INT32" )
 	arg << s.toInt();
-    else if ( type == "Q_INT64" ) {
+    else if ( type == "TQ_INT64" ) {
 	TQVariant qv = TQVariant( s );
 	arg << qv.toLongLong();
     }
-    else if ( type == "Q_UINT32" )
+    else if ( type == "TQ_UINT32" )
 	arg << s.toUInt();
-    else if ( type == "Q_UINT64" ) {
+    else if ( type == "TQ_UINT64" ) {
 	TQVariant qv = TQVariant( s );
 	arg << qv.toULongLong();
     }
@@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	    marshall( dummy_arg, args, j, type );
 	    count++;
 	}
-	arg << (Q_UINT32) count;
+	arg << (TQ_UINT32) count;
 	// Parse the list for real
 	while (true) {
 	    if( i > args.count() )

dcop/dcopclient.cpp

@@ -97,13 +97,13 @@ client_map_t *cliMap()
 
 DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
 {
-    return cliMap()->find(_appId.data());
+    return cliMap()->tqfind(_appId.data());
 }
 
 static
 void registerLocalClient( const TQCString &_appId, DCOPClient *client )
 {
-    cliMap()->replace(_appId.data(), client);
+    cliMap()->tqreplace(_appId.data(), client);
 }
 
 static
@@ -141,7 +141,7 @@ public:
     TQCString* replyType;
     TQByteArray* replyData;
     int replyId;
-    Q_INT32 transactionId;
+    TQ_INT32 transactionId;
     TQCString calledApp;
     TQGuardedPtr<TQObject> replyObject;
     TQCString replySlot;
@@ -173,7 +173,7 @@ public:
     TQCString defaultObject;
     TQPtrList<DCOPClientTransaction> *transactionList;
     bool transaction;
-    Q_INT32 transactionId;
+    TQ_INT32 transactionId;
     int opcode;
 
     // Special key values:
@@ -205,7 +205,7 @@ public:
 class DCOPClientTransaction
 {
 public:
-    Q_INT32 id;
+    TQ_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.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
         disp.truncate(i);
 
     if (!old)
     {
-        while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
+        while( (i = disp.tqfind(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;
+            TQ_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;
+            TQ_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();
+    TQ_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 tqApp instantiated.  If we do,
     // we can create a TQSocketNotifier and use it for receiving data.
-    if (qApp) {
+    if (tqApp) {
         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 tqApp 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::tqfromLatin1( "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::tqfromLatin1( "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.tqfind('\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::tqfromLatin1( 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::tqfromLatin1( 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::tqfromLatin1( "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::tqfromLatin1( "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;
+        TQ_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;
+            TQ_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();
+            TQ_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<TQ_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<TQ_INT8>( daemonMode );
 
     TQCString replyType;
     TQByteArray reply;