Browse Source

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-ecb5cbfe19
tags/v3.5.13
tpearson 8 years ago
parent
commit
f7e71d4771
100 changed files with 321 additions and 319 deletions
  1. 5
    5
      KDE2PORTING.html
  2. 5
    5
      KDE3PORTING.html
  3. 1
    1
      arts/kde/kartsdispatcher.h
  4. 3
    3
      arts/kde/kartsserver.cpp
  5. 1
    1
      arts/kde/kartsserver.h
  6. 1
    1
      arts/kde/kaudioconverter.h
  7. 1
    1
      arts/kde/kaudiorecordstream.h
  8. 1
    1
      arts/kde/kconverttest.h
  9. 2
    2
      arts/kde/kioinputstream_impl.cpp
  10. 4
    4
      arts/kde/kplayobject.cc
  11. 2
    2
      arts/kde/kplayobject.h
  12. 1
    1
      arts/kde/kplayobjectcreator.h
  13. 2
    2
      arts/kde/kplayobjectfactory.cc
  14. 1
    1
      arts/kde/kplayobjectfactory_p.h
  15. 9
    9
      arts/kde/kvideowidget.cpp
  16. 1
    1
      arts/kde/kvideowidget.h
  17. 7
    7
      arts/knotify/knotify.cpp
  18. 2
    2
      dcop/KDE-ICE/ICEmsg.h
  19. 16
    16
      dcop/client/dcop.cpp
  20. 5
    5
      dcop/client/dcopfind.cpp
  21. 1
    1
      dcop/client/dcopstart.cpp
  22. 20
    20
      dcop/client/marshall.cpp
  23. 62
    62
      dcop/dcopclient.cpp
  24. 4
    3
      dcop/dcopclient.h
  25. 1
    1
      dcop/dcopidl/main.cpp
  26. 2
    2
      dcop/dcopidl/scanner.cc
  27. 1
    0
      dcop/dcopidl/scanner.ll
  28. 1
    1
      dcop/dcopidl/yacc.cc
  29. 1
    1
      dcop/dcopidl/yacc.yy
  30. 3
    3
      dcop/dcopidl2cpp/main.cpp
  31. 2
    2
      dcop/dcopidl2cpp/skel.cpp
  32. 5
    5
      dcop/dcopidl2cpp/stub.cpp
  33. 1
    1
      dcop/dcopidl2cpp/stubimpl.cpp
  34. 3
    3
      dcop/dcopobject.cpp
  35. 4
    4
      dcop/dcopref.cpp
  36. 1
    1
      dcop/dcopref.h
  37. 28
    28
      dcop/dcopserver.cpp
  38. 3
    3
      dcop/dcopserver.h
  39. 9
    9
      dcop/dcopsignals.cpp
  40. 6
    6
      dcop/kdatastream.h
  41. 2
    2
      dcop/testdcop.h
  42. 1
    1
      dnssd/domainbrowser.cpp
  43. 1
    1
      dnssd/domainbrowser.h
  44. 1
    1
      dnssd/query.h
  45. 2
    2
      dnssd/remoteservice.cpp
  46. 2
    2
      dnssd/responder.cpp
  47. 1
    1
      dnssd/responder.h
  48. 4
    4
      dnssd/sdevent.h
  49. 4
    4
      dnssd/servicebase.cpp
  50. 1
    1
      dnssd/servicebrowser.cpp
  51. 1
    1
      dnssd/servicebrowser.h
  52. 4
    4
      interfaces/khexedit/byteseditinterface.h
  53. 1
    1
      interfaces/khexedit/charcolumninterface.h
  54. 1
    1
      interfaces/khexedit/clipboardinterface.h
  55. 1
    1
      interfaces/khexedit/valuecolumninterface.h
  56. 1
    1
      interfaces/khexedit/zoominterface.h
  57. 1
    1
      interfaces/kimproxy/interface/kimiface.h
  58. 5
    5
      interfaces/kimproxy/library/kimproxy.cpp
  59. 2
    2
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  60. 1
    1
      interfaces/kmediaplayer/player.h
  61. 1
    1
      interfaces/kmediaplayer/view.h
  62. 2
    2
      interfaces/kregexpeditor/kregexpeditorinterface.h
  63. 1
    1
      interfaces/kscript/scriptinterface.h
  64. 1
    1
      interfaces/ktexteditor/blockselectioninterface.cpp
  65. 1
    1
      interfaces/ktexteditor/clipboardinterface.cpp
  66. 1
    1
      interfaces/ktexteditor/codecompletioninterface.cpp
  67. 2
    2
      interfaces/ktexteditor/configinterface.cpp
  68. 2
    2
      interfaces/ktexteditor/configinterfaceextension.cpp
  69. 1
    1
      interfaces/ktexteditor/configinterfaceextension.h
  70. 1
    1
      interfaces/ktexteditor/cursorinterface.cpp
  71. 1
    1
      interfaces/ktexteditor/dynwordwrapinterface.cpp
  72. 1
    1
      interfaces/ktexteditor/editinterface.cpp
  73. 1
    1
      interfaces/ktexteditor/editinterfaceext.cpp
  74. 1
    1
      interfaces/ktexteditor/editinterfaceext.h
  75. 1
    1
      interfaces/ktexteditor/editor.h
  76. 3
    3
      interfaces/ktexteditor/editorchooser.cpp
  77. 2
    2
      interfaces/ktexteditor/editorchooser.h
  78. 3
    3
      interfaces/ktexteditor/editorchooser_ui.ui
  79. 1
    1
      interfaces/ktexteditor/encodinginterface.cpp
  80. 1
    1
      interfaces/ktexteditor/highlightinginterface.cpp
  81. 3
    3
      interfaces/ktexteditor/ktexteditor.cpp
  82. 1
    1
      interfaces/ktexteditor/markinterface.cpp
  83. 1
    1
      interfaces/ktexteditor/markinterfaceextension.cpp
  84. 1
    1
      interfaces/ktexteditor/plugin.h
  85. 1
    1
      interfaces/ktexteditor/popupmenuinterface.cpp
  86. 1
    1
      interfaces/ktexteditor/printinterface.cpp
  87. 1
    1
      interfaces/ktexteditor/searchinterface.cpp
  88. 2
    2
      interfaces/ktexteditor/selectioninterface.cpp
  89. 2
    2
      interfaces/ktexteditor/selectioninterfaceext.cpp
  90. 3
    3
      interfaces/ktexteditor/sessionconfiginterface.cpp
  91. 2
    2
      interfaces/ktexteditor/templateinterface.cpp
  92. 1
    1
      interfaces/ktexteditor/texthintinterface.cpp
  93. 1
    1
      interfaces/ktexteditor/undointerface.cpp
  94. 1
    1
      interfaces/ktexteditor/variableinterface.cpp
  95. 1
    1
      interfaces/ktexteditor/viewcursorinterface.cpp
  96. 1
    1
      interfaces/ktexteditor/viewstatusmsginterface.cpp
  97. 1
    1
      interfaces/ktexteditor/wordwrapinterface.cpp
  98. 1
    1
      interfaces/terminal/kde_terminal_interface.h
  99. 3
    3
      interfaces/terminal/test/main.cc
  100. 0
    0
      kab/addressbook.cc

+ 5
- 5
KDE2PORTING.html View File

@@ -18,7 +18,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
18 18
 <UL>
19 19
 <LI><A HREF="#gettingstarted">Getting Started</A></LI>
20 20
 <LI><A HREF="#general">Global changes</A></LI>
21
-<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
21
+<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI>
22 22
 <LI><A HREF="#KApplication">KApplication</A></LI>
23 23
 <LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
24 24
 <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>
95 95
 
96 96
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
97 97
 
98
-<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3>
98
+<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3>
99 99
 
100
-  On the subject of the compilation framework, automoc has been removed from
100
+  On the subject of the compilation framework, autotqmoc has been removed from
101 101
   the admin directory. It has been replaced by am_edit which provides a lot of
102 102
   additional features.<P>
103
-  METASOURCES=AUTO still does the job of generating the appropriate moc files,
103
+  METASOURCES=AUTO still does the job of generating the appropriate tqmoc files,
104 104
   but in addition, you should use KDE_ICON for the icons representing the application
105 105
   (and naming those icons conforming to lo16-app-&lt;appname&gt;.png), and install
106 106
   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>
189 189
   to klocale-&gt;translate with i18n.<P>
190 190
 
191 191
   The return value of i18n is also no longer a const char*,
192
-  but a unicode TQString.<P>
192
+  but a tqunicode TQString.<P>
193 193
 
194 194
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
195 195
 

+ 5
- 5
KDE3PORTING.html View File

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

+ 1
- 1
arts/kde/kartsdispatcher.h View File

@@ -61,7 +61,7 @@ namespace Arts
61 61
  * }
62 62
  * \endcode
63 63
  */
64
-class KDE_EXPORT KArtsDispatcher : public QObject
64
+class KDE_EXPORT KArtsDispatcher : public TQObject
65 65
 {
66 66
 Q_OBJECT
67 67
 public:

+ 3
- 3
arts/kde/kartsserver.cpp View File

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

+ 1
- 1
arts/kde/kartsserver.h View File

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

+ 1
- 1
arts/kde/kaudioconverter.h View File

@@ -29,7 +29,7 @@
29 29
 class KURL;
30 30
 class TQString;
31 31
 
32
-class KAudioConverter : public QObject
32
+class KAudioConverter : public TQObject
33 33
 {
34 34
 Q_OBJECT
35 35
 public:

+ 1
- 1
arts/kde/kaudiorecordstream.h View File

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

+ 1
- 1
arts/kde/kconverttest.h View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <tqobject.h>
26 26
 
27
-class KConvertTest : public QObject
27
+class KConvertTest : public TQObject
28 28
 {
29 29
 Q_OBJECT
30 30
 public:

+ 2
- 2
arts/kde/kioinputstream_impl.cpp View File

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

+ 4
- 4
arts/kde/kplayobject.cc View File

@@ -65,7 +65,7 @@ void KPlayObject::halt()
65 65
 
66 66
 TQString KPlayObject::description()
67 67
 {
68
-	return TQString::fromLatin1(object().description().c_str());
68
+	return TQString::tqfromLatin1(object().description().c_str());
69 69
 }
70 70
 
71 71
 Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
85 85
 
86 86
 TQString KPlayObject::mediaName()
87 87
 {
88
-	return TQString::fromLatin1(object().mediaName().c_str());
88
+	return TQString::tqfromLatin1(object().mediaName().c_str());
89 89
 }
90 90
 
91 91
 Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
243 243
 {
244 244
 	if ( object().isNull() )
245 245
 		return TQString();
246
-	return TQString::fromLatin1(object().description().c_str());
246
+	return TQString::tqfromLatin1(object().description().c_str());
247 247
 }
248 248
 
249 249
 Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
271 271
 {
272 272
 	if ( object().isNull() )
273 273
 		return TQString();
274
-	return TQString::fromLatin1(object().mediaName().c_str());
274
+	return TQString::tqfromLatin1(object().mediaName().c_str());
275 275
 }
276 276
 
277 277
 Arts::poState KDE::PlayObject::state()

+ 2
- 2
arts/kde/kplayobject.h View File

@@ -27,7 +27,7 @@
27 27
 #include <kurl.h>
28 28
 #include <tqobject.h>
29 29
 
30
-class KDE_EXPORT KPlayObject : public QObject
30
+class KDE_EXPORT KPlayObject : public TQObject
31 31
 {
32 32
 Q_OBJECT
33 33
 public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
185 185
   * internal state until the real Arts::PlayObject got created, afterwards
186 186
   * the state of the Arts::PlayObject will be returned.
187 187
   */
188
-class KDE_EXPORT PlayObject : public QObject
188
+class KDE_EXPORT PlayObject : public TQObject
189 189
 {
190 190
 Q_OBJECT
191 191
 public:

+ 1
- 1
arts/kde/kplayobjectcreator.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 namespace KDE {
31 31
 
32
-class PlayObjectCreator : public QObject
32
+class PlayObjectCreator : public TQObject
33 33
 {
34 34
 Q_OBJECT
35 35
 public:

+ 2
- 2
arts/kde/kplayobjectfactory.cc View File

@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
155 155
 	}
156 156
 
157 157
 	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
158
-	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
158
+	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
159 159
 	{
160 160
 		// we rely on the delivered mimetype if it's a local file
161 161
 		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)
202 202
 		for(vector<string>::iterator mimetype = mimetypes->begin();
203 203
 		    mimetype != mimetypes->end(); ++mimetype)
204 204
 		{
205
-			TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
205
+			TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace();
206 206
 			if(KMimeType::mimeType(name))
207 207
 				results.append(name);
208 208
 		}

+ 1
- 1
arts/kde/kplayobjectfactory_p.h View File

@@ -29,7 +29,7 @@ namespace KDE
29 29
 /**
30 30
  * @internal
31 31
  */
32
-class POFHelper : public QObject
32
+class POFHelper : public TQObject
33 33
 {
34 34
 	friend class PlayObjectFactory;
35 35
 	Q_OBJECT

+ 9
- 9
arts/kde/kvideowidget.cpp View File

@@ -92,8 +92,8 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
92 92
 void KVideoWidget::init(void)
93 93
 {
94 94
     setMinimumSize(0, 0);
95
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
96
-    setFocusPolicy( ClickFocus );
95
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
96
+    setFocusPolicy( TQ_ClickFocus );
97 97
 
98 98
     fullscreenWidget = 0;
99 99
     poVideo	     = Arts::VideoPlayObject::null();
@@ -102,16 +102,16 @@ void KVideoWidget::init(void)
102 102
 
103 103
     // Setup actions
104 104
     new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
105
-		       CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
105
+		       CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
106 106
 		       actionCollection(), "fullscreen_mode" );
107 107
     new KRadioAction( i18n("&Half Size"), ALT+Key_0,
108
-		      this, TQT_SLOT(halfSizeActivated()),
108
+		      TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
109 109
 		      actionCollection(), "half_size" );
110 110
     new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
111
-		      this, TQT_SLOT(normalSizeActivated()),
111
+		      TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
112 112
 		      actionCollection(), "normal_size" );
113 113
     new KRadioAction( i18n("&Double Size"), ALT+Key_2,
114
-		      this, TQT_SLOT(doubleSizeActivated()),
114
+		      TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
115 115
 		      actionCollection(), "double_size" );
116 116
 
117 117
     ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
147 147
 	}
148 148
 
149 149
 	setBackgroundMode( PaletteBackground );
150
-	repaint();
150
+	tqrepaint();
151 151
 
152 152
 	// Resize GUI
153 153
 	videoWidth  = 0;
@@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
286 286
     doubleSizeActivated();
287 287
 }
288 288
 
289
-TQSize KVideoWidget::sizeHint() const
289
+TQSize KVideoWidget::tqsizeHint() const
290 290
 {
291 291
     return TQSize( videoWidth, videoHeight );
292 292
 }
@@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
306 306
 	emit mouseButtonPressed( event->button(), pos, event->state() );
307 307
 
308 308
 	// ### Remove in KDE4
309
-	if ( event->button() == RightButton )
309
+	if ( event->button() == Qt::RightButton )
310 310
 		emit rightButtonPressed( pos );
311 311
 }
312 312
 

+ 1
- 1
arts/kde/kvideowidget.h View File

@@ -36,7 +36,7 @@ public:
36 36
     bool isNormalSize();
37 37
     bool isDoubleSize();
38 38
 
39
-    TQSize sizeHint() const;
39
+    TQSize tqsizeHint() const;
40 40
 
41 41
     virtual int heightForWidth ( int w ) const;
42 42
 

+ 7
- 7
arts/knotify/knotify.cpp View File

@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
351 351
     if ( !event.isEmpty() ) {
352 352
 
353 353
         // get config file
354
-        if ( d->events.contains( fromApp ) ) {
354
+        if ( d->events.tqcontains( fromApp ) ) {
355 355
             eventsFile = d->events[fromApp];
356 356
         } else {
357 357
             eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
358 358
             d->events.insert( fromApp, eventsFile );
359 359
         }
360
-        if ( d->configs.contains( fromApp) ) {
360
+        if ( d->configs.tqcontains( fromApp) ) {
361 361
             configFile = d->configs[fromApp];
362 362
         } else {
363 363
             configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -550,7 +550,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
550 550
            return false; // Skip
551 551
         }
552 552
         proc->clearArguments();
553
-        (*proc) << d->externalPlayer << TQFile::encodeName( soundFile );
553
+        (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
554 554
         d->externalPlayerEventId = eventId;
555 555
         proc->start(KProcess::NotifyOnExit);
556 556
         return true;
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
642 642
 
643 643
     // append msg
644 644
     TQTextStream strm( &logFile );
645
-    strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
645
+    strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
646 646
     strm << text << endl;
647 647
 
648 648
     // close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
660 660
     TQTextStream strm( stderr, IO_WriteOnly );
661 661
 
662 662
     // output msg
663
-    strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
663
+    strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
664 664
     strm << text << endl;
665 665
 
666 666
     return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
695 695
         ++it;
696 696
         if ( (*current)->state() != Arts::posPlaying )
697 697
         {
698
-            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
698
+            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
699 699
             if ( eit != d->playObjectEventMap.end() )
700 700
             {
701 701
                 soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
730 730
 void KNotify::abortFirstPlayObject()
731 731
 {
732 732
 #ifndef WITHOUT_ARTS
733
-    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
733
+    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
734 734
     if ( it != d->playObjectEventMap.end() )
735 735
     {
736 736
         soundFinished( it.data(), Aborted );

+ 2
- 2
dcop/KDE-ICE/ICEmsg.h View File

@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
221 221
 
222 222
 
223 223
 /*
224
- * Write pad bytes.  Used to force 32 or 64 bit alignment.
224
+ * Write pad bytes.  Used to force 32 or 64 bit tqalignment.
225 225
  * A maxium of 7 pad bytes can be specified.
226 226
  */
227 227
 
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
306 306
 
307 307
 
308 308
 /*
309
- * Read pad bytes (for 32 or 64 bit alignment).
309
+ * Read pad bytes (for 32 or 64 bit tqalignment).
310 310
  * A maxium of 7 pad bytes can be specified.
311 311
  */
312 312
 

+ 16
- 16
dcop/client/dcop.cpp View File

@@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj )
158 158
 
159 159
 int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
160 160
 {
161
-    TQString f = func; // Qt is better with unicode strings, so use one.
162
-    int left = f.find( '(' );
163
-    int right = f.find( ')' );
161
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
162
+    int left = f.tqfind( '(' );
163
+    int right = f.tqfind( ')' );
164 164
 
165 165
     if ( right <  left )
166 166
     {
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
181 181
 	    return( 1 );
182 182
 	}
183 183
 	for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
184
-	    int l = (*it).find( '(' );
184
+	    int l = (*it).tqfind( '(' );
185 185
 	    int s;
186 186
 	    if (l > 0)
187
-	        s = (*it).findRev( ' ', l);
187
+	        s = (*it).tqfindRev( ' ', l);
188 188
 	    else
189
-	        s = (*it).find( ' ' );
189
+	        s = (*it).tqfind( ' ' );
190 190
 
191 191
 	    if ( s < 0 )
192 192
 		s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
195 195
 
196 196
 	    if ( l > 0 && (*it).mid( s, l - s ) == func ) {
197 197
 		realfunc = (*it).mid( s );
198
-		const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
199
-		uint a = arguments.contains(',');
198
+		const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
199
+		uint a = arguments.tqcontains(',');
200 200
 		if ( (a==0 && !arguments.isEmpty()) || a>0)
201 201
 			a++;
202 202
 		if ( a == args.count()  )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
209 209
 	    return( 1 );
210 210
 	}
211 211
 	f = realfunc;
212
-	left = f.find( '(' );
213
-	right = f.find( ')' );
212
+	left = f.tqfind( '(' );
213
+	right = f.tqfind( ')' );
214 214
     }
215 215
 
216 216
  doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
230 230
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
231 231
 	    TQString lt = (*it).simplifyWhiteSpace();
232 232
 
233
-	    int s = lt.find(' ');
233
+	    int s = lt.tqfind(' ');
234 234
 
235 235
 	    // If there are spaces in the name, there may be two
236 236
 	    // 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
250 250
 		//
251 251
 		s=1;
252 252
 
253
-		while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
253
+		while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
254 254
 		{
255 255
 			s++;
256 256
 		}
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
464 464
     QCStringList params;
465 465
     DCOPClient *client = 0L;
466 466
     int retval = 0;
467
-    if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
467
+    if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
468 468
     {
469
-	int delimPos = args[ 0 ].findRev( ',' );
469
+	int delimPos = args[ 0 ].tqfindRev( ',' );
470 470
 	if( delimPos == -1 )
471 471
         {
472 472
 	    cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
569 569
 	    }
570 570
 	    else if( !sessionName.isEmpty() )
571 571
 	    {
572
-		if( sessions.contains( sessionName ) )
572
+		if( sessions.tqcontains( sessionName ) )
573 573
 		{
574 574
 		    sessions.clear();
575 575
 		    sessions.append( sessionName );
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
861 861
           if (prog[prog.length()-1] != '*')
862 862
           {
863 863
              // Strip a trailing -<PID> part.
864
-             int i = prog.findRev('-');
864
+             int i = prog.tqfindRev('-');
865 865
              if ((i >= 0) && prog.mid(i+1).toLong())
866 866
              {
867 867
                 prog = prog.left(i);      

+ 5
- 5
dcop/client/dcopfind.cpp View File

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

+ 1
- 1
dcop/client/dcopstart.cpp View File

@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
33 33
 void startApp(const char *_app, int argc, const char **args)
34 34
 {
35 35
     const char *function = 0;
36
-    TQString app = TQString::fromLatin1(_app);
36
+    TQString app = TQString::tqfromLatin1(_app);
37 37
     if (app.endsWith(".desktop"))
38 38
        function = "start_service_by_desktop_path(TQString,TQStringList)";
39 39
     else

+ 20
- 20
dcop/client/marshall.cpp View File

@@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
102 102
 {
103 103
     TQCString result;
104 104
 
105
-    if ( type == "int" || type == "Q_INT32" )
105
+    if ( type == "int" || type == "TQ_INT32" )
106 106
     {
107 107
         int i;
108 108
         stream >> i;
109 109
         result.setNum( i );
110
-    } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
110
+    } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
111 111
     {
112 112
         uint i;
113 113
         stream >> i;
@@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
132 132
         double d;
133 133
         stream >> d;
134 134
         result.setNum( d, 'f' );
135
-    } else if ( type == "Q_INT64" ) {
136
-        Q_INT64 i;
135
+    } else if ( type == "TQ_INT64" ) {
136
+        TQ_INT64 i;
137 137
         stream >> i;
138 138
         result.sprintf( "%lld", i );
139
-    } else if ( type == "Q_UINT64" ) {
140
-        Q_UINT64 i;
139
+    } else if ( type == "TQ_UINT64" ) {
140
+        TQ_UINT64 i;
141 141
         stream >> i;
142 142
         result.sprintf( "%llu", i );
143 143
     } else if ( type == "bool" )
@@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
163 163
     {
164 164
         TQColor c;
165 165
         stream >> c;
166
-        result = c.name().local8Bit();
166
+        result = TQString(c.name()).local8Bit();
167 167
     } else if ( type == "TQSize" )
168 168
     {
169 169
         TQSize s;
@@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
190 190
         result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
191 191
     } else if ( type == "TQVariant" )
192 192
     {
193
-        Q_INT32 type;
193
+        TQ_INT32 type;
194 194
         stream >> type;
195 195
         return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
196 196
     } else if ( type == "DCOPRef" )
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
205 205
         result = r.url().local8Bit();
206 206
     } else if ( type.left( 11 ) == "TQValueList<" )
207 207
     {
208
-        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
208
+        if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
209 209
             return result;
210 210
 
211 211
         TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
213 213
         if ( nestedType.isEmpty() )
214 214
             return result;
215 215
 
216
-        Q_UINT32 count;
216
+        TQ_UINT32 count;
217 217
         stream >> count;
218 218
 
219
-        Q_UINT32 i = 0;
219
+        TQ_UINT32 i = 0;
220 220
         for (; i < count; ++i )
221 221
         {
222 222
             TQCString arg = demarshal( stream, nestedType );
@@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
227 227
         }
228 228
     } else if ( type.left( 5 ) == "TQMap<" )
229 229
     {
230
-        int commaPos = type.find( ',', 5 );
230
+        int commaPos = type.tqfind( ',', 5 );
231 231
 
232 232
         if ( commaPos == -1 )
233 233
             return result;
234 234
 
235
-        if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
235
+        if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
236 236
             return result;
237 237
 
238 238
         TQString keyType = type.mid( 5, commaPos - 5 );
239 239
         TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
240 240
 
241
-        Q_UINT32 count;
241
+        TQ_UINT32 count;
242 242
         stream >> count;
243 243
 
244
-        Q_UINT32 i = 0;
244
+        TQ_UINT32 i = 0;
245 245
         for (; i < count; ++i )
246 246
         {
247 247
             TQCString key = demarshal( stream, keyType );
@@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
291 291
 	arg << s.toUInt();
292 292
     else if ( type == "unsigned int" )
293 293
 	arg << s.toUInt();
294
-    else if ( type == "Q_INT32" )
294
+    else if ( type == "TQ_INT32" )
295 295
 	arg << s.toInt();
296
-    else if ( type == "Q_INT64" ) {
296
+    else if ( type == "TQ_INT64" ) {
297 297
 	TQVariant qv = TQVariant( s );
298 298
 	arg << qv.toLongLong();
299 299
     }
300
-    else if ( type == "Q_UINT32" )
300
+    else if ( type == "TQ_UINT32" )
301 301
 	arg << s.toUInt();
302
-    else if ( type == "Q_UINT64" ) {
302
+    else if ( type == "TQ_UINT64" ) {
303 303
 	TQVariant qv = TQVariant( s );
304 304
 	arg << qv.toULongLong();
305 305
     }
@@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
376 376
 	    marshall( dummy_arg, args, j, type );
377 377
 	    count++;
378 378
 	}
379
-	arg << (Q_UINT32) count;
379
+	arg << (TQ_UINT32) count;
380 380
 	// Parse the list for real
381 381
 	while (true) {
382 382
 	    if( i > args.count() )

+ 62
- 62
dcop/dcopclient.cpp View File

@@ -97,13 +97,13 @@ client_map_t *cliMap()
97 97
 
98 98
 DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
99 99
 {
100
-    return cliMap()->find(_appId.data());
100
+    return cliMap()->tqfind(_appId.data());
101 101
 }
102 102
 
103 103
 static
104 104
 void registerLocalClient( const TQCString &_appId, DCOPClient *client )
105 105
 {
106
-    cliMap()->replace(_appId.data(), client);
106
+    cliMap()->tqreplace(_appId.data(), client);
107 107
 }
108 108
 
109 109
 static
@@ -141,7 +141,7 @@ public:
141 141
     TQCString* replyType;
142 142
     TQByteArray* replyData;
143 143
     int replyId;
144
-    Q_INT32 transactionId;
144
+    TQ_INT32 transactionId;
145 145
     TQCString calledApp;
146 146
     TQGuardedPtr<TQObject> replyObject;
147 147
     TQCString replySlot;
@@ -173,7 +173,7 @@ public:
173 173
     TQCString defaultObject;
174 174
     TQPtrList<DCOPClientTransaction> *transactionList;
175 175
     bool transaction;
176
-    Q_INT32 transactionId;
176
+    TQ_INT32 transactionId;
177 177
     int opcode;
178 178
 
179 179
     // Special key values:
@@ -205,7 +205,7 @@ public:
205 205
 class DCOPClientTransaction
206 206
 {
207 207
 public:
208
-    Q_INT32 id;
208
+    TQ_INT32 id;
209 209
     CARD32 key;
210 210
     TQCString senderId;
211 211
 };
@@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
263 263
         disp = "NODISPLAY";
264 264
 
265 265
     int i;
266
-    if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
266
+    if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
267 267
         disp.truncate(i);
268 268
 
269 269
     if (!old)
270 270
     {
271
-        while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
271
+        while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
272 272
             disp[i] = '_';
273 273
     }
274 274
 
@@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
382 382
     case DCOPReplyWait:
383 383
         if ( replyStruct ) {
384 384
             TQCString calledApp, app;
385
-            Q_INT32 id;
385
+            TQ_INT32 id;
386 386
             TQDataStream ds( dataReceived, IO_ReadOnly );
387 387
             ds >> calledApp >> app >> id;
388 388
             replyStruct->transactionId = id;
@@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
398 398
         {
399 399
             TQDataStream ds( dataReceived, IO_ReadOnly );
400 400
             TQCString calledApp, app;
401
-            Q_INT32 id;
401
+            TQ_INT32 id;
402 402
 
403 403
             ds >> calledApp >> app >> id;
404 404
             if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp))
@@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
531 531
     TQByteArray reply;
532 532
     TQDataStream replyStream( reply, IO_WriteOnly );
533 533
 
534
-    Q_INT32 id = c->transactionId();
534
+    TQ_INT32 id = c->transactionId();
535 535
     if (id) {
536 536
         // Call delayed. Send back the transaction ID.
537 537
         replyStream << d->appId << fromApp << id;
@@ -672,9 +672,9 @@ bool DCOPClient::attach()
672 672
 
673 673
 void DCOPClient::bindToApp()
674 674
 {
675
-    // check if we have a qApp instantiated.  If we do,
675
+    // check if we have a tqApp instantiated.  If we do,
676 676
     // we can create a TQSocketNotifier and use it for receiving data.
677
-    if (qApp) {
677
+    if (tqApp) {
678 678
         if ( d->notifier )
679 679
             delete d->notifier;
680 680
         d->notifier = new TQSocketNotifier(socket(),
@@ -690,7 +690,7 @@ void DCOPClient::suspend()
690 690
     if (!d->notifier)
691 691
         return;
692 692
 #endif
693
-    assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet
693
+    assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet
694 694
     d->notifier->setEnabled(false);
695 695
 }
696 696
 
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
764 764
                                                       DCOPAuthCount,
765 765
                                                       const_cast<char **>(DCOPAuthNames),
766 766
                                                       DCOPClientAuthProcs, 0L)) < 0) {
767
-        emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
767
+        emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
768 768
         return false;
769 769
     }
770 770
 
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
779 779
             TQCString fName = dcopServerFile();
780 780
             TQFile f(TQFile::decodeName(fName));
781 781
             if (!f.open(IO_ReadOnly)) {
782
-                emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
782
+                emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
783 783
                 return false;
784 784
             }
785 785
             int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
790 790
                // Should we abort ?
791 791
             }
792 792
             contents[size] = '\0';
793
-            int pos = contents.find('\n');
793
+            int pos = contents.tqfind('\n');
794 794
             if ( pos == -1 ) // Shouldn't happen
795 795
             {
796 796
                 qDebug("Only one line in dcopserver file !: %s", contents.data());
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
819 819
            delete [] d->serverAddr;
820 820
            d->serverAddr = 0;
821 821
         }
822
-        emit attachFailed(TQString::fromLatin1( errBuf ));
822
+        emit attachFailed(TQString::tqfromLatin1( errBuf ));
823 823
         return false;
824 824
     }
825 825
     fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
845 845
             delete [] d->serverAddr;
846 846
             d->serverAddr = 0;
847 847
         }
848
-        emit attachFailed(TQString::fromLatin1( errBuf ));
848
+        emit attachFailed(TQString::tqfromLatin1( errBuf ));
849 849
         return false;
850 850
     } else if (setupstat == IceProtocolAlreadyActive) {
851 851
         if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
853 853
             d->serverAddr = 0;
854 854
         }
855 855
         /* should not happen because 3rd arg to IceOpenConnection was 0. */
856
-        emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
856
+        emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
857 857
         return false;
858 858
     }
859 859
 
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
863 863
             delete [] d->serverAddr;
864 864
             d->serverAddr = 0;
865 865
         }
866
-        emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
866
+        emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
867 867
         return false;
868 868
     }
869 869
 
@@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) {
1017 1017
     if ( fun.isEmpty() )                                // nothing to do
1018 1018
         return fun.copy();
1019 1019
     TQCString result( fun.size() );
1020
-    char *from        = fun.data();
1020
+    char *from        = const_cast<TQCString&>(fun).data();
1021 1021
     char *to        = result.data();
1022 1022
     char *first = to;
1023 1023
     char last = 0;
@@ -1056,7 +1056,7 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId,
1056 1056
 
1057 1057
     if ( localClient  ) {
1058 1058
         bool saveTransaction = d->transaction;
1059
-        Q_INT32 saveTransactionId = d->transactionId;
1059
+        TQ_INT32 saveTransactionId = d->transactionId;
1060 1060
         TQCString saveSenderId = d->senderId;
1061 1061
 
1062 1062
         d->senderId = 0; // Local call
@@ -1167,13 +1167,13 @@ bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj,
1167 1167
         if ( (phase == 1) && localClient ) {
1168 1168
             // In phase 1 we do all local clients
1169 1169
             bool saveTransaction = d->transaction;
1170
-            Q_INT32 saveTransactionId = d->transactionId;
1170
+            TQ_INT32 saveTransactionId = d->transactionId;
1171 1171
             TQCString saveSenderId = d->senderId;
1172 1172
 
1173 1173
             d->senderId = 0; // Local call
1174 1174
             result = localClient->find(  remApp, remObj, remFun, data, replyType, replyData );
1175 1175
 
1176
-            Q_INT32 id = localClient->transactionId();
1176
+            TQ_INT32 id = localClient->transactionId();
1177 1177
             if (id) {
1178 1178
                 // Call delayed. We have to wait till it has been processed.
1179 1179
                 do {
@@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled)
1298 1298
 {
1299 1299
     TQByteArray data;
1300 1300
     TQDataStream ds(data, IO_WriteOnly);
1301
-    ds << static_cast<Q_INT8>(enabled);
1301
+    ds << static_cast<TQ_INT8>(enabled);
1302 1302
 
1303 1303
     TQCString replyType;
1304 1304
     TQByteArray reply;
@@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode )
1310 1310
 {
1311 1311
     TQByteArray data;
1312 1312
     TQDataStream ds(data, IO_WriteOnly);
1313
-    ds << static_cast<Q_INT8>( daemonMode );
1313
+    ds << static_cast<TQ_INT8>( daemonMode );
1314 1314
 
1315 1315
     TQCString replyType;
1316 1316
     TQByteArray reply;
@@ -1331,9 +1331,9 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
1331 1331
         path += '/';
1332 1332
 
1333 1333
     int unnamed = 0;
1334
-    const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees();
1335
-    if ( list ) {
1336
-        TQObjectListIt it( *list );
1334
+    const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject();
1335
+    if ( !list.isEmpty() ) {
1336
+        TQObjectListIt it( list );
1337 1337
         TQObject *obj;
1338 1338
         while ( (obj=it.current()) ) {
1339 1339
             ++it;
@@ -1341,11 +1341,11 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
1341 1341
              if ( n == "unnamed" || n.isEmpty() )
1342 1342
              {
1343 1343
                  n.sprintf("%p", (void *) obj);
1344
-                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
1344
+                 n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1();
1345 1345
              }
1346 1346
              TQCString fn = path + n;
1347 1347
              l.append( fn );
1348
-             if ( obj->tqchildren() )
1348
+             if ( !obj->childrenListObject().isEmpty() )
1349 1349
                  fillQtObjects( l, obj, fn );
1350 1350
         }
1351 1351
     }
@@ -1368,9 +1368,9 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
1368 1368
         path += '/';
1369 1369
 
1370 1370
     int unnamed = 0;
1371
-    const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees();
1372
-    if ( list ) {
1373
-        TQObjectListIt it( *list );
1371
+    const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject();
1372
+    if ( !list.isEmpty() ) {
1373
+        TQObjectListIt it( list );
1374 1374
         TQObject *obj;
1375 1375
         while ( (obj=it.current()) ) {
1376 1376
             ++it;
@@ -1378,11 +1378,11 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
1378 1378
             if ( n == "unnamed" || n.isEmpty() )
1379 1379
              {
1380 1380
                  n.sprintf("%p", (void *) obj);
1381
-                 n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
1381
+                 n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1();
1382 1382
              }
1383 1383
             TQCString fn = path + n;
1384 1384
             l.append( O( fn, obj ) );
1385
-            if ( obj->tqchildren() )
1385
+            if ( !obj->childrenListObject().isEmpty() )
1386 1386
                 fillQtObjectsEx( l, obj, fn );
1387 1387
         }
1388 1388
     }
@@ -1399,7 +1399,7 @@ static TQObject* findQtObject( TQCString id )
1399 1399
     for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
1400 1400
         if ( (*it).s == id ) // exact match
1401 1401
             return (*it).o;
1402
-        if ( !firstContains && (*it).s.contains( expr ) ) {
1402
+        if ( !firstContains && (*it).s.tqcontains( expr ) ) {
1403 1403
             firstContains = (*it).o;
1404 1404
         }
1405 1405
     }
@@ -1413,7 +1413,7 @@ static QCStringList  findQtObjects( TQCString id )
1413 1413
     fillQtObjectsEx( l, 0, "qt" );
1414 1414
     QCStringList result;
1415 1415
     for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
1416
-        if ( (*it).s.contains( expr ) )
1416
+        if ( (*it).s.tqcontains( expr ) )
1417 1417
             result << (*it).s;
1418 1418
     }
1419 1419
     return result;
@@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
1470 1470
             l << "QCStringList properties()";
1471 1471
             l << "bool setProperty(TQCString,TQVariant)";
1472 1472
             l << "TQVariant property(TQCString)";
1473
-            TQStrList lst = o->metaObject()->slotNames( true );
1473
+            TQStrList lst = o->tqmetaObject()->slotNames( true );
1474 1474
             int i = 0;
1475 1475
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
1476
-                if ( o->metaObject()->slot( i++, true )->tqaccess != QMetaData::Public )
1476
+                if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
1477 1477
                     continue;
1478 1478
                 TQCString slot = it.current();
1479 1479
                 if ( slot.contains( "()" ) ) {
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
1487 1487
             replyType = "QCStringList";
1488 1488
             TQDataStream reply( replyData, IO_WriteOnly );
1489 1489
             QCStringList l;
1490
-            TQMetaObject *meta = o->metaObject();
1490
+            TQMetaObject *meta = o->tqmetaObject();
1491 1491
             while ( meta ) {
1492 1492
                 l.prepend( meta->className() );
1493
-                meta = meta->superClass();
1493
+                meta = meta->tqsuperClass();
1494 1494
             }
1495 1495
             reply << l;
1496 1496
             return true;
@@ -1498,10 +1498,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
1498 1498
             replyType = "QCStringList";
1499 1499
             TQDataStream reply( replyData, IO_WriteOnly );
1500 1500
             QCStringList l;
1501
-            TQStrList lst = o->metaObject()->propertyNames( true );
1501
+            TQStrList lst = o->tqmetaObject()->propertyNames( true );
1502 1502
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
1503
-                TQMetaObject *mo = o->metaObject();
1504
-                const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
1503
+                TQMetaObject *mo = o->tqmetaObject();
1504
+                const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true );
1505 1505
                 if ( !p )
1506 1506
                     continue;
1507 1507
                 TQCString prop = p->type();
@@ -1529,13 +1529,13 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
1529 1529
             ds >> name >> value;
1530 1530
             replyType = "bool";
1531 1531
             TQDataStream reply( replyData, IO_WriteOnly );
1532
-            reply << (Q_INT8) o->setProperty( name, value );
1532
+            reply << (TQ_INT8) o->setProperty( name, value );
1533 1533
             return true;
1534 1534
         } else {
1535
-            int slot = o->metaObject()->findSlot( fun, true );
1535
+            int slot = o->tqmetaObject()->tqfindSlot( fun, true );
1536 1536
             if ( slot != -1 ) {
1537 1537
                 replyType = "void";
1538
-                QUObject uo[ 1 ];
1538
+                TQUObject uo[ 1 ];
1539 1539
                 o->qt_invoke( slot, uo );
1540 1540
                 return true;
1541 1541
             }
@@ -1656,7 +1656,7 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId,
1656 1656
 // return true. Return false otherwise.
1657 1657
 static bool findResultOk(TQCString &replyType, TQByteArray &replyData)
1658 1658
 {
1659
-    Q_INT8 success; // Tsk.. why is there no operator>>(bool)?
1659
+    TQ_INT8 success; // Tsk.. why is there no operator>>(bool)?
1660 1660
     if (replyType != "bool") return false;
1661 1661
 
1662 1662
     TQDataStream reply( replyData, IO_ReadOnly );
@@ -1746,13 +1746,13 @@ bool DCOPClient::call(const TQCString &remApp, const TQCString &remObjId,
1746 1746
 
1747 1747
     if ( localClient ) {
1748 1748
         bool saveTransaction = d->transaction;
1749
-        Q_INT32 saveTransactionId = d->transactionId;
1749
+        TQ_INT32 saveTransactionId = d->transactionId;
1750 1750
         TQCString saveSenderId = d->senderId;
1751 1751
 
1752 1752
         d->senderId = 0; // Local call
1753 1753
         bool b = localClient->receive(  remApp, remObjId, remFun, data, replyType, replyData );
1754 1754
         
1755
-        Q_INT32 id = localClient->transactionId();
1755
+        TQ_INT32 id = localClient->transactionId();
1756 1756
         if (id) {
1757 1757
            // Call delayed. We have to wait till it has been processed.
1758 1758
            do {
@@ -1882,7 +1882,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
1882 1882
     for(;;) {
1883 1883
         bool checkMessages = true;
1884 1884
         if ( useEventLoop
1885
-             ? d->notifier != NULL  // useEventLoop needs a socket notifier and a qApp
1885
+             ? d->notifier != NULL  // useEventLoop needs a socket notifier and a tqApp
1886 1886
              : timeout >= 0 ) {     // !useEventLoop doesn't block only for timeout >= 0
1887 1887
             const int guiTimeout = 100;
1888 1888
             checkMessages = false;
@@ -1907,7 +1907,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
1907 1907
                     }
1908 1908
                     if( timeout >= 0 )
1909 1909
                         d->eventLoopTimer.start(time_left - guiTimeout, true);
1910
-                    qApp->enter_loop();
1910
+                    tqApp->enter_loop();
1911 1911
                     d->eventLoopTimer.stop();
1912 1912
                     if ( !old_lock ) {
1913 1913
                         d->non_blocking_call_lock = false;
@@ -1974,7 +1974,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
1974 1974
 
1975 1975
     // Wake up parent call, maybe it's reply is available already.
1976 1976
     if ( d->non_blocking_call_lock ) {
1977
-        qApp->exit_loop();
1977
+        tqApp->exit_loop();
1978 1978
     }
1979 1979
 
1980 1980
     d->currentKey = oldCurrentKey;
@@ -1983,7 +1983,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
1983 1983
 
1984 1984
 void DCOPClient::eventLoopTimeout()
1985 1985
 {
1986
-    qApp->exit_loop();
1986
+    tqApp->exit_loop();
1987 1987
 }
1988 1988
 
1989 1989
 void DCOPClient::processSocketData(int fd)
@@ -2000,8 +2000,8 @@ void DCOPClient::processSocketData(int fd)
2000 2000
         return;
2001 2001
 
2002 2002
     if ( d->non_blocking_call_lock ) {
2003
-        if( qApp )
2004
-            qApp->exit_loop();
2003
+        if( tqApp )
2004
+            tqApp->exit_loop();
2005 2005
         return;
2006 2006
     }
2007 2007
 
@@ -2034,7 +2034,7 @@ TQCString DCOPClient::defaultObject() const
2034 2034
 }
2035 2035
 
2036 2036
 bool
2037
-DCOPClient::isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData)
2037
+DCOPClient::isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData)
2038 2038
 {
2039 2039
     DCOPClientPrivate::LocalTransactionResult *result = d->localTransActionList.take(id);
2040 2040
     if (!result)
@@ -2068,7 +2068,7 @@ DCOPClient::beginTransaction()
2068 2068
     return trans;
2069 2069
 }
2070 2070
 
2071
-Q_INT32
2071
+TQ_INT32
2072 2072
 DCOPClient::transactionId() const
2073 2073
 {
2074 2074
     if (d->transaction)
@@ -2147,7 +2147,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO
2147 2147
 {
2148 2148
     TQCString replyType;
2149 2149
     TQByteArray data, replyData;
2150
-    Q_INT8 iVolatile = Volatile ? 1 : 0;
2150
+    TQ_INT8 iVolatile = Volatile ? 1 : 0;
2151 2151
 
2152 2152
     TQDataStream args(data, IO_WriteOnly );
2153 2153
     args << sender << senderObj << normalizeFunctionSignature(signal) << receiverObj << normalizeFunctionSignature(slot) << iVolatile;
@@ -2163,7 +2163,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO
2163 2163
         return false;
2164 2164
 
2165 2165
     TQDataStream reply(replyData, IO_ReadOnly );
2166
-    Q_INT8 result;
2166
+    TQ_INT8 result;
2167 2167
     reply >> result;
2168 2168
     return (result != 0);
2169 2169
 }
@@ -2197,7 +2197,7 @@ DCOPClient::disconnectDCOPSignal( const TQCString &sender, const TQCString &send
2197 2197
         return false;
2198 2198
 
2199 2199
     TQDataStream reply(replyData, IO_ReadOnly );
2200
-    Q_INT8 result;
2200
+    TQ_INT8 result;
2201 2201
     reply >> result;
2202 2202
     return (result != 0);
2203 2203
 }

+ 4
- 3
dcop/dcopclient.h View File

@@ -65,9 +65,10 @@ typedef TQValueList<TQCString> QCStringList;
65 65
  * @see KApplication::dcopClient()
66 66
  * @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
67 67
  */
68
-class DCOP_EXPORT DCOPClient : public QObject
68
+class DCOP_EXPORT DCOPClient : public TQObject
69 69
 {
70 70
   Q_OBJECT
71
+  TQ_OBJECT
71 72
 
72 73
  public:
73 74
   /**
@@ -511,7 +512,7 @@ class DCOP_EXPORT DCOPClient : public QObject
511 512
    * @see process()
512 513
    * @see beginTransaction()
513 514
    */
514
-  Q_INT32 transactionId() const;
515
+  TQ_INT32 transactionId() const;
515 516
 
516 517
   /**
517 518
    * Checks whether @p remApp is registered with the DCOP server.
@@ -816,7 +817,7 @@ public:
816 817
 
817 818
 private:
818 819
 
819
-  bool isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData);
820
+  bool isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData);
820 821
 
821 822
   bool attachInternal( bool registerAsAnonymous = true );
822 823
 

+ 1
- 1
dcop/dcopidl/main.cpp View File

@@ -47,7 +47,7 @@ int main( int argc, char** argv )
47 47
         return -1;
48 48
     }
49 49
 
50
-    TQByteArray arr = file.readAll();
50
+    TQByteArray arr = TQByteArray(file.readAll());
51 51
     uint len = arr.size();
52 52
     uint j = 1;
53 53
     for (uint i = 1; i<len; i++, j++) {

+ 2
- 2
dcop/dcopidl/scanner.cc View File

@@ -1226,8 +1226,8 @@ YY_RULE_SETUP
1226 1226
 #line 170 "scanner.ll"
1227 1227
 {
1228 1228
 			  TQString s( yytext );
1229
-                          int i = s.find(TQRegExp("[\"<]"))+1;
1230
-                          int j = s.find(TQRegExp("[\">]"), i);
1229
+                          int i = s.tqfind(TQRegExp("[\"<]"))+1;
1230
+                          int j = s.tqfind(TQRegExp("[\">]"), i);
1231 1231
 			  yylval._str = new TQString( s.mid( i, j - i ) );
1232 1232
                           idl_line_no++;
1233 1233
                           return T_INCLUDE;

+ 1
- 0
dcop/dcopidl/scanner.ll View File

@@ -236,6 +236,7 @@ FALSE			return T_FALSE;
236 236
 typedef			return T_TYPEDEF;
237 237
 K_DCOP			return T_DCOP;
238 238
 Q_OBJECT		;
239
+TQ_OBJECT		;
239 240
 ("0"|"0L")		return T_NULL;
240 241
 "extern "[A-Za-z0-9_ \t*]+	return T_EXTERN;
241 242
 "extern \"C\""			return T_EXTERN_C;

+ 1
- 1
dcop/dcopidl/yacc.cc View File

@@ -1643,7 +1643,7 @@ yyreduce:
1643 1643
   case 15:
1644 1644
 #line 221 "yacc.yy"
1645 1645
     {
1646
-                      int pos = in_namespace.findRev( "::", -3 );
1646
+                      int pos = in_namespace.tqfindRev( "::", -3 );
1647 1647
                       if( pos >= 0 )
1648 1648
                           in_namespace = in_namespace.left( pos + 2 );
1649 1649
                       else

+ 1
- 1
dcop/dcopidl/yacc.yy View File

@@ -219,7 +219,7 @@ declaration
219 219
                   } 
220 220
             main T_RIGHT_CURLY_BRACKET opt_semicolon
221 221
                   {
222
-                      int pos = in_namespace.findRev( "::", -3 );
222
+                      int pos = in_namespace.tqfindRev( "::", -3 );
223 223
                       if( pos >= 0 )
224 224
                           in_namespace = in_namespace.left( pos + 2 );
225 225
                       else

+ 3
- 3
dcop/dcopidl2cpp/main.cpp View File

@@ -104,11 +104,11 @@ int main( int argc, char** argv )
104 104
     TQString base( argv[argpos] );
105 105
     TQString idl = base;
106 106
 
107
-    int pos = base.findRev( '.' );
107
+    int pos = base.tqfindRev( '.' );
108 108
     if ( pos != -1 )
109 109
 	base = base.left( pos );
110 110
 
111
-    pos = idl.findRev('/');
111
+    pos = idl.tqfindRev('/');
112 112
     if ( pos != -1 )
113 113
 	idl = idl.mid( pos+1 );
114 114
 
@@ -118,7 +118,7 @@ int main( int argc, char** argv )
118 118
     if ( generate_stub ) {
119 119
 	TQString header = base;
120 120
 	generateStub( idl, header + "_stub.h", de );
121
-	pos = header.findRev('/');
121
+	pos = header.tqfindRev('/');
122 122
 	if ( pos != -1 )
123 123
 	    header = header.mid( pos+1 );
124 124
 	generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de);

+ 2
- 2
dcop/dcopidl2cpp/skel.cpp View File

@@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
177 177
 	TQString namespace_tmp = className;
178 178
 	str << endl;
179 179
 	for(;;) {
180
-	    int pos = namespace_tmp.find( "::" );
180
+	    int pos = namespace_tmp.tqfind( "::" );
181 181
 	    if( pos < 0 ) {
182 182
 		className = namespace_tmp;
183 183
 		break;
@@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
223 223
 	    str << "\t    fdict->insert( " << className << "_ftable[i][1],  new int( i ) );" << endl;
224 224
 	    str << "    }" << endl;
225 225
     
226
-	    str << "    int* fp = fdict->find( fun );" << endl;
226
+	    str << "    int* fp = fdict->tqfind( fun );" << endl;
227 227
 	    str << "    switch ( fp?*fp:-1) {" << endl;
228 228
 	}
229 229
 	s = n.nextSibling().toElement();

+ 5
- 5
dcop/dcopidl2cpp/stub.cpp View File

@@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
54 54
     str << endl;
55 55
 
56 56
     TQString ifdefstring = idl.upper();
57
-    int pos = idl.findRev( '.' );
57
+    int pos = idl.tqfindRev( '.' );
58 58
     if ( pos != -1 )
59 59
 	ifdefstring = ifdefstring.left( pos );
60 60
 
@@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
107 107
 	}
108 108
 
109 109
 	if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub
110
-	    if( all_includes.contains( DCOPParent + ".h" ))
110
+	    if( all_includes.tqcontains( DCOPParent + ".h" ))
111 111
 		str << "#include <" << DCOPParent << "_stub.h>" << endl;
112
-	    else if( all_includes.contains( DCOPParent.lower() + ".h" ))
112
+	    else if( all_includes.tqcontains( DCOPParent.lower() + ".h" ))
113 113
 		str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl;
114 114
 	    else {// damn ... let's assume it's the last include
115 115
 		TQString stub_h = all_includes.last();
116
-		unsigned int pos = stub_h.find( ".h" );
116
+		unsigned int pos = stub_h.tqfind( ".h" );
117 117
 		if( pos > 0 ) {
118 118
 		    stub_h = stub_h.remove( pos, 100000 );
119 119
 		    str << "#include <" << stub_h << "_stub.h>" << endl;
@@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
128 128
 	int namespace_count = 0;
129 129
 	TQString namespace_tmp = className;
130 130
 	for(;;) {
131
-	    int pos = namespace_tmp.find( "::" );
131
+	    int pos = namespace_tmp.tqfind( "::" );
132 132
 	    if( pos < 0 ) {
133 133
 		className = namespace_tmp;
134 134
 		break;

+ 1
- 1
dcop/dcopidl2cpp/stubimpl.cpp View File

@@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri
98 98
 	TQString namespace_tmp = className_stub;
99 99
 	str << endl;
100 100
 	for(;;) {
101
-	    int pos = namespace_tmp.find( "::" );
101
+	    int pos = namespace_tmp.tqfind( "::" );
102 102
 	    if( pos < 0 ) {
103 103
 		className_stub = namespace_tmp;
104 104
 		break;

+ 3
- 3
dcop/dcopobject.cpp View File

@@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj)
58 58
     while (currentObj != 0L) {
59 59
         ident.prepend( currentObj->name() );
60 60
         ident.prepend("/");
61
-        currentObj = currentObj->parent();
61
+        currentObj = TQT_TQOBJECT(currentObj->parent());
62 62
     }
63 63
     if ( ident[0] == '/' )
64 64
         ident = ident.mid(1);
@@ -116,7 +116,7 @@ TQCString DCOPObject::objId() const
116 116
 
117 117
 bool DCOPObject::hasObject(const TQCString &_objId)
118 118
 {
119
-  if (objMap()->contains(_objId))
119
+  if (objMap()->tqcontains(_objId))
120 120
     return true;
121 121
   else
122 122
     return false;
@@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj )
155 155
     {
156 156
 	identity.prepend( currentObj->name() );
157 157
 	identity.prepend("/");
158
-	currentObj = currentObj->parent();
158
+	currentObj = TQT_TQOBJECT(currentObj->parent());
159 159
     }
160 160
     if ( identity[0] == '/' )
161 161
 	identity = identity.mid(1);

+ 4
- 4
dcop/dcopref.cpp View File

@@ -62,9 +62,9 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co
62 62
 	return reply;
63 63
     }
64 64
     TQCString sig = fun;
65
-    if ( fun.find('(') == -1 ) {
65
+    if ( fun.tqfind('(') == -1 ) {
66 66
 	sig += args;
67
-	if( args.find( "<unknown" ) != -1 )
67
+	if( args.tqfind( "<unknown" ) != -1 )
68 68
 	    qWarning("DCOPRef: unknown type error "
69 69
 		     "<\"%s\",\"%s\">::call(\"%s\",%s",
70 70
 		     STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
@@ -87,9 +87,9 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T
87 87
     }
88 88
     Q_UNUSED( data );
89 89
     TQCString sig = fun;
90
-    if ( fun.find('(') == -1 ) {
90
+    if ( fun.tqfind('(') == -1 ) {
91 91
 	sig += args;
92
-	if( args.find( "<unknown" ) != -1 )
92
+	if( args.tqfind( "<unknown" ) != -1 )
93 93
 	    qWarning("DCOPRef: unknown type error "
94 94
 		     "<\"%s\",\"%s\">::send(\"%s\",%s",
95 95
 		     STR(m_app), STR(m_obj), STR(fun), args.data()+1 );

+ 1
- 1
dcop/dcopref.h View File

@@ -396,7 +396,7 @@ public:
396 396
      * Flag for allowing entering the event loop if the call blocks too long.
397 397
      * @p NoEventLoop disables entering the event loop.
398 398
      * @p UseEventLoop allows entering the event loop while waiting for long
399
-     * blocking DCOP call, thus making the GUI repaint if needed, and possibly
399
+     * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
400 400
      * allowing also other code in the application to be executed.
401 401
      * @see DCOPClient::call()
402 402
      */

+ 28
- 28
dcop/dcopserver.cpp View File

@@ -124,9 +124,9 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr)
124 124
 static TQCString readQCString(TQDataStream &ds)
125 125
 {
126 126
    TQCString result;
127
-   Q_UINT32 len;
127
+   TQ_UINT32 len;
128 128
    ds >> len;
129
-   TQIODevice *device = ds.device();
129
+   TQIODevice *device = ds.tqdevice();
130 130
    int bytesLeft = device->size()-device->at();
131 131
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
132 132
    {
@@ -142,9 +142,9 @@ static TQCString readQCString(TQDataStream &ds)
142 142
 static TQByteArray readQByteArray(TQDataStream &ds)
143 143
 {
144 144
    TQByteArray result;
145
-   Q_UINT32 len;
145
+   TQ_UINT32 len;
146 146
    ds >> len;
147
-   TQIODevice *device = ds.device();
147
+   TQIODevice *device = ds.tqdevice();
148 148
    int bytesLeft = device->size()-device->at();
149 149
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
150 150
    {
@@ -287,7 +287,7 @@ qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.si
287 287
        // assert(conn->outputBuffer.isEmpty());
288 288
     }
289 289
 
290
-    unsigned long nleft = writeIceData(iceConn, _data.size(), _data.data());
290
+    unsigned long nleft = writeIceData(iceConn, _data.size(), const_cast<TQByteArray&>(_data).data());
291 291
     if ((nleft > 0) && conn)
292 292
     {
293 293
         conn->waitForOutputReady(_data, _data.size() - nleft);
@@ -319,7 +319,7 @@ void DCOPServer::slotOutputReady(int socket)
319 319
 qWarning("DCOPServer: slotOutputReady fd = %d", socket);
320 320
 #endif
321 321
    // Find out connection.
322
-   DCOPConnection *conn = fd_clients.find(socket);
322
+   DCOPConnection *conn = fd_clients.tqfind(socket);
323 323
    //assert(conn);
324 324
    //assert(conn->outputBlocked);
325 325
    //assert(conn->socket() == socket);
@@ -396,7 +396,7 @@ qWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn));
396 396
    DCOPIceWrite(_iceConn, _data);
397 397
 }
398 398
 
399
-class DCOPListener : public QSocketNotifier
399
+class DCOPListener : public TQSocketNotifier
400 400
 {
401 401
 public:
402 402
     DCOPListener( IceListenObj obj )
@@ -710,7 +710,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/,
710 710
 void DCOPServer::processMessage( IceConn iceConn, int opcode,
711 711
 				 unsigned long length, Bool /*swap*/)
712 712
 {
713
-    DCOPConnection* conn = clients.find( iceConn );
713
+    DCOPConnection* conn = clients.tqfind( iceConn );
714 714
     if ( !conn ) {
715 715
 	qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
716 716
 	return;
@@ -1109,7 +1109,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId )
1109 1109
 {
1110 1110
     if ( appId.isNull() )
1111 1111
 	return 0;
1112
-    DCOPConnection* conn = appIds.find( appId );
1112
+    DCOPConnection* conn = appIds.tqfind( appId );
1113 1113
     return conn;
1114 1114
 }
1115 1115
 
@@ -1204,7 +1204,7 @@ void DCOPServer::removeConnection( void* data )
1204 1204
     while (!conn->waitingForReply.isEmpty()) {
1205 1205
 	IceConn iceConn = conn->waitingForReply.take(0);
1206 1206
 	if (iceConn) {
1207
-	    DCOPConnection* target = clients.find( iceConn );
1207
+	    DCOPConnection* target = clients.tqfind( iceConn );
1208 1208
 	    qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
1209 1209
 	    TQByteArray reply;
1210 1210
 	    DCOPMsg *pMsg;
@@ -1226,7 +1226,7 @@ void DCOPServer::removeConnection( void* data )
1226 1226
     while (!conn->waitingForDelayedReply.isEmpty()) {
1227 1227
 	IceConn iceConn = conn->waitingForDelayedReply.take(0);
1228 1228
 	if (iceConn) {
1229
-	    DCOPConnection* target = clients.find( iceConn );
1229
+	    DCOPConnection* target = clients.tqfind( iceConn );
1230 1230
 	    qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
1231 1231
 	    TQByteArray reply;
1232 1232
 	    DCOPMsg *pMsg;
@@ -1247,7 +1247,7 @@ void DCOPServer::removeConnection( void* data )
1247 1247
     {
1248 1248
 	IceConn iceConn = conn->waitingOnReply.take(0);
1249 1249
         if (iceConn) {
1250
-           DCOPConnection* target = clients.find( iceConn );
1250
+           DCOPConnection* target = clients.tqfind( iceConn );
1251 1251
            if (!target)
1252 1252
            {
1253 1253
                qWarning("DCOP Error: still waiting for answer from non-existing client.");
@@ -1359,7 +1359,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1359 1359
 
1360 1360
     if ( obj == "emit")
1361 1361
     {
1362
-        DCOPConnection* conn = clients.find( iceConn );
1362
+        DCOPConnection* conn = clients.tqfind( iceConn );
1363 1363
         if (conn) {
1364 1364
 	    //qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data());
1365 1365
 	    dcopSignals->emitSignal(conn, fun, data, false);
@@ -1370,13 +1370,13 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1370 1370
     if ( fun == "setDaemonMode(bool)" ) {
1371 1371
         TQDataStream args( data, IO_ReadOnly );
1372 1372
         if ( !args.atEnd() ) {
1373
-            Q_INT8 iDaemon;
1373
+            TQ_INT8 iDaemon;
1374 1374
             bool daemon;
1375 1375
             args >> iDaemon;
1376 1376
 
1377 1377
             daemon = static_cast<bool>( iDaemon );
1378 1378
 
1379
-	    DCOPConnection* conn = clients.find( iceConn );
1379
+	    DCOPConnection* conn = clients.tqfind( iceConn );
1380 1380
             if ( conn && !conn->appId.isNull() ) {
1381 1381
                 if ( daemon ) {
1382 1382
                     if ( !conn->daemon )
@@ -1414,10 +1414,10 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1414 1414
 	if (!args.atEnd()) {
1415 1415
 	    TQCString app2 = readQCString(args);
1416 1416
 	    TQDataStream reply( replyData, IO_WriteOnly );
1417
-	    DCOPConnection* conn = clients.find( iceConn );
1417
+	    DCOPConnection* conn = clients.tqfind( iceConn );
1418 1418
 	    if ( conn && !app2.isEmpty() ) {
1419 1419
 		if ( !conn->appId.isNull() &&
1420
-		     appIds.find( conn->appId ) == conn ) {
1420
+		     appIds.tqfind( conn->appId ) == conn ) {
1421 1421
 		    appIds.remove( conn->appId );
1422 1422
 
1423 1423
 		}
@@ -1440,7 +1440,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1440 1440
 #endif
1441 1441
 
1442 1442
 		conn->appId = app2;
1443
-		if ( appIds.find( app2 ) != 0 ) {
1443
+		if ( appIds.tqfind( app2 ) != 0 ) {
1444 1444
 		    // we already have this application, unify
1445 1445
 		    int n = 1;
1446 1446
 		    TQCString tmp;
@@ -1449,12 +1449,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1449 1449
 			tmp.setNum( n );
1450 1450
 			tmp.prepend("-");
1451 1451
 			tmp.prepend( app2 );
1452
-		    } while ( appIds.find( tmp ) != 0 );
1452
+		    } while ( appIds.tqfind( tmp ) != 0 );
1453 1453
 		    conn->appId = tmp;
1454 1454
 		}
1455 1455
 		appIds.insert( conn->appId, conn );
1456 1456
 
1457
-		int c = conn->appId.find( '-' );
1457
+		int c = conn->appId.tqfind( '-' );
1458 1458
 		if ( c > 0 )
1459 1459
 		    conn->plainAppId = conn->appId.left( c );
1460 1460
 		else
@@ -1494,9 +1494,9 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1494 1494
     } else if ( fun == "setNotifications(bool)" ) {
1495 1495
 	TQDataStream args( data, IO_ReadOnly );
1496 1496
 	if (!args.atEnd()) {
1497
-	    Q_INT8 notifyActive;
1497
+	    TQ_INT8 notifyActive;
1498 1498
 	    args >> notifyActive;
1499
-	    DCOPConnection* conn = clients.find( iceConn );
1499
+	    DCOPConnection* conn = clients.tqfind( iceConn );
1500 1500
 	    if ( conn ) {
1501 1501
 		if ( notifyActive )
1502 1502
 		    conn->notifyRegister++;
@@ -1507,7 +1507,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1507 1507
 	    return true;
1508 1508
 	}
1509 1509
     } else if ( fun == "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)") {
1510
-        DCOPConnection* conn = clients.find( iceConn );
1510
+        DCOPConnection* conn = clients.tqfind( iceConn );
1511 1511
         if (!conn) return false;
1512 1512
         TQDataStream args(data, IO_ReadOnly );
1513 1513
         if (args.atEnd()) return false;
@@ -1516,16 +1516,16 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1516 1516
         TQCString signal = readQCString(args);
1517 1517
         TQCString receiverObj = readQCString(args);
1518 1518
         TQCString slot = readQCString(args);
1519
-        Q_INT8 Volatile;
1519
+        TQ_INT8 Volatile;
1520 1520
         args >> Volatile;
1521 1521
         //qDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data());
1522 1522
         bool b = dcopSignals->connectSignal(sender, senderObj, signal, conn, receiverObj, slot, (Volatile != 0));
1523 1523
         replyType = "bool";
1524 1524
         TQDataStream reply( replyData, IO_WriteOnly );
1525
-        reply << (Q_INT8) (b?1:0);
1525
+        reply << (TQ_INT8) (b?1:0);
1526 1526
         return true;
1527 1527
     } else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") {
1528
-        DCOPConnection* conn = clients.find( iceConn );
1528
+        DCOPConnection* conn = clients.tqfind( iceConn );
1529 1529
         if (!conn) return false;
1530 1530
         TQDataStream args(data, IO_ReadOnly );
1531 1531
         if (args.atEnd()) return false;
@@ -1538,7 +1538,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1538 1538
         bool b = dcopSignals->disconnectSignal(sender, senderObj, signal, conn, receiverObj, slot);
1539 1539
         replyType = "bool";
1540 1540
         TQDataStream reply( replyData, IO_WriteOnly );
1541
-        reply << (Q_INT8) (b?1:0);
1541
+        reply << (TQ_INT8) (b?1:0);
1542 1542
         return true;
1543 1543
     }
1544 1544
 
@@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
1618 1618
 	TQCString contents( size+1 );
1619 1619
 	bool ok = f.readBlock( contents.data(), size ) == size;
1620 1620
 	contents[size] = '\0';
1621
-	int pos = contents.find('\n');
1621
+	int pos = contents.tqfind('\n');
1622 1622
 	ok = ok && ( pos != -1 );
1623 1623
 	pid_t pid = ok ? contents.mid(pos+1).toUInt(&ok) : 0;
1624 1624
 	f.close();

+ 3
- 3
dcop/dcopserver.h View File

@@ -66,7 +66,7 @@ typedef TQValueList<TQCString> QCStringList;
66 66
 /**
67 67
  * @internal
68 68
  */
69
-class DCOPConnection : public QSocketNotifier
69
+class DCOPConnection : public TQSocketNotifier
70 70
 {
71 71
 public:
72 72
     DCOPConnection( IceConn conn );
@@ -112,7 +112,7 @@ public:
112 112
 /**
113 113
  * @internal
114 114
  */
115
-class DCOPServer : public QObject
115
+class DCOPServer : public TQObject
116 116
 {
117 117
     Q_OBJECT
118 118
 public:
@@ -130,7 +130,7 @@ public:
130 130
 
131 131
     DCOPConnection *findApp(const TQCString &appId);
132 132
     DCOPConnection *findConn(IceConn iceConn)
133
-       { return clients.find(iceConn); }
133
+       { return clients.tqfind(iceConn); }
134 134
 
135 135
     void sendMessage(DCOPConnection *conn, const TQCString &sApp,
136 136
                      const TQCString &rApp, const TQCString &rObj,

+ 9
- 9
dcop/dcopsignals.cpp View File

@@ -39,14 +39,14 @@ DCOPSignals::emitSignal( DCOPConnection *conn, const TQCString &_fun, const TQBy
39 39
 {
40 40
    TQCString senderObj;
41 41
    TQCString fun = _fun;
42
-   int i = fun.find('#');
42
+   int i = fun.tqfind('#');
43 43
    if (i > -1)
44 44
    {
45 45
       senderObj = fun.left(i);
46 46
       fun = fun.mid(i+1);
47 47
    }
48 48
 
49
-   DCOPSignalConnectionList *list = connections.find(fun);
49
+   DCOPSignalConnectionList *list = connections.tqfind(fun);
50 50
    if (!list) return;
51 51
    for(DCOPSignalConnection *current = list->first(); current; current = list->next())
52 52
    {
@@ -102,16 +102,16 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
102 102
    // TODO: Check if signal and slot match
103 103
    TQCString signalArgs, slotArgs;
104 104
    int i,j;
105
-   i = signal.find('(');
105
+   i = signal.tqfind('(');
106 106
    if (i < 0) return false;
107 107
    signalArgs = signal.mid(i+1);
108
-   j = signalArgs.find(')');
108
+   j = signalArgs.tqfind(')');
109 109
    if (j < 0) return false;
110 110
    signalArgs.truncate(j);
111
-   i = slot.find('(');
111
+   i = slot.tqfind('(');
112 112
    if (i < 0) return false;
113 113
    slotArgs = slot.mid(i+1);
114
-   j = slotArgs.find(')');
114
+   j = slotArgs.tqfind(')');
115 115
    if (j < 0) return false;
116 116
    slotArgs.truncate(j);
117 117
 
@@ -142,7 +142,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
142 142
    current->recvObj = receiverObj;
143 143
    current->slot = slot;
144 144
 
145
-   DCOPSignalConnectionList *list = connections.find(signal);
145
+   DCOPSignalConnectionList *list = connections.tqfind(signal);
146 146
    if (!list)
147 147
    {
148 148
       list = new DCOPSignalConnectionList;
@@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO
177 177
       return true;
178 178
    }
179 179
 
180
-   DCOPSignalConnectionList *list = connections.find(signal);
180
+   DCOPSignalConnectionList *list = connections.tqfind(signal);
181 181
    if (!list)
182 182
       return false; // Not found...
183 183
 
@@ -255,7 +255,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj)
255 255
       if (current->recvConn != conn)
256 256
          current->recvConn->signalConnectionList()->removeRef(current);
257 257
 
258
-      DCOPSignalConnectionList *signalList = connections.find(current->signal);
258
+      DCOPSignalConnectionList *signalList = connections.tqfind(current->signal);
259 259
       if (signalList)
260 260
       {
261 261
          signalList->removeRef(current);

+ 6
- 6
dcop/kdatastream.h View File

@@ -6,13 +6,13 @@
6 6
 #ifdef USE_QT3
7 7
 inline TQDataStream & operator << (TQDataStream & str, bool b)
8 8
 {
9
-  str << Q_INT8(b);
9
+  str << TQ_INT8(b);
10 10
   return str;
11 11
 }
12 12
 
13 13
 inline TQDataStream & operator >> (TQDataStream & str, bool & b)
14 14
 {
15
-  Q_INT8 l;
15
+  TQ_INT8 l;
16 16
   str >> l;
17 17
   b = bool(l);
18 18
   return str;
@@ -22,7 +22,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b)
22 22
 #if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
23 23
 inline TQDataStream & operator << (TQDataStream & str, long long int ll)
24 24
 {
25
-  Q_UINT32 l1,l2;
25
+  TQ_UINT32 l1,l2;
26 26
   l1 = ll & 0xffffffffLL;
27 27
   l2 = ll >> 32;
28 28
   str << l1 << l2;
@@ -31,7 +31,7 @@ inline TQDataStream & operator << (TQDataStream & str, long long int ll)
31 31
 
32 32
 inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
33 33
 {
34
-  Q_UINT32 l1,l2;
34
+  TQ_UINT32 l1,l2;
35 35
   str >> l1 >> l2;
36 36
   ll = ((unsigned long long int)(l2) << 32) + (long long int) l1;
37 37
   return str;
@@ -39,7 +39,7 @@ inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
39 39
 
40 40
 inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll)
41 41
 {
42
-  Q_UINT32 l1,l2;
42
+  TQ_UINT32 l1,l2;
43 43
   l1 = ll & 0xffffffffLL;
44 44
   l2 = ll >> 32;
45 45
   str << l1 << l2;
@@ -48,7 +48,7 @@ inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll
48 48
 
49 49
 inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll)
50 50
 {
51
-  Q_UINT32 l1,l2;
51
+  TQ_UINT32 l1,l2;
52 52
   str >> l1 >> l2;
53 53
   ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1;
54 54
   return str;

+ 2
- 2
dcop/testdcop.h View File

@@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 35
 
36 36
 #include <stdio.h>
37 37
 /**
38
- $QTDIR/bin/moc testdcop.cpp -o testdcop.moc
38
+ $QTDIR/bin/tqmoc testdcop.cpp -o testdcop.moc
39 39
  g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib
40 40
  @internal
41 41
 
42 42
 **/
43 43
 
44
-class TestObject : public QObject
44
+class TestObject : public TQObject
45 45
 {
46 46
   Q_OBJECT
47 47
 public:

+ 1
- 1
dnssd/domainbrowser.cpp View File

@@ -125,7 +125,7 @@ void DomainBrowser::startBrowse()
125 125
 
126 126
 void DomainBrowser::gotNewDomain(const TQString& domain)
127 127
 {
128
-	if (d->m_domains.contains(domain)) return;
128
+	if (d->m_domains.tqcontains(domain)) return;
129 129
 	d->m_domains.append(domain);
130 130
 	emit domainAdded(domain);
131 131
 }

+ 1
- 1
dnssd/domainbrowser.h View File

@@ -38,7 +38,7 @@ class DomainBrowserPrivate;
38 38
 @short Class used to provide current list of domains for browsing.
39 39
 @author Jakub Stachowski
40 40
 */
41
-class KDNSSD_EXPORT DomainBrowser : public QObject
41
+class KDNSSD_EXPORT DomainBrowser : public TQObject
42 42
 {
43 43
 	Q_OBJECT
44 44
 public:

+ 1
- 1
dnssd/query.h View File

@@ -36,7 +36,7 @@ name, either multicast or unicast DNS will be used.
36 36
 @short Class that represents service query in one domain.
37 37
 @author Jakub Stachowski
38 38
  */
39
-class KDNSSD_EXPORT Query : public QObject
39
+class KDNSSD_EXPORT Query : public TQObject
40 40
 {
41 41
 	Q_OBJECT
42 42
 public:

+ 2
- 2
dnssd/remoteservice.cpp View File

@@ -166,7 +166,7 @@ void RemoteService::virtual_hook(int, void*)
166 166
 TQDataStream & operator<< (TQDataStream & s, const RemoteService & a)
167 167
 {
168 168
 	s << (static_cast<ServiceBase>(a));
169
-	Q_INT8 resolved = a.d->m_resolved ? 1:0;
169
+	TQ_INT8 resolved = a.d->m_resolved ? 1:0;
170 170
 	s << resolved;
171 171
 	return s;
172 172
 }
@@ -177,7 +177,7 @@ TQDataStream & operator>> (TQDataStream & s, RemoteService & a)
177 177
 #ifdef HAVE_DNSSD
178 178
 	a.d->stop();
179 179
 #endif
180
-	Q_INT8 resolved;
180
+	TQ_INT8 resolved;
181 181
 	operator>>(s,(static_cast<ServiceBase&>(a)));
182 182
 	s >> resolved;
183 183
 	a.d->m_resolved = (resolved == 1);

+ 2
- 2
dnssd/responder.cpp View File

@@ -72,7 +72,7 @@ Responder& Responder::self()
72 72
 
73 73
 void Responder::process()
74 74
 {
75
-    qApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
75
+    tqApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
76 76
 }
77 77
 
78 78
 #ifdef HAVE_DNSSD
@@ -88,7 +88,7 @@ AvahiClientState Responder::state() const
88 88
 
89 89
 bool domainIsLocal(const TQString& domain)
90 90
 {
91
-	return domain.section('.',-1,-1).lower()=="local";
91
+	return TQString(domain.section('.',-1,-1)).lower()=="local";
92 92
 }
93 93
 
94 94
 TQCString domainToDNS(const TQString &domain)

+ 1
- 1
dnssd/responder.h View File

@@ -41,7 +41,7 @@ This class should not be used directly.
41 41
 @author Jakub Stachowski
42 42
 @short Internal class wrapping avahi client
43 43
  */
44
-class Responder : public QObject
44
+class Responder : public TQObject
45 45
 {
46 46
 	Q_OBJECT
47 47
 

+ 4
- 4
dnssd/sdevent.h View File

@@ -30,13 +30,13 @@ namespace DNSSD
30 30
 
31 31
 enum Operation { SD_ERROR = 101,SD_ADDREMOVE, SD_PUBLISH, SD_RESOLVE};
32 32
 
33
-class ErrorEvent : public QCustomEvent
33
+class ErrorEvent : public TQCustomEvent
34 34
 {
35 35
 public:
36 36
 	ErrorEvent() : TQCustomEvent(TQEvent::User+SD_ERROR) 
37 37
 	{}
38 38
 };
39
-class AddRemoveEvent : public QCustomEvent
39
+class AddRemoveEvent : public TQCustomEvent
40 40
 {
41 41
 public:
42 42
 	enum Operation { Add, Remove };
@@ -51,7 +51,7 @@ public:
51 51
 	const TQString m_domain;
52 52
 };
53 53
 
54
-class PublishEvent : public QCustomEvent
54
+class PublishEvent : public TQCustomEvent
55 55
 {
56 56
 public:
57 57
 	PublishEvent(bool ok) : TQCustomEvent(TQEvent::User+SD_PUBLISH), m_ok(ok)
@@ -60,7 +60,7 @@ public:
60 60
 	bool m_ok;
61 61
 };
62 62
 
63
-class ResolveEvent : public QCustomEvent
63
+class ResolveEvent : public TQCustomEvent
64 64
 {
65 65
 public:
66 66
 	ResolveEvent(const TQString& hostname, unsigned short port,

+ 4
- 4
dnssd/servicebase.cpp View File

@@ -51,14 +51,14 @@ void ServiceBase::decode(const TQString& name)
51 51
 	} else {		// normal service or domain
52 52
 		TQString decoded_name=name;
53 53
 		decoded_name=decoded_name.replace("\\\\","\\");
54
-		int i = decoded_name.find(TQRegExp("[^\\\\]\\."));
54
+		int i = decoded_name.tqfind(TQRegExp("[^\\\\]\\."));
55 55
 		if (i==-1) return;            // first find service name
56 56
 		rest = decoded_name.mid(i+2);
57 57
 		m_serviceName=decoded_name.left(i+1).replace("\\.",".");
58 58
 	}
59 59
 	m_type = rest.section('.',0,1);
60 60
 	// does it really have a type?
61
-	if (m_type[0]=='_' && m_type[m_type.find('.')+1]=='_')
61
+	if (m_type[0]=='_' && m_type[m_type.tqfind('.')+1]=='_')
62 62
 		m_domain = rest.section('.',2,-1,TQString::SectionIncludeTrailingSep);
63 63
 	else {
64 64
 		m_type="";
@@ -100,13 +100,13 @@ void ServiceBase::virtual_hook(int, void*)
100 100
 
101 101
 TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a)
102 102
 {
103
-	s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << Q_INT16(a.m_port) << a.m_textData;
103
+	s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << TQ_INT16(a.m_port) << a.m_textData;
104 104
 	return s;
105 105
 }
106 106
 
107 107
 TQDataStream & operator>> (TQDataStream & s, ServiceBase & a)
108 108
 {
109
-	Q_INT16 port;
109
+	TQ_INT16 port;
110 110
 	s >> a.m_serviceName >> a.m_type >> a.m_domain >> a.m_hostName >> port >> a.m_textData;
111 111
 	a.m_port = port;	
112 112
 	return s;

+ 1
- 1
dnssd/servicebrowser.cpp View File

@@ -108,7 +108,7 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const
108 108
 
109 109
 void ServiceBrowser::serviceResolved(bool success)
110 110
 {
111
-	TQObject* sender_obj = const_cast<TQObject*>(sender());
111
+	TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()));
112 112
 	RemoteService* svr = static_cast<RemoteService*>(sender_obj);
113 113
 	disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool)));
114 114
 	TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin();

+ 1
- 1
dnssd/servicebrowser.h View File

@@ -51,7 +51,7 @@ to constructor, domains configured by user will be searched.
51 51
 @author Jakub Stachowski
52 52
 @short Browsing for specific type of services or all available service types
53 53
  */
54
-class KDNSSD_EXPORT ServiceBrowser : public QObject
54
+class KDNSSD_EXPORT ServiceBrowser : public TQObject
55 55
 {
56 56
 	Q_OBJECT
57 57
 public:

+ 4
- 4
interfaces/khexedit/byteseditinterface.h View File

@@ -143,8 +143,8 @@ class BytesEditInterface
143 143
     virtual bool isModified() const = 0;
144 144
 
145 145
   public: // call for action
146
-    /** repaint the indizes from i1 to i2 */
147
-    virtual void repaintRange( int i1, int i2 ) = 0;
146
+    /** tqrepaint the indizes from i1 to i2 */
147
+    virtual void tqrepaintRange( int i1, int i2 ) = 0;
148 148
 };
149 149
 
150 150
 
@@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
159 159
   if( !t )
160 160
     return 0;
161 161
 
162
-  return static_cast<BytesEditInterface*>( t->qt_cast("KHE::BytesEditInterface") );
162
+  return static_cast<BytesEditInterface*>( t->tqqt_cast("KHE::BytesEditInterface") );
163 163
 }
164 164
 
165 165
 /** tries to create an instance of a hexedit widget for arrays of chars (char[])
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
221 221
 inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
222 222
 {
223 223
   return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
224
-      ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
224
+      ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
225 225
 }
226 226
 
227 227
 }

+ 1
- 1
interfaces/khexedit/charcolumninterface.h View File

@@ -97,7 +97,7 @@ CharColumnInterface *charColumnInterface( T *t )
97 97
   if( !t )
98 98
     return 0;
99 99
 
100
-  return static_cast<CharColumnInterface*>( t->qt_cast("KHE::CharColumnInterface") );
100
+  return static_cast<CharColumnInterface*>( t->tqqt_cast("KHE::CharColumnInterface") );
101 101
 }
102 102
 
103 103
 }

+ 1
- 1
interfaces/khexedit/clipboardinterface.h View File

@@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t )
78 78
   if( !t )
79 79
     return 0;
80 80
 
81
-  return static_cast<ClipboardInterface*>( t->qt_cast("KHE::ClipboardInterface") );
81
+  return static_cast<ClipboardInterface*>( t->tqqt_cast("KHE::ClipboardInterface") );
82 82
 }
83 83
 
84 84
 }

+ 1
- 1
interfaces/khexedit/valuecolumninterface.h View File

@@ -162,7 +162,7 @@ ValueColumnInterface *valueColumnInterface( T *t )
162 162
   if( !t )
163 163
     return 0;
164 164
 
165
-  return static_cast<ValueColumnInterface*>( t->qt_cast("KHE::ValueColumnInterface") );
165
+  return static_cast<ValueColumnInterface*>( t->tqqt_cast("KHE::ValueColumnInterface") );
166 166
 }
167 167
 
168 168
 }

+ 1
- 1
interfaces/khexedit/zoominterface.h View File

@@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t )
71 71
   if( !t )
72 72
     return 0;
73 73
 
74
-  return static_cast<ZoomInterface*>( t->qt_cast("KHE::ZoomInterface") );
74
+  return static_cast<ZoomInterface*>( t->tqqt_cast("KHE::ZoomInterface") );
75 75
 }
76 76
 
77 77
 }

+ 1
- 1
interfaces/kimproxy/interface/kimiface.h View File

@@ -467,7 +467,7 @@ k_dcop_signals:
467 467
 	/**
468 468
 	 * @brief Indicates that a contact's presence has changed
469 469
 	 *
470
-	 * Notifies connected DCOP receivers about a change in a contact's
470
+	 * Notifies connected DCOP tqreceivers about a change in a contact's
471 471
 	 * presence.
472 472
 	 *
473 473
 	 * Implementations just have to call this method with the appropriate

+ 5
- 5
interfaces/kimproxy/library/kimproxy.cpp View File

@@ -248,7 +248,7 @@ bool KIMProxy::initialize()
248 248
 						{
249 249
 							m_apps_available = true;
250 250
 							//kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl;
251
-							if ( !m_im_client_stubs.find( dcopService ) )
251
+							if ( !m_im_client_stubs.tqfind( dcopService ) )
252 252
 							{
253 253
 								kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl;
254 254
 								m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) );
@@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
284 284
 		if ( appId.left( dcopService.length() ) == dcopService )
285 285
 		{
286 286
 			// if it's not already known, insert it
287
-			if ( !m_im_client_stubs.find( appId ) )
287
+			if ( !m_im_client_stubs.tqfind( appId ) )
288 288
 			{
289 289
 				newApp = true;
290 290
 				kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl;
@@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
301 301
 void KIMProxy::unregisteredFromDCOP( const TQCString& appId )
302 302
 {
303 303
 	//kdDebug( 790 ) << k_funcinfo << appId << endl;
304
-	if ( m_im_client_stubs.find( appId ) )
304
+	if ( m_im_client_stubs.tqfind( appId ) )
305 305
 	{
306 306
 		kdDebug( 790 ) << appId << " quit, removing its presence info." << endl;
307 307
 		
@@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid )
618 618
 	// get best appPresence
619 619
 	AppPresenceCurrent ap = d->presence_map[ uid ].best();
620 620
 	// look up the presence string from that app
621
-		return m_im_client_stubs.find( ap.appId );
621
+		return m_im_client_stubs.tqfind( ap.appId );
622 622
 }
623 623
 
624 624
 KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
@@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
626 626
 	KIMIface_stub * app;
627 627
 	// see if the preferred client supports this protocol
628 628
 	TQString preferred = preferredApp();
629
-	if ( ( app = m_im_client_stubs.find( preferred ) ) )
629
+	if ( ( app = m_im_client_stubs.tqfind( preferred ) ) )
630 630
 	{
631 631
 		if ( app->protocols().grep( protocol ).count() > 0 )
632 632
 			return app;

+ 2
- 2
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp View File

@@ -83,7 +83,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
83 83
         {
84 84
             TQHBox *frame = new TQHBox( box );
85 85
             frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
86
-            frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
86
+            frame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
87 87
             view->videoWidget()->reparent( frame, TQPoint(0,0) );
88 88
         }
89 89
 
@@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url )
110 110
         return;
111 111
 
112 112
     KMimeType::Ptr mt = KMimeType::findByURL( url );
113
-    bool supported = m_supportedFormats.find( mt->name() );
113
+    bool supported = m_supportedFormats.tqfind( mt->name() );
114 114
     d->player->view()->setEnabled( supported );
115 115
     if ( !supported )
116 116
         return;

+ 1
- 1
interfaces/kmediaplayer/player.h View File

@@ -56,7 +56,7 @@ public:
56 56
 	/** This constructor is what to use when a GUI is required, as in the
57 57
 	 * case of a KMediaPlayer/Player.
58 58
 	 */
59
-	Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name);
59
+	Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name);
60 60
 
61 61
 	virtual ~Player(void);
62 62
 

+ 1
- 1
interfaces/kmediaplayer/view.h View File

@@ -31,7 +31,7 @@ namespace KMediaPlayer
31 31
 {
32 32
 
33 33
 /** View is part of the user interface of a Player. */
34
-class KDE_EXPORT View : public QWidget
34
+class KDE_EXPORT View : public TQWidget
35 35
 {
36 36
 Q_OBJECT
37 37
 

+ 2
- 2
interfaces/kregexpeditor/kregexpeditorinterface.h View File

@@ -25,7 +25,7 @@
25 25
  * TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
26 26
  * if ( editorDialog ) {
27 27
  *   // kdeutils was installed, so the dialog was found fetch the editor interface
28
- *   KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) );
28
+ *   KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->tqqt_cast( "KRegExpEditorInterface" ) );
29 29
  *   Q_ASSERT( editor ); // This should not fail!
30 30
  *   
31 31
  *   // now use the editor.
@@ -53,7 +53,7 @@
53 53
  *     "KRegExpEditor/KRegExpEditor", TQString::null, parent );
54 54
  * if ( editorWidget ) {
55 55
  *   // kdeutils was installed, so the widget was found fetch the editor interface
56
- *   KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->qt_cast( "KRegExpEditorInterface" ) );
56
+ *   KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->tqqt_cast( "KRegExpEditorInterface" ) );
57 57
  *   Q_ASSERT( editor ); // This should not fail!
58 58
  *   
59 59
  *   // now use the editor.

+ 1
- 1
interfaces/kscript/scriptinterface.h View File

@@ -44,7 +44,7 @@ class KScriptClientInterface;
44 44
 	*	@author Ian Reinhart Geiser <geiseri@kde.org>
45 45
 	*
46 46
 	**/
47
-	class KDE_EXPORT KScriptInterface : public QObject
47
+	class KDE_EXPORT KScriptInterface : public TQObject
48 48
 	{
49 49
 	Q_OBJECT
50 50
 	public:

+ 1
- 1
interfaces/ktexteditor/blockselectioninterface.cpp View File

@@ -70,5 +70,5 @@ BlockSelectionInterface *KTextEditor::blockSelectionInterface (Document *doc)
70 70
   if (!doc)
71 71
     return 0;
72 72
 
73
-  return static_cast<BlockSelectionInterface*>(doc->qt_cast("KTextEditor::BlockSelectionInterface"));
73
+  return static_cast<BlockSelectionInterface*>(doc->tqqt_cast("KTextEditor::BlockSelectionInterface"));
74 74
 }

+ 1
- 1
interfaces/ktexteditor/clipboardinterface.cpp View File

@@ -52,5 +52,5 @@ ClipboardInterface *KTextEditor::clipboardInterface (View *view)
52 52
   if (!view)
53 53
     return 0;
54 54
 
55
-  return static_cast<ClipboardInterface*>(view->qt_cast("KTextEditor::ClipboardInterface"));
55
+  return static_cast<ClipboardInterface*>(view->tqqt_cast("KTextEditor::ClipboardInterface"));
56 56
 }

+ 1
- 1
interfaces/ktexteditor/codecompletioninterface.cpp View File

@@ -45,7 +45,7 @@ CodeCompletionInterface *KTextEditor::codeCompletionInterface (View *view)
45 45
   if (!view)
46 46
     return 0;
47 47
 
48
-  return static_cast<CodeCompletionInterface*>(view->qt_cast("KTextEditor::CodeCompletionInterface"));
48
+  return static_cast<CodeCompletionInterface*>(view->tqqt_cast("KTextEditor::CodeCompletionInterface"));
49 49
 }
50 50
 
51 51
 

+ 2
- 2
interfaces/ktexteditor/configinterface.cpp View File

@@ -67,7 +67,7 @@ ConfigInterface *KTextEditor::configInterface (Document *doc)
67 67
   if (!doc)
68 68
     return 0;
69 69
 
70
-  return static_cast<ConfigInterface*>(doc->qt_cast("KTextEditor::ConfigInterface"));
70
+  return static_cast<ConfigInterface*>(doc->tqqt_cast("KTextEditor::ConfigInterface"));
71 71
 }      
72 72
 
73 73
 ConfigInterface *KTextEditor::configInterface (Plugin *plugin)
@@ -75,5 +75,5 @@ ConfigInterface *KTextEditor::configInterface (Plugin *plugin)
75 75
   if (!plugin)
76 76
     return 0;
77 77
 
78
-  return static_cast<ConfigInterface*>(plugin->qt_cast("KTextEditor::ConfigInterface"));
78
+  return static_cast<ConfigInterface*>(plugin->tqqt_cast("KTextEditor::ConfigInterface"));
79 79
 }

+ 2
- 2
interfaces/ktexteditor/configinterfaceextension.cpp View File

@@ -72,7 +72,7 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Document *doc)
72 72
   if (!doc)
73 73
     return 0;
74 74
 
75
-  return static_cast<ConfigInterfaceExtension*>(doc->qt_cast("KTextEditor::ConfigInterfaceExtension"));
75
+  return static_cast<ConfigInterfaceExtension*>(doc->tqqt_cast("KTextEditor::ConfigInterfaceExtension"));
76 76
 }
77 77
                       
78 78
 ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin)
@@ -80,5 +80,5 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin)
80 80
   if (!plugin)
81 81
     return 0;
82 82
 
83
-  return static_cast<ConfigInterfaceExtension*>(plugin->qt_cast("KTextEditor::ConfigInterfaceExtension"));
83
+  return static_cast<ConfigInterfaceExtension*>(plugin->tqqt_cast("KTextEditor::ConfigInterfaceExtension"));
84 84
 }

+ 1
- 1
interfaces/ktexteditor/configinterfaceextension.h View File

@@ -26,7 +26,7 @@
26 26
 namespace KTextEditor
27 27
 {
28 28
 
29
-class KTEXTEDITOR_EXPORT ConfigPage : public QWidget
29
+class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget
30 30
 {
31 31
   Q_OBJECT
32 32
 

+ 1
- 1
interfaces/ktexteditor/cursorinterface.cpp View File

@@ -65,5 +65,5 @@ CursorInterface *KTextEditor::cursorInterface (Document *doc)
65 65
   if (!doc)
66 66
     return 0;
67 67
 
68
-  return static_cast<CursorInterface*>(doc->qt_cast("KTextEditor::CursorInterface"));
68
+  return static_cast<CursorInterface*>(doc->tqqt_cast("KTextEditor::CursorInterface"));
69 69
 }

+ 1
- 1
interfaces/ktexteditor/dynwordwrapinterface.cpp View File

@@ -65,5 +65,5 @@ DynWordWrapInterface *KTextEditor::dynWordWrapInterface (View *view)
65 65
   if (!view)
66 66
     return 0;
67 67
 
68
-  return static_cast<DynWordWrapInterface*>(view->qt_cast("KTextEditor::DynWordWrapInterface"));
68
+  return static_cast<DynWordWrapInterface*>(view->tqqt_cast("KTextEditor::DynWordWrapInterface"));
69 69
 }

+ 1
- 1
interfaces/ktexteditor/editinterface.cpp View File

@@ -52,6 +52,6 @@ EditInterface *KTextEditor::editInterface (Document *doc)
52 52
   if (!doc)
53 53
     return 0;
54 54
 
55
-  return static_cast<EditInterface*>(doc->qt_cast("KTextEditor::EditInterface"));
55
+  return static_cast<EditInterface*>(doc->tqqt_cast("KTextEditor::EditInterface"));
56 56
 }
57 57
          

+ 1
- 1
interfaces/ktexteditor/editinterfaceext.cpp View File

@@ -45,6 +45,6 @@ EditInterfaceExt *KTextEditor::editInterfaceExt (Document *doc)
45 45
   if (!doc)
46 46
     return 0;
47 47
 
48
-  return static_cast<EditInterfaceExt*>(doc->qt_cast("KTextEditor::EditInterfaceExt"));
48
+  return static_cast<EditInterfaceExt*>(doc->tqqt_cast("KTextEditor::EditInterfaceExt"));
49 49
 }
50 50
 

+ 1
- 1
interfaces/ktexteditor/editinterfaceext.h View File

@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
44 44
     /**
45 45
 	 * Begin an editing sequence.  Edit commands during this sequence will be
46 46
 	 * bunched together such that they represent a single undo command in the
47
-	 * editor, and so that repaint events do not occur inbetween.
47
+	 * editor, and so that tqrepaint events do not occur inbetween.
48 48
 	 *
49 49
 	 * Your application should not return control to the event loop while it
50 50
 	 * has an unterminated (no matching editEnd() call) editing sequence

+ 1
- 1
interfaces/ktexteditor/editor.h View File

@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
57 57
     unsigned int myEditorNumber;
58 58
 };     
59 59
 
60
-KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
60
+KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
61 61
 
62 62
 }
63 63