Browse Source

Trinity Qt initial conversion


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tags/v3.5.13
tpearson 9 years ago
parent
commit
ffe8a83e05
100 changed files with 2261 additions and 2261 deletions
  1. 37
    37
      KDE2PORTING.html
  2. 63
    63
      KDE3PORTING.html
  3. 2
    2
      arts/kde/kartsdispatcher.cc
  4. 2
    2
      arts/kde/kartsdispatcher.h
  5. 1
    1
      arts/kde/kartsfloatwatch.cpp
  6. 4
    4
      arts/kde/kartsfloatwatch.h
  7. 9
    9
      arts/kde/kartsserver.cpp
  8. 2
    2
      arts/kde/kartsserver.h
  9. 9
    9
      arts/kde/kaudioconverter.cc
  10. 3
    3
      arts/kde/kaudioconverter.h
  11. 7
    7
      arts/kde/kaudiomanagerplay.cpp
  12. 6
    6
      arts/kde/kaudiomanagerplay.h
  13. 9
    9
      arts/kde/kaudioplaystream.cpp
  14. 6
    6
      arts/kde/kaudioplaystream.h
  15. 3
    3
      arts/kde/kaudioplaystream_p.h
  16. 12
    12
      arts/kde/kaudiorecordstream.cpp
  17. 4
    4
      arts/kde/kaudiorecordstream.h
  18. 2
    2
      arts/kde/kaudiorecordstream_p.h
  19. 7
    7
      arts/kde/kconverttest.cc
  20. 1
    1
      arts/kde/kconverttest.h
  21. 2
    2
      arts/kde/kdatarequest_impl.h
  22. 22
    22
      arts/kde/kioinputstream_impl.cpp
  23. 7
    7
      arts/kde/kioinputstream_impl.h
  24. 16
    16
      arts/kde/kplayobject.cc
  25. 7
    7
      arts/kde/kplayobject.h
  26. 9
    9
      arts/kde/kplayobjectcreator.cc
  27. 3
    3
      arts/kde/kplayobjectcreator.h
  28. 11
    11
      arts/kde/kplayobjectfactory.cc
  29. 4
    4
      arts/kde/kplayobjectfactory.h
  30. 1
    1
      arts/kde/kplayobjectfactory_p.h
  31. 33
    33
      arts/kde/kvideowidget.cpp
  32. 16
    16
      arts/kde/kvideowidget.h
  33. 18
    18
      arts/kde/mcop-dcop/kmcop.cpp
  34. 3
    3
      arts/kde/mcop-dcop/kmcop.h
  35. 15
    15
      arts/kde/mcop-dcop/mcopdcopobject.cpp
  36. 14
    14
      arts/kde/mcop-dcop/mcopdcopobject.h
  37. 4
    4
      arts/kde/mcop-dcop/mcopdcoptools.h
  38. 75
    75
      arts/knotify/knotify.cpp
  39. 20
    20
      arts/knotify/knotify.h
  40. 5
    5
      arts/message/artsmessage.cc
  41. 60
    60
      common_texts.cpp
  42. 68
    68
      dcop/client/dcop.cpp
  43. 31
    31
      dcop/client/dcopfind.cpp
  44. 15
    15
      dcop/client/dcopstart.cpp
  45. 74
    74
      dcop/client/marshall.cpp
  46. 15
    15
      dcop/dcop_deadlock_test.cpp
  47. 8
    8
      dcop/dcop_deadlock_test.h
  48. 4
    4
      dcop/dcopc.c
  49. 311
    311
      dcop/dcopclient.cpp
  50. 86
    86
      dcop/dcopclient.h
  51. 9
    9
      dcop/dcopidl/dcopidl_test.h
  52. 5
    5
      dcop/dcopidl/main.cpp
  53. 10
    10
      dcop/dcopidl/scanner.cc
  54. 63
    63
      dcop/dcopidl/yacc.cc
  55. 1
    1
      dcop/dcopidl/yacc.cc.h
  56. 30
    30
      dcop/dcopidl2cpp/dcopidl_test.h
  57. 11
    11
      dcop/dcopidl2cpp/main.cpp
  58. 5
    5
      dcop/dcopidl2cpp/main.h
  59. 60
    60
      dcop/dcopidl2cpp/skel.cpp
  60. 24
    24
      dcop/dcopidl2cpp/stub.cpp
  61. 35
    35
      dcop/dcopidl2cpp/stubimpl.cpp
  62. 4
    4
      dcop/dcopidl2cpp/type.h
  63. 38
    38
      dcop/dcopobject.cpp
  64. 37
    37
      dcop/dcopobject.h
  65. 18
    18
      dcop/dcopref.cpp
  66. 176
    176
      dcop/dcopref.h
  67. 149
    149
      dcop/dcopserver.cpp
  68. 38
    38
      dcop/dcopserver.h
  69. 2
    2
      dcop/dcopserver_shutdown.c
  70. 10
    10
      dcop/dcopserver_shutdown_win.cpp
  71. 2
    2
      dcop/dcopserver_win.cpp
  72. 15
    15
      dcop/dcopsignals.cpp
  73. 21
    21
      dcop/dcopsignals.h
  74. 4
    4
      dcop/dcopstub.cpp
  75. 7
    7
      dcop/dcopstub.h
  76. 27
    27
      dcop/dcoptypes.h
  77. 7
    7
      dcop/kdatastream.h
  78. 56
    56
      dcop/testdcop.cpp
  79. 13
    13
      dcop/testdcop.h
  80. 5
    5
      dcop/tests/driver.cpp
  81. 2
    2
      dcop/tests/driver.h
  82. 1
    1
      dcop/tests/test.cpp
  83. 19
    19
      dnssd/domainbrowser.cpp
  84. 9
    9
      dnssd/domainbrowser.h
  85. 20
    20
      dnssd/publicservice.cpp
  86. 13
    13
      dnssd/publicservice.h
  87. 18
    18
      dnssd/query.cpp
  88. 4
    4
      dnssd/query.h
  89. 14
    14
      dnssd/remoteservice.cpp
  90. 7
    7
      dnssd/remoteservice.h
  91. 7
    7
      dnssd/responder.cpp
  92. 6
    6
      dnssd/responder.h
  93. 15
    15
      dnssd/sdevent.h
  94. 18
    18
      dnssd/servicebase.cpp
  95. 17
    17
      dnssd/servicebase.h
  96. 38
    38
      dnssd/servicebrowser.cpp
  97. 14
    14
      dnssd/servicebrowser.h
  98. 8
    8
      interfaces/khexedit/byteseditinterface.h
  99. 3
    3
      interfaces/khexedit/charcolumninterface.h
  100. 0
    0
      interfaces/khexedit/clipboardinterface.h

+ 37
- 37
KDE2PORTING.html View File

@@ -136,7 +136,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
136 136
   generalFont() and fixedFont() are deprecated and will be removed soon.
137 137
   Please use KGlobalSettings::generalFont() and KGlobalSettings::fixedFont() instead.<P>
138 138
 
139
-  appName() is deprecated. Please use QApplication::name() or instanceName
139
+  appName() is deprecated. Please use TQApplication::name() or instanceName
140 140
   instead.<P>
141 141
 
142 142
   The methods tempSaveName() and checkRecoverFile() return QString
@@ -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 QString.<P>
192
+  but a unicode TQString.<P>
193 193
 
194 194
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
195 195
 
@@ -216,7 +216,7 @@ must have created a KApplication object before the methods can be used.<P>
216 216
     <PRE>
217 217
     ...
218 218
         	KConfig *appcfg = KGlobal::config();
219
-	        QString mystr	 = i18n( "This is a string" );
219
+	        TQString mystr	 = i18n( "This is a string" );
220 220
 
221 221
 
222 222
 		KIconLoader *loader = KGlobal::iconLoader();
@@ -277,9 +277,9 @@ Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
277 277
 are now modeless. "About KDE" is a completely new widget.<P>
278 278
 
279 279
 If you used in the toplevel window (that is derived from KMainWindow)
280
-"kapp-&gt;helpMenu( bool, QString )" to get the help menu
281
-you must now change this to "helpMenu( QString )". The QString defaults
282
-to QString::null so it is sufficient to write helpMenu().<P>
280
+"kapp-&gt;helpMenu( bool, TQString )" to get the help menu
281
+you must now change this to "helpMenu( TQString )". The TQString defaults
282
+to TQString::null so it is sufficient to write helpMenu().<P>
283 283
 
284 284
 The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
285 285
 have all been removed. If you need direct access to these or need
@@ -365,7 +365,7 @@ khtmlw has been replaced with khtml.<BR>
365 365
   of the api has changed. In all functions:<P>
366 366
   <PRE>
367 367
      const char * -&gt; QString
368
-     QStrList -&gt; QStringList
368
+     TQStrList -&gt; QStringList
369 369
   </PRE>
370 370
   The only exception for the moment is KHTMLWidget::write(), which does
371 371
   also exist in a const char * version.<P>
@@ -373,7 +373,7 @@ khtmlw has been replaced with khtml.<BR>
373 373
 
374 374
 <LI>you won't need the getKHTMLWiget function anymore. Just replace
375 375
 	getKHTMLWidget-&gt;xxx() with xxx()<P>
376
-<LI>xxx(QString) -&gt; xxx(const QString &amp;)<P>
376
+<LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
377 377
 <LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
378 378
 <LI>replaced/changed functions:<P>
379 379
 <TABLE BORDER="1">
@@ -386,8 +386,8 @@ khtmlw has been replaced with khtml.<BR>
386 386
 <TD>-&gt; contentsX/Y()</TD>
387 387
 </TR>
388 388
 <TR>
389
-<TD>getSelectedText(QString &amp;)</TD>
390
-<TD>-&gt; QString selectedText()</TD>
389
+<TD>getSelectedText(TQString &amp;)</TD>
390
+<TD>-&gt; TQString selectedText()</TD>
391 391
 </TR>
392 392
 <TR>
393 393
 <TD COLSPAN="2" ROWSPAN="0">findTextEnd() has vanished. just remove the call from your code</TD>
@@ -448,7 +448,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
448 448
 <LI>You should be aware that to handle drops, you will either have to
449 449
   inherit a widget and then override the methods mentioned above,
450 450
   or install an event handler for the widget in that widget's parent,
451
-  and then handle QEvent::DragMove or QEvent::Drop inside there (if
451
+  and then handle TQEvent::DragMove or TQEvent::Drop inside there (if
452 452
   you want to avoid inheritance).<P>
453 453
 <LI>You can emulate the old DndURL drop-type behavior with the Qt
454 454
   Drag Object type QUriList.<P>
@@ -456,12 +456,12 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
456 456
   method if you wish.<P>
457 457
 <LI>Qt includes a Drag and Drop tutorial.  We suggest you read that
458 458
   now if you are confused.<P>
459
-<LI>QMultiLineEdit has already a DnD interface that accepts text/*
459
+<LI>TQMultiLineEdit has already a DnD interface that accepts text/*
460 460
   If you want to add support for other mimetypes, you need to
461 461
   re-implement all DnD-methods (also dragMoveEvent()) and pass
462 462
   QTextDrag's to the parent methods.<P>
463
-<LI>QTextDrag also accepts text/uri-list, which means that you
464
-  always need to check for QUriDrag first if you want to get
463
+<LI>TQTextDrag also accepts text/uri-list, which means that you
464
+  always need to check for TQUriDrag first if you want to get
465 465
   both working.<P>
466 466
 <LI>The mimetype for Uri's is now text/uri-list. If you've used
467 467
   the proprietary Qt 1.x url/url, you need to adjust that.
@@ -474,8 +474,8 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
474 474
   These classes have been largely re-implemented.  The external API
475 475
   remains mostly the same, with the single notable change that
476 476
   the groupIterator and entryIterator methods have been removed and
477
-  instead replaced by groupList (which returns a QStringList of groups)
478
-  and entryMap(const QString &amp;group) (which returns a QMap of entries
477
+  instead replaced by groupList (which returns a TQStringList of groups)
478
+  and entryMap(const TQString &amp;group) (which returns a TQMap of entries
479 479
   in the specified group).  This is due to internal changes in KConfig
480 480
   which would make providing iterators possibly rather difficult.<P>
481 481
 
@@ -487,8 +487,8 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
487 487
   this:<P>
488 488
   <PRE>
489 489
 
490
-  QMap&lt;QString, QString&gt; tmpMap = config-&lt;entryMap(myGroup);
491
-  QMap&lt;QString, QString&gt;::Iterator aIt(tmpMap.begin());
490
+  TQMap&lt;TQString, TQString&gt; tmpMap = config-&lt;entryMap(myGroup);
491
+  TQMap&lt;TQString, TQString&gt;::Iterator aIt(tmpMap.begin());
492 492
 
493 493
   for (; aIt != tmpMap.end(); ++aIt) {
494 494
    // body here.  Access iterator key as aIt.key(),
@@ -537,7 +537,7 @@ Most applications will only need to replace kapp-&gt;getKCharsets() with
537 537
 KGlobal::charsets().<P>
538 538
 
539 539
 For conversion of various input formats to QStrings, please have a
540
-look at QTextCodec and classes derived from it.<P>
540
+look at TQTextCodec and classes derived from it.<P>
541 541
 
542 542
 Character entities are now  converted from and to QChars. The name has
543 543
 changed from convertTag to fromEntity and toEntity.<P>
@@ -551,7 +551,7 @@ input font most closely, but can display the given charset.<P>
551 551
 
552 552
 <H3><A NAME="KWizard">KWizard, KNoteBook</A></H3>
553 553
 
554
-KWizard is based on QWizard now. The API has changed. Consult Qt's
554
+KWizard is based on TQWizard now. The API has changed. Consult Qt's
555 555
 documentation and kdelibs/kdetest/kwizardtest.cpp for an example use.<P>
556 556
 KNoteBook (deeply entwined with the former KWizard) has been removed until
557 557
 someone is willing to port it to work with the new wizard. If you want to
@@ -561,7 +561,7 @@ use it you'll find the necessary files in kdegraphics/kiconedit.<P>
561 561
 
562 562
 <H3><A NAME="KSpinBox">KSpinBox, KNumericSpinBox</A></H3>
563 563
 
564
-These classes have been replaced by QSpinBox. API is almost the same
564
+These classes have been replaced by TQSpinBox. API is almost the same
565 565
 HINTS:<P>
566 566
 <UL>
567 567
 	<LI>valueincreased()/valuedecreased -&gt; valueChanged()
@@ -580,16 +580,16 @@ version had, and more.<P>
580 580
 
581 581
 <H3><A NAME="KPanner">KPanner, KNewPanner</A></H3>
582 582
 
583
-KPanner and KNewPanner have been removed.  QSplitter does everything
583
+KPanner and KNewPanner have been removed.  TQSplitter does everything
584 584
 KPanner did and more. The api is similar, but not compatible.
585 585
 Basically to set it up so that you have a vertical splitter between a
586 586
 listbox, a listview and multi line editor, you would do something like
587 587
 this:<P>
588 588
 <TABLE><TR><TD>
589
-    QSplitter *split = new QSplitter( parent );<BR>
590
-    QListBox *lb = new QListBox( split );<BR>
589
+    TQSplitter *split = new TQSplitter( parent );<BR>
590
+    TQListBox *lb = new TQListBox( split );<BR>
591 591
     KListView *lv = new KListView( split );<BR>
592
-    QMultiLineEdit *ed = new QMultiLineEdit( split );
592
+    TQMultiLineEdit *ed = new TQMultiLineEdit( split );
593 593
 </TD></TR></TABLE>
594 594
 
595 595
 As you can see you are not limited to two children.  Additionally, you
@@ -600,26 +600,26 @@ possible if you call setOpaqueResize(true).<P>
600 600
 
601 601
 <H3><A NAME="KTreeList">KTreeList, KTreeListItem</A></H3>
602 602
 
603
-Use KListView, QListViewItem instead. API is almost the same, you only
603
+Use KListView, TQListViewItem instead. API is almost the same, you only
604 604
 need to add a Column (KListView::addColum) before KListView is useable.<P>
605 605
 
606 606
 KListView has no addChild(), insertItem() and removeItem() calls. Inserting
607
-a root item is done by constructing a QListViewItem with the KListView
607
+a root item is done by constructing a TQListViewItem with the KListView
608 608
 passed as the parent widget. adding a child item is done by constructing
609
-a QListViewItem with the parent item as parameter. removeItem() should
609
+a TQListViewItem with the parent item as parameter. removeItem() should
610 610
 be replaced by delete &lt;pointer to item&gt;.<P>
611 611
 
612 612
 The root items are not shown in a tree fashion by default. to get this,
613 613
 use KListView::setDecorativeRoot(true).<P>
614 614
 
615
-Expanding and collapsing can by done by using QListViewItem::setOpen(bool).<P>
615
+Expanding and collapsing can by done by using TQListViewItem::setOpen(bool).<P>
616 616
 
617 617
 
618 618
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
619 619
 
620 620
 <H3><A NAME="KMsgBox">KMsgBox</A></H3>
621 621
 
622
-KMsgBox has been superseded by QMessageBox. Which has been superseded
622
+KMsgBox has been superseded by TQMessageBox. Which has been superseded
623 623
 by KMessageBox.<P>
624 624
 <UL>
625 625
 <LI>KMsgBox had return codes starting with 1 for the first button, 2 for
@@ -642,7 +642,7 @@ KComboBox::setEditText.<P>
642 642
 
643 643
 <H3><A NAME="KQuickHelp">KQuickHelp</A></H3>
644 644
 
645
-KQuickHelp, the "super-tooltip" widget, has been replaced by QWhatsThis.
645
+KQuickHelp, the "super-tooltip" widget, has been replaced by TQWhatsThis.
646 646
 It provides a compatible API and almost the same look and feel, in addition
647 647
 to some new functionality.<P>
648 648
 
@@ -652,7 +652,7 @@ to some new functionality.<P>
652 652
 
653 653
 Instead of old KPixmap::gradientFill, use:<P>
654 654
 
655
-KPixmapEffect::gradient(KPixmap&amp;, QColor, QColor, enum KPixmapEffect::GradientType, int)<P>
655
+KPixmapEffect::gradient(KPixmap&amp;, TQColor, TQColor, enum KPixmapEffect::GradientType, int)<P>
656 656
 
657 657
  Hence:<P>
658 658
 
@@ -710,7 +710,7 @@ declared globally in kaccel.h are now static methods in KAccel.<P>
710 710
 
711 711
 The KString class is obsolete and is not defined in
712 712
 kstring.h anymore. The header file only existed for compatibility reasons.
713
-The file has been removed completely, use QString instead. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
713
+The file has been removed completely, use TQString instead. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
714 714
 
715 715
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
716 716
 
@@ -723,7 +723,7 @@ exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
723 723
 
724 724
 <H3><A NAME="kbutton">kbutton.h / KButton</A></H3>
725 725
 
726
-Since Qt 2.0, the class QToolButton provides the functionality of
726
+Since Qt 2.0, the class TQToolButton provides the functionality of
727 727
 buttons that raise when the mouse is moved over them, so there is no
728 728
 reason to have a class providing the same feature in KDE libs. All
729 729
 occurrences of KButton in the KDE CVS have been replaced by QToolButtons,
@@ -831,11 +831,11 @@ Werner Trobin &lt;<A HREF="mailto:wtrobin@carinthia.com">wtrobin@carinthia.com</
831 831
 There is also a new preview mode which is quite different to the one we had in
832 832
 the KDE 1.x KFD. There are no preview modules you have to register but there
833 833
 is a single method you can use to set a preview widget. This widget has to
834
-inherit QWidget and you have to implement a slot (showPreview(const KURL &amp;)) 
834
+inherit TQWidget and you have to implement a slot (showPreview(const KURL &amp;)) 
835 835
 in this class. This slot is called each time the selected file/dir changes.
836 836
 In this slot you have to react appropriate (i.e. show the preview :). The
837
-easiest way this can be done is to derive your class from QWidgetStack and 
838
-add a Object (derived from QWidget) for each file type. In the showPreview
837
+easiest way this can be done is to derive your class from TQWidgetStack and 
838
+add a Object (derived from TQWidget) for each file type. In the showPreview
839 839
 method you just raise the matching widget. If you can't find an appropriate
840 840
 widget just hide() the widget stack.<P>
841 841
 If you need some "inspiration" on how that could be done, please have a look

+ 63
- 63
KDE3PORTING.html View File

@@ -68,7 +68,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
68 68
 <H3><A NAME="kdecore">Changes in kdecore</A></H3>
69 69
 
70 70
 <H4>KDesktopWidget</H4>
71
-KDesktopWidget is obsolete. Include &lt;qdesktopwidget.h&gt; and use QDesktopWidget
71
+KDesktopWidget is obsolete. Include &lt;tqdesktopwidget.h&gt; and use QDesktopWidget
72 72
 instead, everything else is source compatible.
73 73
 
74 74
 <H4>Header file names</H4>
@@ -112,13 +112,13 @@ The old name will still work unless KDE_NO_COMPAT is defined.
112 112
 KPixmapSplitter has now been moved to the new kdefx library.
113 113
 
114 114
 <H4>KStringHandler</H4>
115
-The <i>matchFilename( const QString& filename, const QString& pattern )</i> method has been 
116
-renamed to <br><i>matchFileName( const QString& filename, const QString& pattern )</i>.
115
+The <i>matchFilename( const TQString& filename, const TQString& pattern )</i> method has been 
116
+renamed to <br><i>matchFileName( const TQString& filename, const TQString& pattern )</i>.
117 117
 The old name will still work unless KDE_NO_COMPAT is defined.
118 118
 
119 119
 <H4>KStyle</H4>
120
-Due to the major changes in the QStyle API in Qt3, KStyle has been completely
121
-re-written. KStyle is now a thin wrapper around QCommonStyle with a few extra 
120
+Due to the major changes in the TQStyle API in Qt3, KStyle has been completely
121
+re-written. KStyle is now a thin wrapper around TQCommonStyle with a few extra 
122 122
 primitive elements and a simple popupMenu transparency engine. All KStyles can
123 123
 now style Qt apps like designer and assistant automatically. KStyle is no longer
124 124
 present in kdecore. It is now in a new library called kdefx to allow Qt apps to
@@ -131,20 +131,20 @@ The old name will still work unless KDE_NO_COMPAT is defined.
131 131
 
132 132
 <H4>KMD5</H4>
133 133
 HASHHEX and HASH has been removed to make this class namespace clean. 
134
-They have been replaced by QCString and KMD5::Digest. <br>
134
+They have been replaced by TQCString and KMD5::Digest. <br>
135 135
 The API has been cleaned up, it is no longer necessary to call finalize(). 
136 136
 Simply remove any calls to it. 
137 137
 
138 138
 <H4>KLocale</H4>
139 139
 <li>charset() has been removed. You might want to use encoding() instead.
140
-<li>setCharset(const QString &amp;) has been removed. You might want to use
140
+<li>setCharset(const TQString &amp;) has been removed. You might want to use
141 141
 setEncoding(int) instead.
142
-<li>formatMoney(const QString &amp;) has been removed.
143
-<li>formatNumber(const QString &amp;) has been removed.
142
+<li>formatMoney(const TQString &amp;) has been removed.
143
+<li>formatNumber(const TQString &amp;) has been removed.
144 144
 <li>languages() has been removed. Use languageList() instead.
145 145
 <li>All references to monthName(), monthNamePossessive(), and weekDayName()
146 146
 should be replaced with methods from KLocale::calendar().
147
-<li>Hard coded date handling or date handling with QDate should in most
147
+<li>Hard coded date handling or date handling with TQDate should in most
148 148
 cases be replaced by methods in KLocale::calendar().
149 149
 
150 150
 <H4>Accelerators Keys</H4>
@@ -155,12 +155,12 @@ not be available.
155 155
 	<li> KAccel::insertItem() and KAccel::connectItem().
156 156
 <pre>
157 157
 	- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
158
-	- kaccel-&gt;connectItem( "Scroll Up", this, SLOT(scrollUp()) );
159
-	+ kaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), QString::null,
160
-		Key_Up, this, SLOT(scrollUp()) );
158
+	- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
159
+	+ kaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
160
+		Key_Up, this, TQT_SLOT(scrollUp()) );
161 161
 </pre>
162 162
 	Note that a What's This parameter is now a part of the insert function.
163
-	You might replace the QString::null parameter with
163
+	You might replace the TQString::null parameter with
164 164
 	<pre> i18n("Scroll the current document's contents up by one line.") </pre>
165 165
 	for example.</li>
166 166
 	<li> KAccel::changeMenuAccel() has been deprecated because it was
@@ -176,7 +176,7 @@ not be available.
176 176
 The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
177 177
 <pre>
178 178
 	new KAction( i18n("Scroll Up"), Key_Up,
179
-		this, SLOT(scrollUp()), actionCollection(), "Scroll Up" );
179
+		this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
180 180
 </pre>
181 181
 
182 182
 <h5>KGlobalAccel</h5>
@@ -200,12 +200,12 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
200 200
 	<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
201 201
 		<table border=1>
202 202
 			<tr><th>Old</th><th>New</th></tr>
203
-			<tr><td>QString action(StdAccel id)</td><td>QString name(StdAccel id)</td></tr>
203
+			<tr><td>TQString action(StdAccel id)</td><td>TQString name(StdAccel id)</td></tr>
204 204
 			<tr><td>int defaultKey(StdAccel accel)</td><td>KShortcut shortcutDefault(StdAccel id)</td></tr>
205
-			<tr><td>QString description(StdAccel id)</td><td>QString label(StdAccel id)</td></tr>
206
-			<tr><td>bool isEqual(const QKeyEvent* pEvent, int keyQt)</td>
205
+			<tr><td>TQString description(StdAccel id)</td><td>TQString label(StdAccel id)</td></tr>
206
+			<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
207 207
 				<td>The best method for replacing this varies.  One possibility is to use
208
-				<i>KKey(const QKeyEvent*) == KKey(int)</i>.  Another is to use
208
+				<i>KKey(const TQKeyEvent*) == KKey(int)</i>.  Another is to use
209 209
 				<i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
210 210
 			<tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
211 211
 		</table></li-->
@@ -261,7 +261,7 @@ This class has been removed, use Qt layouts instead.
261 261
 <H4>KCommand</H4>
262 262
 This class has been made lighter: the name isn't stored into the command anymore,
263 263
 but must be provided by the inherited class, as the result of the virtual name() function.
264
-This saves storing a QString into each command in memory.
264
+This saves storing a TQString into each command in memory.
265 265
 The former behavior is available in the class KNamedCommand, so for a quick port
266 266
 simply replace KCommand with KNamedCommand.
267 267
 
@@ -273,7 +273,7 @@ The deprecated getMainWidget() method has been removed. Use mainWidget() instead
273 273
 functionality.
274 274
 
275 275
 <H4>KDockWidget</H4>
276
-The WidgetList parameter has been renamed to QWidgetList. Behaviour
276
+The WidgetList parameter has been renamed to TQWidgetList. Behaviour
277 277
 is identical.
278 278
 
279 279
 <H4>KEdit</H4>
@@ -306,11 +306,11 @@ for more informations on this new extension.
306 306
 PixmapEffect has now been moved to the new kdefx library.
307 307
 
308 308
 <H4>KProgress</H4>
309
-KProgress is now based on QProgressBar.
309
+KProgress is now based on TQProgressBar.
310 310
 This has led to a few API changes. In particular the constructors have been
311 311
 simplified, you simply need to pass the total number of steps instead of
312 312
 min / max / initialvalue / orientation. See documentation of both KProgress
313
-and QProgressBar.
313
+and TQProgressBar.
314 314
 
315 315
 <H4>KRootPixmap</H4>
316 316
 The KRootPixmap class has been extended to make it more flexible, and the
@@ -324,7 +324,7 @@ as its use is basically limited to KThemeStyle.
324 324
 
325 325
 <H4>KAction, KToolBar, KToolBarButton and icons</H4>
326 326
 The preferred way for specifying icons is passing the icon names (and the icons will be loaded by KIconLoader),
327
-instead of using QIconSet or QPixmap. This results in always using the correct icon size and allows delayed
327
+instead of using TQIconSet or TQPixmap. This results in always using the correct icon size and allows delayed
328 328
 on-demand icon loading.
329 329
 <p>
330 330
 Method KAction::hasIconSet() has been renamed to KAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
@@ -335,13 +335,13 @@ KToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), set
335 335
 Use KToolBarButton::setIcon() (preferred) or KToolBarButton::setIconSet() instead.
336 336
 
337 337
 <H4>KAction and derived classes</H4>
338
-The protected set* methods have been renamed to update* and they now take only one argument (i.e. setText(int, const QString&)
338
+The protected set* methods have been renamed to update* and they now take only one argument (i.e. setText(int, const TQString&)
339 339
 is now updateText(int) ). Because the former second argument was always the value of the a corresponding data member, you
340 340
 can simply call the accessor method (i.e. in updateText() call text() to get the text).
341 341
 
342 342
 <H4>KToggleAction</H4>
343 343
 exclusiveGroup() is no more virtual. setExclusiveGroup(const
344
-QString&) is not a slot anymore.
344
+TQString&) is not a slot anymore.
345 345
 
346 346
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
347 347
 
@@ -350,7 +350,7 @@ QString&) is not a slot anymore.
350 350
 <H4>KPropertiesDialog</H4>
351 351
 <ul>
352 352
   <li>The header file has been renamed from kpropsdlg.h to kpropertiesdialog.h.</li>
353
-  <li>KPropertiesDialog::KPropertiesDialog(const KURL&, mode_t, QWidget*,
353
+  <li>KPropertiesDialog::KPropertiesDialog(const KURL&, mode_t, TQWidget*,
354 354
       const char*, bool, bool ) has been removed since mode_t was no longer
355 355
       used. Simply omit the mode_t parameter.</li>
356 356
 </ul>
@@ -362,15 +362,15 @@ QString&) is not a slot anymore.
362 362
   <li>A base class KArchive has been written, to support other archive formats in the future</li>
363 363
   <li>KTarEntry is now KArchiveEntry, KTarDirectory is now KArchiveDirectory, and KTarFile is now KArchiveFile.</li>
364 364
   <li>The classes ProgressBase, StatusbarProgress and DefaultProgress have been moved to the KIO namespace.</li>
365
-  <li>The signal KDirLister::started(const QString &amp;url) has changed to KDirLister::started(const KURL &amp;url).<li>
366
-  <li>KServiceTypeProfile::preferredService( const QString &amp; serviceType, bool needApp ) has been removed, use
365
+  <li>The signal KDirLister::started(const TQString &amp;url) has changed to KDirLister::started(const KURL &amp;url).<li>
366
+  <li>KServiceTypeProfile::preferredService( const TQString &amp; serviceType, bool needApp ) has been removed, use
367 367
       KServiceTypeProfile::preferredService( ..., "Application") if needApp was true, or
368
-      KServiceTypeProfile::preferredService( ..., QString::null) if needApp was false.
368
+      KServiceTypeProfile::preferredService( ..., TQString::null) if needApp was false.
369 369
   <li>The following functions in KProtocolManager have been replaced:
370 370
       <ul>
371 371
 <li>ftpProxy(), use proxyFor("ftp") instead.
372 372
 <li>httpProxy(), use proxyFor("http") instead.
373
-<li>slaveProtocol(const QString&amp;), use slaveProtocol(const KURL &amp;url, QString &amp;proxy) instead.
373
+<li>slaveProtocol(const TQString&amp;), use slaveProtocol(const KURL &amp;url, TQString &amp;proxy) instead.
374 374
 <li>defaultReadTimeout(), use DEFAULT_READ_TIMEOUT instead. (See ioslave_defaults.h)
375 375
 <li>defaultProxyConnectTimeout(), use DEFAULT_PROXY_CONNECT_TIMEOUT instead. (See ioslave_defaults.h)
376 376
 <li>defaultResponseTimeout(), use DEFAULT_RESPONSE_TIMEOUT instead. (See ioslave_defaults.h)
@@ -378,7 +378,7 @@ QString&) is not a slot anymore.
378 378
       </ul>
379 379
   <li>The following functions in KProtocolManager have been removed:
380 380
       <ul>
381
-<li>setUserAgentList( const QStringList&amp; )
381
+<li>setUserAgentList( const TQStringList&amp; )
382 382
 <li>userAgentList();
383 383
 <li>setReadTimeout()
384 384
 <li>setConnectTimeout( int )
@@ -396,11 +396,11 @@ QString&) is not a slot anymore.
396 396
 <li>setUseReverseProxy( bool )
397 397
 <li>setProxyType( ProxyType )
398 398
 <li>setProxyAuthMode( ProxyAuthMode )
399
-<li>setFtpProxy( const QString&amp; )
400
-<li>setHttpProxy( const QString&amp; )
401
-<li>setProxyFor( const QString&amp;, const QString&amp; )
402
-<li>setNoProxyFor( const QString&amp; )
403
-<li>setProxyConfigScript( const QString&amp;  )
399
+<li>setFtpProxy( const TQString&amp; )
400
+<li>setHttpProxy( const TQString&amp; )
401
+<li>setProxyFor( const TQString&amp;, const TQString&amp; )
402
+<li>setNoProxyFor( const TQString&amp; )
403
+<li>setProxyConfigScript( const TQString&amp;  )
404 404
       </ul>
405 405
   </li>
406 406
   <li>In order to support files &gt; 4Gb, the file size / file-offset argument
@@ -428,10 +428,10 @@ The createFilterDevice method is deprecated. Use deviceForFile instead.
428 428
 
429 429
 <H4>KDirWatch</H4>
430 430
 <ul>
431
-  <li>The signal fileDirty( const QString&amp; ) has been removed</li>
432
-  <li>The signal created( const QString&amp; ) has been added</li>
433
-  <li>The signal deleted( const QString&amp; ) has been added</li>
434
-  <li>The signal dirty( const QString&amp; ) may be emitted with a file name, not only
431
+  <li>The signal fileDirty( const TQString&amp; ) has been removed</li>
432
+  <li>The signal created( const TQString&amp; ) has been added</li>
433
+  <li>The signal deleted( const TQString&amp; ) has been added</li>
434
+  <li>The signal dirty( const TQString&amp; ) may be emitted with a file name, not only
435 435
     a directory name. This depends on which backend is used but will probably always be
436 436
     the case in KDE 3.1. You should prepare to receive dirty( dirname ) or dirty( filename )
437 437
     when a file has changed.
@@ -473,18 +473,18 @@ setURLArgs does the job.
473 473
 <H4>KSpell</H4>
474 474
 The API has been cleaned up to be in line with the rest of kdelibs, in particular:
475 475
 <ul>
476
-<li>suggestions() now returns a QStringList instead of a pointer to a QStringList
477
-<li>intermediateBuffer() now returns a QString instead of a pointer to a QString
478
-<li>The signal <b>misspelling(QString, QStringList *, unsigned)</b> has changed to
479
-    misspelling(const QString &amp;, const QStringList &amp;, unsigned int)
480
-<li>The signal <b>corrected(QString, QString, unsigned)</b> has changed to
481
-    corrected(const QString &amp;, const QString &amp;, unsigned int)
482
-<li>The signal <b>ignoreall(QString)</b> has changed to
483
-    ignoreall(const QString &amp;)
484
-<li>The signal <b>ignoreword(QString)</b> has changed to
485
-    ignoreword(const QString &amp;)
486
-<li>The signal <b>addword(QString)</b> has changed to
487
-    addword(const QString &amp;)
476
+<li>suggestions() now returns a TQStringList instead of a pointer to a QStringList
477
+<li>intermediateBuffer() now returns a TQString instead of a pointer to a QString
478
+<li>The signal <b>misspelling(TQString, TQStringList *, unsigned)</b> has changed to
479
+    misspelling(const TQString &amp;, const TQStringList &amp;, unsigned int)
480
+<li>The signal <b>corrected(TQString, TQString, unsigned)</b> has changed to
481
+    corrected(const TQString &amp;, const TQString &amp;, unsigned int)
482
+<li>The signal <b>ignoreall(TQString)</b> has changed to
483
+    ignoreall(const TQString &amp;)
484
+<li>The signal <b>ignoreword(TQString)</b> has changed to
485
+    ignoreword(const TQString &amp;)
486
+<li>The signal <b>addword(TQString)</b> has changed to
487
+    addword(const TQString &amp;)
488 488
 </ul>
489 489
 
490 490
       Make sure to check if you use the above signals since your compiler
@@ -551,7 +551,7 @@ This class has been merged with KDirLister from kio.
551 551
 <tr><td>saveConfig()</td><td>writeConfig()</td></tr>
552 552
 <tr><td>setFileReader()</td><td>setDirLister()</td></tr>
553 553
 <tr><td>fileReader()</td><td>dirLister()</td></tr>
554
-<tr><td>activatedMenu( const KFileViewItem * )</td><td>activatedMenu( const KFileItem *, const QPoint& pos )</td></tr>
554
+<tr><td>activatedMenu( const KFileViewItem * )</td><td>activatedMenu( const KFileItem *, const TQPoint& pos )</td></tr>
555 555
 </table>
556 556
 
557 557
 <H4>KFileDetailView</H4>
@@ -564,25 +564,25 @@ flexibility and efficiency.
564 564
 Sorting has changed radically. Previously, KFileView had protected methods QuickSort,
565 565
 compareItems() and mergeLists() to sort directory entries for displaying in the views. Now,
566 566
 KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, KListView)
567
-sorting is utilized by letting its view-items provide a QString key() method. Therefore,
567
+sorting is utilized by letting its view-items provide a TQString key() method. Therefore,
568 568
 KFileView offers the two methods
569 569
 <ul>
570
-<li>QString sortingKey( const QString&amp; value, bool isDir, int sortSpec )</li>
571
-<li>QString sortingKey( KIO::filesize_t value, bool isDir, int sortSpec )</li>
570
+<li>TQString sortingKey( const TQString&amp; value, bool isDir, int sortSpec )</li>
571
+<li>TQString sortingKey( KIO::filesize_t value, bool isDir, int sortSpec )</li>
572 572
 </ul>
573 573
 which the view-classes can use to generate the string for the key() method. The KFile::SortMode
574
-enum has been removed, as QDir::SortSpec is used entirely.
574
+enum has been removed, as TQDir::SortSpec is used entirely.
575 575
 
576 576
 <br><br>
577 577
 Further changes:
578 578
 <table>
579 579
 <tr><th>Old:</th><th>New:</th></tr>
580
-<tr><td>not existant</td><td>virtual void readConfig( KConfig *, const QString&amp; group = QString::null )</td></tr>
581
-<tr><td>not existant</td><td>void writeConfig( KConfig *, const QString&amp; group = QString::null)</td></tr>
582
-<tr><td>virtual void setCurrentItem( const QString&amp; filename, KFileViewItem * )</td><td>Replaced with the two methods below.</td></tr>
583
-<tr><td>&nbsp;</td><td>void setCurrentItem( const QString&amp; filename );</td></tr>
580
+<tr><td>not existant</td><td>virtual void readConfig( KConfig *, const TQString&amp; group = TQString::null )</td></tr>
581
+<tr><td>not existant</td><td>void writeConfig( KConfig *, const TQString&amp; group = TQString::null)</td></tr>
582
+<tr><td>virtual void setCurrentItem( const TQString&amp; filename, KFileViewItem * )</td><td>Replaced with the two methods below.</td></tr>
583
+<tr><td>&nbsp;</td><td>void setCurrentItem( const TQString&amp; filename );</td></tr>
584 584
 <tr><td>&nbsp;</td><td>virtual void setCurrentItem( const KFileViewItem * ) = 0;</td></tr>
585
-<tr><td>setOperator( QObject * )</td><td>setParentView( KFileView * )</td></tr>
585
+<tr><td>setOperator( TQObject * )</td><td>setParentView( KFileView * )</td></tr>
586 586
 <tr><td>virtual void insertSorted( KFileViewItem *, uint count )</td><td>virtual void insertItem( KFileItem * )</td></tr>
587 587
 <tr><td>virtual void addItemList( const KFileViewItemList &amp;list )</td><td>not virtual anymore. Sufficient to reimplement insertItem()</td></tr>
588 588
 </table>

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

@@ -30,8 +30,8 @@ int KArtsDispatcher::m_refCount = 0;
30 30
 Arts::Dispatcher *KArtsDispatcher::artsDispatcher = 0;
31 31
 Arts::QIOManager *KArtsDispatcher::artsQIOManager = 0;
32 32
 
33
-KArtsDispatcher::KArtsDispatcher(QObject *parent, const char *name)
34
-	: QObject(parent, name)
33
+KArtsDispatcher::KArtsDispatcher(TQObject *parent, const char *name)
34
+	: TQObject(parent, name)
35 35
 {
36 36
 	m_refCount++;
37 37
 	if(artsDispatcher == 0)

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

@@ -22,7 +22,7 @@
22 22
 #ifndef KARTSDISPATCHER_H
23 23
 #define KARTSDISPATCHER_H
24 24
 
25
-#include <qobject.h>
25
+#include <tqobject.h>
26 26
 
27 27
 #include <kdelibs_export.h>
28 28
 
@@ -71,7 +71,7 @@ public:
71 71
 	 * @param parent  the parent Qt object
72 72
 	 * @param name    the Qt object name of this object
73 73
 	 */
74
-	KArtsDispatcher(QObject *parent = 0, const char *name = 0);
74
+	KArtsDispatcher(TQObject *parent = 0, const char *name = 0);
75 75
 
76 76
 	/**
77 77
 	 * Destructor

+ 1
- 1
arts/kde/kartsfloatwatch.cpp View File

@@ -46,7 +46,7 @@ public:
46 46
 }
47 47
 
48 48
 KArtsFloatWatch::KArtsFloatWatch(Arts::Object object, const char *stream,
49
-	QObject *parent, const char *name) : QObject(parent, name)
49
+	TQObject *parent, const char *name) : TQObject(parent, name)
50 50
 {
51 51
 	d = new KArtsFloatWatchPrivate();
52 52
 	d->proxy = KFloatWatchProxy::_from_base(new KFloatWatchProxy_impl(this));

+ 4
- 4
arts/kde/kartsfloatwatch.h View File

@@ -21,7 +21,7 @@
21 21
     */
22 22
 
23 23
 #include "common.h"
24
-#include <qobject.h>
24
+#include <tqobject.h>
25 25
 
26 26
 class KArtsFloatWatchPrivate;
27 27
 namespace Arts { class KFloatWatchProxy_impl; }
@@ -44,10 +44,10 @@ namespace Arts { class KFloatWatchProxy_impl; }
44 44
  * \code
45 45
  *   StereoVolumeControl stereoVolumeControl = ...;
46 46
  *   KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this);
47
- *   connect(w, SIGNAL(valueChanged(float)), this, SLOT(setValue(float)));
47
+ *   connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float)));
48 48
  * \endcode
49 49
  */
50
-class KArtsFloatWatch : public QObject {
50
+class KArtsFloatWatch : public TQObject {
51 51
 	Q_OBJECT
52 52
 private:
53 53
 	KArtsFloatWatchPrivate *d;
@@ -67,7 +67,7 @@ public:
67 67
 	 * @param parent  the parent Qt object
68 68
 	 * @param name    the Qt object name of this object
69 69
 	 */
70
-	KArtsFloatWatch(Arts::Object object, const char *stream, QObject *parent = 0, const char *name = 0);
70
+	KArtsFloatWatch(Arts::Object object, const char *stream, TQObject *parent = 0, const char *name = 0);
71 71
 
72 72
 	/**
73 73
 	 * Destructor

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

@@ -22,8 +22,8 @@
22 22
 #include <ksimpleconfig.h>
23 23
 #include <kprocess.h>
24 24
 #include <kstandarddirs.h>
25
-#include <qdir.h>
26
-#include <qfile.h>
25
+#include <tqdir.h>
26
+#include <tqfile.h>
27 27
 #include "kartsserver.h"
28 28
 
29 29
 struct KArtsServer::Data
@@ -31,8 +31,8 @@ struct KArtsServer::Data
31 31
 	Arts::SoundServerV2 server;
32 32
 };
33 33
 
34
-KArtsServer::KArtsServer(QObject *parent, const char *name)
35
-	: QObject(parent, name)
34
+KArtsServer::KArtsServer(TQObject *parent, const char *name)
35
+	: TQObject(parent, name)
36 36
 	, d(new Data)
37 37
 {
38 38
 	d->server = Arts::SoundServerV2::null();
@@ -68,7 +68,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
68 68
 	bool x11Comm = config.readBoolEntry("X11GlobalComm", false);
69 69
 
70 70
 	// put the value of x11Comm into .mcoprc
71
-	KSimpleConfig X11CommConfig(QDir::homeDirPath()+"/.mcoprc");
71
+	KSimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc");
72 72
 
73 73
 	if(x11Comm)
74 74
 		X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm");
@@ -77,14 +77,14 @@ Arts::SoundServerV2 KArtsServer::server(void)
77 77
 
78 78
 	X11CommConfig.sync();
79 79
 	
80
-	proc << QFile::encodeName(KStandardDirs::findExe(QString::fromLatin1("kdeinit_wrapper")));
80
+	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
81 81
 
82 82
 	if(rt)
83
-		proc << QFile::encodeName(KStandardDirs::findExe(QString::fromLatin1("artswrapper")));
83
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
84 84
 	else
85
-		proc << QFile::encodeName(KStandardDirs::findExe(QString::fromLatin1("artsd")));
85
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
86 86
 
87
-	proc << QStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
87
+	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
88 88
 
89 89
 	if(proc.start(KProcess::Block) && proc.normalExit())
90 90
 	{

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

@@ -22,7 +22,7 @@
22 22
 #define KARTSSERVER_H
23 23
 
24 24
 #include "kmedia2.h"
25
-#include <qobject.h>
25
+#include <tqobject.h>
26 26
 #include "soundserver.h"
27 27
 #include <kdelibs_export.h>
28 28
 
@@ -43,7 +43,7 @@ public:
43 43
 	 * Create a new KArtsServer. Don't forget to create a KArtsDispatcher
44 44
 	 * before using KArtsServer.
45 45
 	 */
46
-	KArtsServer(QObject *parent = 0, const char *name = 0);
46
+	KArtsServer(TQObject *parent = 0, const char *name = 0);
47 47
 	virtual ~KArtsServer(void);
48 48
 
49 49
 	/**

+ 9
- 9
arts/kde/kaudioconverter.cc View File

@@ -31,8 +31,8 @@
31 31
 
32 32
 #include <iostream>
33 33
 
34
-#include <qfile.h>
35
-#include <qtimer.h>
34
+#include <tqfile.h>
35
+#include <tqtimer.h>
36 36
 
37 37
 #include <kurl.h>
38 38
 #include <kdebug.h>
@@ -71,7 +71,7 @@ bool KAudioConverter::setup(int samplingRate)
71 71
 	return true;
72 72
 }
73 73
 
74
-void KAudioConverter::slotMimeType(const QString &mimeType)
74
+void KAudioConverter::slotMimeType(const TQString &mimeType)
75 75
 {
76 76
 	m_mimeType = mimeType;
77 77
 	kapp->exit_loop();
@@ -88,7 +88,7 @@ void KAudioConverter::requestPlayObject(const KURL &url)
88 88
 		Arts::KIOInputStream_impl *inputStreamImpl = new Arts::KIOInputStream_impl();
89 89
 		inputStream = Arts::KIOInputStream::_from_base(inputStreamImpl);
90 90
 
91
-		QObject::connect(inputStreamImpl, SIGNAL(mimeTypeFound(const QString &)), SLOT(slotMimeType(const QString &)));
91
+		TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &)));
92 92
 
93 93
 		inputStream.openURL(url.url().latin1());
94 94
 		inputStream.streamStart();
@@ -134,7 +134,7 @@ void KAudioConverter::requestPlayObject(const KURL &url)
134 134
 	{
135 135
 		Arts::PlayObject result = Arts::SubClass(objectType);
136 136
 
137
-		if(result.loadMedia(string(QFile::encodeName(url.path()))))
137
+		if(result.loadMedia(string(TQFile::encodeName(url.path()))))
138 138
 		{
139 139
 			result._node()->start();
140 140
 			m_incoming = new KPlayObject(result, false);
@@ -161,9 +161,9 @@ void KAudioConverter::start()
161 161
 	Arts::connect(m_incoming->object(), "left", m_request, "left");
162 162
 	Arts::connect(m_incoming->object(), "right", m_request, "right");
163 163
 
164
-	QObject::connect(requestImpl, SIGNAL(newBlockSize(long)), SIGNAL(newBlockSize(long)));
165
-	QObject::connect(requestImpl, SIGNAL(newBlockPointer(long)), SIGNAL(newBlockPointer(long)));
166
-	QObject::connect(requestImpl, SIGNAL(newData()), SIGNAL(newData()));
164
+	TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long)));
165
+	TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long)));
166
+	TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData()));
167 167
 
168 168
 	// Special mpeglib case
169 169
 	// TODO: needed at all??
@@ -174,7 +174,7 @@ void KAudioConverter::start()
174 174
 	
175 175
 	m_request.start();
176 176
 		
177
-	// TODO: Maybe do this async, using QTimer::singleShot
177
+	// TODO: Maybe do this async, using TQTimer::singleShot
178 178
 	// But jowenn i think jowenn is right -> this would
179 179
 	// lead to problems in slotNewData() when accessing the data
180 180
 	// (could already be overwritten...)

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

@@ -22,7 +22,7 @@
22 22
 #ifndef KAUDIOCONVERTER_H
23 23
 #define KAUDIOCONVERTER_H
24 24
 
25
-#include <qobject.h>
25
+#include <tqobject.h>
26 26
 #include "artskde.h"
27 27
 #include "kplayobject.h"
28 28
 
@@ -52,12 +52,12 @@ signals:
52 52
 	void rawStreamFinished();
53 53
 
54 54
 private slots:
55
-	void slotMimeType(const QString &mimeType);
55
+	void slotMimeType(const TQString &mimeType);
56 56
 	
57 57
 private:
58 58
 	Arts::KDataRequest m_request;
59 59
 	KPlayObject *m_incoming;
60
-	QString m_mimeType;
60
+	TQString m_mimeType;
61 61
 
62 62
 	bool m_started;
63 63
 };

+ 7
- 7
arts/kde/kaudiomanagerplay.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <soundserver.h>
24 24
 #include <string>
25 25
 
26
-KAudioManagerPlay::KAudioManagerPlay( KArtsServer * server, const QString & title )
26
+KAudioManagerPlay::KAudioManagerPlay( KArtsServer * server, const TQString & title )
27 27
 {
28 28
 	d = new PrivateData;
29 29
 	d->amanPlay = Arts::DynamicCast( server->server().createObject( "Arts::Synth_AMAN_PLAY" ) );
@@ -49,24 +49,24 @@ bool KAudioManagerPlay::isNull() const
49 49
 	return d->amanPlay.isNull();
50 50
 }
51 51
 
52
-void KAudioManagerPlay::setTitle( const QString & title )
52
+void KAudioManagerPlay::setTitle( const TQString & title )
53 53
 {
54 54
 	d->amanPlay.title( std::string( title.local8Bit() ) );
55 55
 }
56 56
 
57
-QString KAudioManagerPlay::title()
57
+TQString KAudioManagerPlay::title()
58 58
 {
59
-	return QString::fromLocal8Bit( d->amanPlay.title().c_str() );
59
+	return TQString::fromLocal8Bit( d->amanPlay.title().c_str() );
60 60
 }
61 61
 
62
-void KAudioManagerPlay::setAutoRestoreID( const QString & autoRestoreID )
62
+void KAudioManagerPlay::setAutoRestoreID( const TQString & autoRestoreID )
63 63
 {
64 64
 	d->amanPlay.autoRestoreID( std::string( autoRestoreID.local8Bit() ) );
65 65
 }
66 66
 
67
-QString KAudioManagerPlay::autoRestoreID()
67
+TQString KAudioManagerPlay::autoRestoreID()
68 68
 {
69
-	return QString::fromLocal8Bit( d->amanPlay.autoRestoreID().c_str() );
69
+	return TQString::fromLocal8Bit( d->amanPlay.autoRestoreID().c_str() );
70 70
 }
71 71
 
72 72
 void KAudioManagerPlay::start()

+ 6
- 6
arts/kde/kaudiomanagerplay.h View File

@@ -21,7 +21,7 @@
21 21
 #define KAUDIOMANAGERPLAY_H
22 22
 
23 23
 #include <artsflow.h>
24
-#include <qstring.h>
24
+#include <tqstring.h>
25 25
 #include <kdelibs_export.h>
26 26
 
27 27
 class KArtsServer;
@@ -38,7 +38,7 @@ class QString;
38 38
 class KDE_ARTS_EXPORT KAudioManagerPlay
39 39
 {
40 40
 	public:
41
-		KAudioManagerPlay( KArtsServer * server, const QString & title = QString::null );
41
+		KAudioManagerPlay( KArtsServer * server, const TQString & title = TQString::null );
42 42
 		~KAudioManagerPlay();
43 43
 
44 44
 		/**
@@ -57,15 +57,15 @@ class KDE_ARTS_EXPORT KAudioManagerPlay
57 57
 		/**
58 58
 		 * Set the name of the output in the AudioManager
59 59
 		 */
60
-		void setTitle( const QString & title );
60
+		void setTitle( const TQString & title );
61 61
 
62 62
 		/**
63 63
 		 * returns the name of the output as it appears in the AudioManager
64 64
 		 */
65
-		QString title();
65
+		TQString title();
66 66
 
67
-		void setAutoRestoreID( const QString & autoRestoreID );
68
-		QString autoRestoreID();
67
+		void setAutoRestoreID( const TQString & autoRestoreID );
68
+		TQString autoRestoreID();
69 69
 
70 70
 		void start();
71 71
 		void stop();

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

@@ -29,16 +29,16 @@
29 29
 #include <kglobal.h>
30 30
 #include <kdebug.h>
31 31
 
32
-#include <qstring.h>
33
-//#include <qptrqueue.h>
34
-//#include <qcstring.h> //QByteArray
32
+#include <tqstring.h>
33
+//#include <tqptrqueue.h>
34
+//#include <tqcstring.h> //QByteArray
35 35
 
36 36
 #include <string.h> // for strncpy
37 37
 
38 38
 //#include <assert.h>
39 39
 
40
-KAudioPlayStreamPrivate::KAudioPlayStreamPrivate( KArtsServer* server, const QString title, QObject* p, const char* n )
41
- : QObject( p,n )
40
+KAudioPlayStreamPrivate::KAudioPlayStreamPrivate( KArtsServer* server, const TQString title, TQObject* p, const char* n )
41
+ : TQObject( p,n )
42 42
  , _server( server )
43 43
  , _play( new KAudioManagerPlay( _server, title ) )
44 44
  , _effectrack( Arts::StereoEffectStack::null() )
@@ -82,8 +82,8 @@ void KAudioPlayStreamPrivate::initaRts() {
82 82
 	if ( _effects ) _effectrack.start();
83 83
 }
84 84
 
85
-KAudioPlayStream::KAudioPlayStream( KArtsServer* server, const QString title, QObject* p, const char* n )
86
- : QObject( p,n )
85
+KAudioPlayStream::KAudioPlayStream( KArtsServer* server, const TQString title, TQObject* p, const char* n )
86
+ : TQObject( p,n )
87 87
  , d( new KAudioPlayStreamPrivate( server, title, this ) )
88 88
 {
89 89
 	kdDebug( 400 ) << k_funcinfo << endl;
@@ -147,7 +147,7 @@ void KAudioPlayStream::stop()
147 147
 	}
148 148
 }
149 149
 
150
-void KAudioPlayStream::write( QByteArray& )
150
+void KAudioPlayStream::write( TQByteArray& )
151 151
 {
152 152
 }
153 153
 
@@ -156,7 +156,7 @@ void KAudioPlayStream::fillData( Arts::DataPacket<Arts::mcopbyte> *packet )
156 156
 	//kdDebug( 400 ) << k_funcinfo << "packet->size=" << packet->size << endl;
157 157
 	if ( d->_polling )
158 158
 	{
159
-		QByteArray bytearray( packet->size );
159
+		TQByteArray bytearray( packet->size );
160 160
 		bytearray.setRawData( ( char* )packet->contents, packet->size );
161 161
 		bytearray.fill( 0 );
162 162
 		emit requestData( bytearray );

+ 6
- 6
arts/kde/kaudioplaystream.h View File

@@ -20,9 +20,9 @@
20 20
 #ifndef KAUDIOPLAYSTREAM_H
21 21
 #define KAUDIOPLAYSTREAM_H
22 22
 
23
-#include <qobject.h>
23
+#include <tqobject.h>
24 24
 
25
-#include <qcstring.h>
25
+#include <tqcstring.h>
26 26
 #include <stdsynthmodule.h>
27 27
 
28 28
 #include <kdelibs_export.h>
@@ -39,7 +39,7 @@ class KAudioPlayStreamPrivate;
39 39
  * @since 3.2
40 40
 */
41 41
 
42
-class KDE_ARTS_EXPORT KAudioPlayStream : public QObject {
42
+class KDE_ARTS_EXPORT KAudioPlayStream : public TQObject {
43 43
    Q_OBJECT
44 44
 public:
45 45
 	/**
@@ -51,7 +51,7 @@ public:
51 51
 	 * @param parent You will propably want to pass the server as parent to so this stream gets deleted before the server disappears.
52 52
 	 * @param name The name of the stream.
53 53
 	*/
54
-	KAudioPlayStream( KArtsServer* server, const QString title, QObject* parent=0, const char* name=0 );
54
+	KAudioPlayStream( KArtsServer* server, const TQString title, TQObject* parent=0, const char* name=0 );
55 55
 	/**
56 56
 	 * Destructs the KAudioPlayStream.
57 57
 	*/
@@ -96,13 +96,13 @@ public slots:
96 96
 	 * Write data into the inputbuffer.
97 97
 	 * If you ignore the signal noData() it will play 0 ( silence ).
98 98
 	*/
99
-	void write( QByteArray& data );
99
+	void write( TQByteArray& data );
100 100
 signals:
101 101
 	/**
102 102
 	 * This signal is emitted when audio should be played.
103 103
 	 * You have to fill the array with data.
104 104
 	*/
105
-	void requestData( QByteArray& );
105
+	void requestData( TQByteArray& );
106 106
 
107 107
 	/**
108 108
 	 * Is emitted when the state changes.

+ 3
- 3
arts/kde/kaudioplaystream_p.h View File

@@ -23,7 +23,7 @@
23 23
 #include <soundserver.h>
24 24
 #include <stdsynthmodule.h>
25 25
 
26
-#include <qobject.h>
26
+#include <tqobject.h>
27 27
 
28 28
 class KArtsServer;
29 29
 class KAudioManagerPlay;
@@ -36,10 +36,10 @@ namespace Arts {
36 36
 class KAudioPlayStream;
37 37
 class KByteSoundProducer;
38 38
 
39
-class KAudioPlayStreamPrivate : public QObject {
39
+class KAudioPlayStreamPrivate : public TQObject {
40 40
    Q_OBJECT
41 41
 public:
42
-	KAudioPlayStreamPrivate( KArtsServer*, const QString title, QObject*, const char* =0 );
42
+	KAudioPlayStreamPrivate( KArtsServer*, const TQString title, TQObject*, const char* =0 );
43 43
 	~KAudioPlayStreamPrivate();
44 44
 
45 45
 	KArtsServer* _server;

+ 12
- 12
arts/kde/kaudiorecordstream.cpp View File

@@ -32,9 +32,9 @@
32 32
 #include <kglobal.h>
33 33
 #include <kdebug.h>
34 34
 
35
-#include <qstring.h>
36
-#include <qptrqueue.h>
37
-#include <qcstring.h> //QByteArray
35
+#include <tqstring.h>
36
+#include <tqptrqueue.h>
37
+#include <tqcstring.h> //QByteArray
38 38
 
39 39
 #include <assert.h>
40 40
 
@@ -50,12 +50,12 @@ struct KAudioRecordStream::Data
50 50
 	bool blocking;
51 51
 	bool polling;
52 52
 	unsigned int pos;
53
-	QPtrQueue<QByteArray> inqueue;
54
-	QString title;
53
+	TQPtrQueue<TQByteArray> inqueue;
54
+	TQString title;
55 55
 };
56 56
 
57
-KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const QString & title, QObject * parent, const char * name )
58
-	: QObject( parent, name )
57
+KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString & title, TQObject * parent, const char * name )
58
+	: TQObject( parent, name )
59 59
 	, d( new Data )
60 60
 {
61 61
 	d->kserver = kserver;
@@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const QString & t
66 66
 	d->inqueue.setAutoDelete( true );
67 67
 	d->title = title;
68 68
 
69
-	connect( d->kserver, SIGNAL( restartedServer() ), SLOT( slotRestartedServer() ) );
69
+	connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) );
70 70
 
71 71
 	d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) );
72 72
 	d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) );
@@ -109,7 +109,7 @@ int KAudioRecordStream::read( char * buffer, int size )
109 109
 			if( d->inqueue.isEmpty() )
110 110
 				return size - remaining;
111 111
 		}
112
-		QByteArray * data = d->inqueue.head();
112
+		TQByteArray * data = d->inqueue.head();
113 113
 		unsigned int tocopy = kMin( remaining, data->size() - d->pos );
114 114
 		memcpy( buffer, data->data() + d->pos, tocopy );
115 115
 		d->pos += tocopy;
@@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels )
196 196
 
197 197
 			d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() );
198 198
 			d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base );
199
-			connect( d->receiver_base, SIGNAL( data( const char *, unsigned int ) ),
200
-					SLOT( slotData( const char *, unsigned int ) ) );
199
+			connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ),
200
+					TQT_SLOT( slotData( const char *, unsigned int ) ) );
201 201
 			Arts::connect( d->convert, "outdata", d->receiver, "indata" );
202 202
 
203 203
 			d->convert.start();
@@ -222,7 +222,7 @@ void KAudioRecordStream::slotRestartedServer() { }
222 222
 void KAudioRecordStream::slotData( const char * contents, unsigned int size )
223 223
 {
224 224
 	//kdDebug( 400 ) << k_funcinfo << endl;
225
-	QByteArray * bytearray = new QByteArray( size );
225
+	TQByteArray * bytearray = new TQByteArray( size );
226 226
 	// copy the contents to the bytearray
227 227
 	// this has to be deleted later
228 228
 	bytearray->duplicate( contents, size );

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

@@ -25,7 +25,7 @@
25 25
 #ifndef _KAUDIORECORDSTREAM__H
26 26
 #define _KAUDIORECORDSTREAM__H
27 27
 
28
-#include <qobject.h>
28
+#include <tqobject.h>
29 29
 
30 30
 #include <kdelibs_export.h>
31 31
 
@@ -51,7 +51,7 @@ class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
51 51
                  * @param parent You will propably want to pass the server as parent to so this stream gets deleted before the server disappears.
52 52
                  * @param name The name of the stream.
53 53
 		 */
54
-		KAudioRecordStream( KArtsServer * server, const QString & title, QObject * parent = 0, const char * name = 0 );
54
+		KAudioRecordStream( KArtsServer * server, const TQString & title, TQObject * parent = 0, const char * name = 0 );
55 55
 
56 56
 		~KAudioRecordStream();
57 57
 
@@ -137,12 +137,12 @@ class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
137 137
 	signals:
138 138
 		/**
139 139
 		 * Data from the aRts server has arrived. You should copy the data
140
-		 * because the passed QByteArray will be deleted right after
140
+		 * because the passed TQByteArray will be deleted right after
141 141
 		 * returning from your slot(s).
142 142
 		 *
143 143
 		 * @param data the data from the server
144 144
 		 */
145
-		void data( QByteArray & data );
145
+		void data( TQByteArray & data );
146 146
 
147 147
 		/**
148 148
 		 * Wether this RecordStream is recording or not.

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

@@ -26,9 +26,9 @@
26 26
 #include <soundserver.h>
27 27
 #include <stdsynthmodule.h>
28 28
 
29
-#include <qobject.h>
29
+#include <tqobject.h>
30 30
 
31
-class KByteSoundReceiver : public QObject,
31
+class KByteSoundReceiver : public TQObject,
32 32
                            public Arts::ByteSoundReceiver_skel,
33 33
                            public Arts::StdSynthModule
34 34
 {

+ 7
- 7
arts/kde/kconverttest.cc View File

@@ -1,7 +1,7 @@
1 1
 #include <stdio.h>
2 2
 
3
-#include <qfile.h>
4
-#include <qobject.h>
3
+#include <tqfile.h>
4
+#include <tqobject.h>
5 5
 
6 6
 #include <klocale.h>
7 7
 #include <kaboutdata.h>
@@ -81,13 +81,13 @@ int main(int argc, char **argv)
81 81
 	// converter.setup(44100);
82 82
 	converter.requestPlayObject(url);
83 83
 
84
-	QObject::connect(&converter, SIGNAL(rawStreamStart()), get, SLOT(slotRawStreamStart()));
84
+	TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart()));
85 85
 
86
-	QObject::connect(&converter, SIGNAL(newBlockSize(long)), get, SLOT(slotNewBlockSize(long)));
87
-	QObject::connect(&converter, SIGNAL(newBlockPointer(long)), get, SLOT(slotNewBlockPointer(long)));
88
-	QObject::connect(&converter, SIGNAL(newData()), get, SLOT(slotNewData()));
86
+	TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long)));
87
+	TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long)));
88
+	TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData()));
89 89
 	
90
-	QObject::connect(&converter, SIGNAL(rawStreamFinished()), get, SLOT(slotRawStreamFinished()));
90
+	TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished()));
91 91
 
92 92
 	converter.start();
93 93
 

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

@@ -22,7 +22,7 @@
22 22
 #ifndef KCONVERTTEST_H
23 23
 #define KCONVERTTEST_H
24 24
 
25
-#include <qobject.h>
25
+#include <tqobject.h>
26 26
 
27 27
 class KConvertTest : public QObject
28 28
 {

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

@@ -22,14 +22,14 @@
22 22
 #ifndef KDATAREQUEST_IMPL
23 23
 #define KDATAREQUEST_IMPL
24 24
 
25
-#include <qobject.h>
25
+#include <tqobject.h>
26 26
 #include "artskde.h"
27 27
 #include "stdsynthmodule.h" 
28 28
 
29 29
 namespace Arts
30 30
 {
31 31
 
32
-class KDataRequest_impl : public QObject, virtual public KDataRequest_skel,
32
+class KDataRequest_impl : public TQObject, virtual public KDataRequest_skel,
33 33
 						  virtual public StdSynthModule
34 34
 {
35 35
 Q_OBJECT

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

@@ -34,8 +34,8 @@
34 34
 #include <kio/job.h>
35 35
 #include <kio/kmimetype.h>
36 36
 #include <kio/jobclasses.h>
37
-#include <qtimer.h>
38
-#include <qdatastream.h>
37
+#include <tqtimer.h>
38
+#include <tqdatastream.h>
39 39
 #include "artsversion.h"
40 40
 #include "kioinputstream_impl.moc"
41 41
 
@@ -78,16 +78,16 @@ 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", QString::fromLatin1("aRts/") + QString::fromLatin1(ARTS_VERSION));
81
+	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
82 82
 
83
-	QObject::connect(m_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
84
-			 this, SLOT(slotData(KIO::Job *, const QByteArray &)));		     
85
-	QObject::connect(m_job, SIGNAL(result(KIO::Job *)),
86
-			 this, SLOT(slotResult(KIO::Job *)));		     
87
-	QObject::connect(m_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
88
-			 this, SLOT(slotScanMimeType(KIO::Job *, const QString &)));
89
-	QObject::connect(m_job, SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
90
-			 this, SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
83
+	TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
84
+			 this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));		     
85
+	TQObject::connect(m_job, TQT_SIGNAL(result(KIO::Job *)),
86
+			 this, TQT_SLOT(slotResult(KIO::Job *)));		     
87
+	TQObject::connect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
88
+			 this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
89
+	TQObject::connect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
90
+			 this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
91 91
 
92 92
 	m_streamStarted = true;
93 93
 }
@@ -98,14 +98,14 @@ void KIOInputStream_impl::streamEnd()
98 98
 
99 99
 	if(m_job != 0)
100 100
 	{
101
-		QObject::disconnect(m_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
102
-	    				this, SLOT(slotData(KIO::Job *, const QByteArray &)));
103
-		QObject::disconnect(m_job, SIGNAL(result(KIO::Job *)),
104
-						this, SLOT(slotResult(KIO::Job *)));		     
105
-		QObject::disconnect(m_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
106
-				 this, SLOT(slotScanMimeType(KIO::Job *, const QString &)));
107
-		QObject::disconnect(m_job, SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
108
-				 this, SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
101
+		TQObject::disconnect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
102
+	    				this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
103
+		TQObject::disconnect(m_job, TQT_SIGNAL(result(KIO::Job *)),
104
+						this, TQT_SLOT(slotResult(KIO::Job *)));		     
105
+		TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
106
+				 this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
107
+		TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
108
+				 this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
109 109
 
110 110
 		if ( m_streamPulled )
111 111
 			outdata.endPull();
@@ -124,12 +124,12 @@ bool KIOInputStream_impl::openURL(const std::string& url)
124 124
 	return true;
125 125
 }
126 126
 
127
-void KIOInputStream_impl::slotData(KIO::Job *, const QByteArray &data)
127
+void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
128 128
 {
129 129
 	if(m_finished)
130 130
 	    m_finished = false;
131 131
 
132
-	QDataStream dataStream(m_data, IO_WriteOnly | IO_Append);
132
+	TQDataStream dataStream(m_data, IO_WriteOnly | IO_Append);
133 133
 	dataStream.writeRawBytes(data.data(), data.size());
134 134
 	//kdDebug( 400 ) << "STREAMING: buffersize = " << m_data.size() << " bytes" << endl;
135 135
 	
@@ -151,7 +151,7 @@ void KIOInputStream_impl::slotResult(KIO::Job *job)
151 151
 	}
152 152
 }
153 153
 
154
-void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const QString &mimetype)
154
+void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const TQString &mimetype)
155 155
 {
156 156
 	kdDebug( 400 ) << "got mimetype: " << mimetype << endl;
157 157
 	emit mimeTypeFound(mimetype);

+ 7
- 7
arts/kde/kioinputstream_impl.h View File

@@ -22,8 +22,8 @@
22 22
 #ifndef KIOINPUTSTREAM_IMPL
23 23
 #define KIOINPUTSTREAM_IMPL
24 24
 
25
-#include <qobject.h>
26
-#include <qcstring.h>
25
+#include <tqobject.h>
26
+#include <tqcstring.h>
27 27
 #include <kio/jobclasses.h>
28 28
 #include <kurl.h>
29 29
 #include "artskde.h"
@@ -31,7 +31,7 @@
31 31
 
32 32
 namespace Arts {
33 33
 
34
-class KIOInputStream_impl : public QObject, virtual public KIOInputStream_skel, 
34
+class KIOInputStream_impl : public TQObject, virtual public KIOInputStream_skel, 
35 35
 					    virtual public InputStream_skel,
36 36
 					    virtual public StdSynthModule
37 37
 {
@@ -59,18 +59,18 @@ public:
59 59
 	long packetSize() { return m_packetSize; }
60 60
 
61 61
 signals:
62
-	void mimeTypeFound(const QString & mimetype);
62
+	void mimeTypeFound(const TQString & mimetype);
63 63
 	
64 64
 private slots:
65
-	void slotData(KIO::Job *, const QByteArray &);
65
+	void slotData(KIO::Job *, const TQByteArray &);
66 66
 	void slotResult(KIO::Job *);
67
-	void slotScanMimeType(KIO::Job *, const QString &mimetype);
67
+	void slotScanMimeType(KIO::Job *, const TQString &mimetype);
68 68
 	void slotTotalSize(KIO::Job *, KIO::filesize_t size);
69 69
 
70 70
 private:
71 71
 	KURL m_url;
72 72
 	KIO::TransferJob *m_job;
73
-	QByteArray m_data;
73
+	TQByteArray m_data;
74 74
 	bool m_finished;
75 75
 	bool m_firstBuffer;
76 76
 	bool m_streamStarted;

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

@@ -24,13 +24,13 @@
24 24
 #include "kplayobjectcreator.h"
25 25
 #include <kdebug.h>
26 26
 
27
-KPlayObject::KPlayObject() : QObject()
27
+KPlayObject::KPlayObject() : TQObject()
28 28
 {
29 29
 	m_playObject = Arts::PlayObject::null();
30 30
 	m_isStream = false;
31 31
 }
32 32
 
33
-KPlayObject::KPlayObject(Arts::PlayObject playobject, bool isStream) : QObject()
33
+KPlayObject::KPlayObject(Arts::PlayObject playobject, bool isStream) : TQObject()
34 34
 {
35 35
 	m_playObject = playobject;
36 36
 	m_isStream = isStream;
@@ -63,9 +63,9 @@ void KPlayObject::halt()
63 63
 	object().halt();
64 64
 }
65 65
 
66
-QString KPlayObject::description()
66
+TQString KPlayObject::description()
67 67
 {
68
-	return QString::fromLatin1(object().description().c_str());
68
+	return TQString::fromLatin1(object().description().c_str());
69 69
 }
70 70
 
71 71
 Arts::poTime KPlayObject::currentTime()
@@ -83,9 +83,9 @@ Arts::poCapabilities KPlayObject::capabilities()
83 83
 	return object().capabilities();
84 84
 }
85 85
 
86
-QString KPlayObject::mediaName()
86
+TQString KPlayObject::mediaName()
87 87
 {
88
-	return QString::fromLatin1(object().mediaName().c_str());
88
+	return TQString::fromLatin1(object().mediaName().c_str());
89 89
 }
90 90
 
91 91
 Arts::poState KPlayObject::state()
@@ -131,14 +131,14 @@ struct KDE::PlayObject::PrivateData
131 131
 	KURL url;
132 132
 };
133 133
 
134
-KDE::PlayObject::PlayObject() : QObject()
134
+KDE::PlayObject::PlayObject() : TQObject()
135 135
 {
136 136
 	m_playObject = Arts::PlayObject::null();
137 137
 	m_isStream = false;
138 138
 	d = new PrivateData;
139 139
 }
140 140
 
141
-KDE::PlayObject::PlayObject(Arts::PlayObject playobject, bool isStream) : QObject()
141
+KDE::PlayObject::PlayObject(Arts::PlayObject playobject, bool isStream) : TQObject()
142 142
 {
143 143
 	m_playObject = playobject;
144 144
 	m_isStream = isStream;
@@ -150,7 +150,7 @@ KDE::PlayObject::PlayObject(Arts::PlayObject playobject, bool isStream) : QObjec
150 150
 	//emit playObjectCreated();
151 151
 }
152 152
 
153
-KDE::PlayObject::PlayObject( Arts::SoundServerV2 server, const KURL& url, bool isStream, bool createBUS ) : QObject()
153
+KDE::PlayObject::PlayObject( Arts::SoundServerV2 server, const KURL& url, bool isStream, bool createBUS ) : TQObject()
154 154
 {
155 155
 	kdDebug( 400 ) << "KDE::PlayObject: created as proxy for URL " << url.url()<< endl;
156 156
 
@@ -179,7 +179,7 @@ void KDE::PlayObject::play()
179 179
 			if ( d->creator )
180 180
 				delete d->creator;
181 181
 			d->creator = new KDE::PlayObjectCreator( d->server );
182
-			d->creator->create( d->url, d->createBUS, this, SLOT( attachPlayObject( Arts::PlayObject ) ) );
182
+			d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) );
183 183
 			kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl;
184 184
 			d->internalState = Arts::posPlaying;
185 185
 		}
@@ -239,11 +239,11 @@ void KDE::PlayObject::halt()
239 239
 	d->internalState = Arts::posIdle;
240 240
 }
241 241
 
242
-QString KDE::PlayObject::description()
242
+TQString KDE::PlayObject::description()
243 243
 {
244 244
 	if ( object().isNull() )
245
-		return QString();
246
-	return QString::fromLatin1(object().description().c_str());
245
+		return TQString();
246
+	return TQString::fromLatin1(object().description().c_str());
247 247
 }
248 248
 
249 249
 Arts::poTime KDE::PlayObject::currentTime()
@@ -267,11 +267,11 @@ Arts::poCapabilities KDE::PlayObject::capabilities()
267 267
 	return object().capabilities();
268 268
 }
269 269
 
270
-QString KDE::PlayObject::mediaName()
270
+TQString KDE::PlayObject::mediaName()
271 271
 {
272 272
 	if ( object().isNull() )
273
-		return QString();
274
-	return QString::fromLatin1(object().mediaName().c_str());
273
+		return TQString();
274
+	return TQString::fromLatin1(object().mediaName().c_str());
275 275
 }
276 276
 
277 277
 Arts::poState KDE::PlayObject::state()

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

@@ -25,7 +25,7 @@
25 25
 #include "kmedia2.h"
26 26
 #include "soundserver.h"
27 27
 #include <kurl.h>
28
-#include <qobject.h>
28
+#include <tqobject.h>
29 29
 
30 30
 class KDE_EXPORT KPlayObject : public QObject
31 31
 {
@@ -84,7 +84,7 @@ public:
84 84
 	/**
85 85
 	 * Reimplemented (Arts::PlayObject Wrapper)
86 86
 	 */
87
-	QString description();
87
+	TQString description();
88 88
 	
89 89
 	/**
90 90
 	 * Reimplemented (Arts::PlayObject Wrapper)
@@ -104,7 +104,7 @@ public:
104 104
 	/**
105 105
 	 * Reimplemented (Arts::PlayObject Wrapper)
106 106
 	 */
107
-	QString mediaName();
107
+	TQString mediaName();
108 108
 	
109 109
 	/**
110 110
 	 * Reimplemented (Arts::PlayObject Wrapper)
@@ -163,7 +163,7 @@ class PlayObjectFactory;
163 163
   * This has some side effects that developers need to be aware of:
164 164
   * Until the real Arts::PlayObject got created,
165 165
   * - the capabilities() method returns "zero" capabilities,
166
-  * - description() and mediaName() will return a null QString,
166
+  * - description() and mediaName() will return a null TQString,
167 167
   * - currentTime() and overallTime() will return "zero",
168 168
   * - despite the fact that isNull() returns "false", object().isNull()
169 169
   *   will return "true". If you need to directly access methods of the
@@ -239,7 +239,7 @@ public:
239 239
 	/**
240 240
 	 * Reimplemented (Arts::PlayObject Wrapper)
241 241
 	 */
242
-	QString description();
242
+	TQString description();
243 243
 	
244 244
 	/**
245 245
 	 * Reimplemented (Arts::PlayObject Wrapper)
@@ -260,7 +260,7 @@ public:
260 260
 	/**
261 261
 	 * Reimplemented (Arts::PlayObject Wrapper)
262 262
 	 */
263
-	QString mediaName();
263
+	TQString mediaName();
264 264
 	
265 265
 	/**
266 266
 	 * returns the internal state of the PlayObject. The state can be
@@ -293,7 +293,7 @@ private:
293 293
 
294 294
 	/* private constructors, to prevent instantiation and copying */
295 295
 	PlayObject();
296
-	PlayObject( const PlayObject& ) : QObject() {};
296
+	PlayObject( const PlayObject& ) : TQObject() {};
297 297
 	PlayObject(Arts::PlayObject playobject, bool isStream);
298 298
 	PlayObject( Arts::SoundServerV2 server, const KURL& url, bool isStream, bool createBUS );
299 299
 

+ 9
- 9
arts/kde/kplayobjectcreator.cc View File

@@ -25,7 +25,7 @@
25 25
 #include "kplayobjectcreator.moc"
26 26
 #include "kioinputstream_impl.h"
27 27
 
28
-#include <qfile.h>
28
+#include <tqfile.h>
29 29
 
30 30
 #include <kdebug.h>
31 31
 
@@ -38,13 +38,13 @@ KDE::PlayObjectCreator::~PlayObjectCreator()
38 38
 {
39 39
 }
40 40
 
41
-bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const QObject* receiver, const char* slot)
41
+bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObject* receiver, const char* slot)
42 42
 {
43 43
 	// no need to go any further, and I hate deep indentation
44 44
 	if (m_server.isNull() || url.isEmpty() )
45 45
 		return false;
46 46
 
47
-	connect( this, SIGNAL( playObjectCreated( Arts::PlayObject ) ),
47
+	connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ),
48 48
 			receiver, slot );
49 49
 
50 50
 	// check if the URL is a local file
@@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const QObje
57 57
 		m_instream = Arts::KIOInputStream::_from_base(instream_impl);
58 58
 
59 59
 		// signal will be called once the ioslave knows the mime-type of the stream
60
-		connect(instream_impl, SIGNAL(mimeTypeFound(const QString &)),
61
-				 this, SLOT(slotMimeType(const QString &)));
60
+		connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)),
61
+				 this, TQT_SLOT(slotMimeType(const TQString &)));
62 62
 
63 63
 		// GO!
64 64
 		m_instream.openURL(url.url().latin1());
@@ -71,22 +71,22 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const QObje
71 71
 	// usual stuff if we have a local file
72 72
 	KMimeType::Ptr mimetype = KMimeType::findByURL(url);
73 73
 	emit playObjectCreated (
74
-		m_server.createPlayObjectForURL(std::string(QFile::encodeName(url.path())), 
74
+		m_server.createPlayObjectForURL(std::string(TQFile::encodeName(url.path())), 
75 75
 						 std::string(mimetype->name().latin1()), 
76 76
 						 createBUS)
77 77
 		);
78 78
 	return true;
79 79
 }
80 80
 
81
-void KDE::PlayObjectCreator::slotMimeType(const QString& mimetype)
81
+void KDE::PlayObjectCreator::slotMimeType(const TQString& mimetype)
82 82
 {
83 83
 
84 84
 	kdDebug( 400 ) << "slotMimeType called: " << mimetype << endl;
85 85
 
86
-	QString mimetype_copy = mimetype;
86
+	TQString mimetype_copy = mimetype;
87 87
 
88 88
 	if ( mimetype_copy == "application/octet-stream" )
89
-	    mimetype_copy = QString("audio/x-mp3");
89
+	    mimetype_copy = TQString("audio/x-mp3");
90 90
 
91 91
 	if (mimetype_copy == "application/x-zerosize")
92 92
 		emit playObjectCreated(Arts::PlayObject::null());

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

@@ -23,7 +23,7 @@
23 23
 #define KPLAYOBJECTCREATOR_H
24 24
 
25 25
 #include <kurl.h>
26
-#include <qobject.h>
26
+#include <tqobject.h>
27 27
 #include "soundserver.h"
28 28
 #include "kioinputstream_impl.h"
29 29
 
@@ -36,13 +36,13 @@ public:
36 36
 	PlayObjectCreator(Arts::SoundServerV2 server);
37 37
 	~PlayObjectCreator();
38 38
 
39
-	bool create(const KURL& url, bool createBUS, const QObject* receiver, const char* slot);
39
+	bool create(const KURL& url, bool createBUS, const TQObject* receiver, const char* slot);
40 40
 
41 41
 signals:
42 42
 	void playObjectCreated(Arts::PlayObject playObject);
43 43
 
44 44
 private slots:
45
-	void slotMimeType(const QString &mimetype);
45
+	void slotMimeType(const TQString &mimetype);
46 46
 
47 47
 private:
48 48
 	Arts::SoundServerV2 m_server;

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

@@ -29,7 +29,7 @@
29 29
 #include "kartsdispatcher.h"
30 30
 #include "kartsserver.h"
31 31
 
32
-#include <qfile.h>
32
+#include <tqfile.h>
33 33
 #include <kdebug.h>
34 34
 #include "kaudiomanagerplay.h"
35 35
 #include <flowsystem.h>
@@ -62,7 +62,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& url, bool createBU
62 62
 }
63 63
 
64 64
 
65
-KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const QString &mimetype, bool createBUS)
65
+KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQString &mimetype, bool createBUS)
66 66
 {
67 67
 	// WHY DOES BROKEN KIO_MEDIA GIVE WRONG URLS?
68 68
 	// I hate it
@@ -84,7 +84,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const QStrin
84 84
 			return new KPlayObject(m_server.createPlayObjectForStream(instream, string("audio/x-mp3"), createBUS), true);
85 85
 		}
86 86
 		else
87
-			return new KPlayObject(m_server.createPlayObjectForURL(string(QFile::encodeName(url.path())), string(mimetype.latin1()), createBUS), false);
87
+			return new KPlayObject(m_server.createPlayObjectForURL(string(TQFile::encodeName(url.path())), string(mimetype.latin1()), createBUS), false);
88 88
 	}
89 89
 	else
90 90
 		return new KPlayObject();
@@ -133,7 +133,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& url, bool
133 133
 	return createPlayObject(url, mimetype->name(), createBUS);
134 134
 }
135 135
 
136
-KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, const QString &mimetype, bool createBUS)
136
+KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, const TQString &mimetype, bool createBUS)
137 137
 {
138 138
 	// WHY DOES BROKEN KIO_MEDIA GIVE WRONG URLS?
139 139
 	// I hate it
@@ -158,7 +158,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
158 158
 	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
159 159
 	{
160 160
 		// we rely on the delivered mimetype if it's a local file
161
-		d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( QFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );
161
+		d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );
162 162
 	}
163 163
 	else
164 164
 	{
@@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
179 179
 		d->helper->po = d->playObj;
180 180
 		d->helper->ap = d->amanPlay;
181 181
 		if( d->playObj->object().isNull() && d->amanPlay )
182
-			QObject::connect( d->playObj, SIGNAL( playObjectCreated() ), d->helper, SLOT( connectAmanPlay() ) );
182
+			TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) );
183 183
 		else
184 184
 			d->helper->connectAmanPlay();
185 185
 	}
@@ -187,13 +187,13 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
187 187
 	return d->playObj;
188 188
 }
189 189
 
190
-QStringList KDE::PlayObjectFactory::mimeTypes(void)
190
+TQStringList KDE::PlayObjectFactory::mimeTypes(void)
191 191
 {
192 192
 	KArtsDispatcher dispatcher; // we need such a thing, otherwise we crash
193 193
 	Arts::TraderQuery query;
194 194
 	vector<Arts::TraderOffer> *offers = query.query();
195 195
 
196
-	QStringList results;
196
+	TQStringList results;
197 197
 	for(vector<Arts::TraderOffer>::iterator offer = offers->begin();
198 198
 	    offer != offers->end(); ++offer)
199 199
 	{
@@ -202,7 +202,7 @@ QStringList KDE::PlayObjectFactory::mimeTypes(void)
202 202
 		for(vector<string>::iterator mimetype = mimetypes->begin();
203 203
 		    mimetype != mimetypes->end(); ++mimetype)
204 204
 		{
205
-			QString name = QString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
205
+			TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
206 206
 			if(KMimeType::mimeType(name))
207 207
 				results.append(name);
208 208
 		}
@@ -213,9 +213,9 @@ QStringList KDE::PlayObjectFactory::mimeTypes(void)
213 213
 
214 214
 	// clean out duplicates
215 215
 	results.sort();
216
-	for(QStringList::iterator result = results.begin(); result != results.end(); )
216
+	for(TQStringList::iterator result = results.begin(); result != results.end(); )
217 217
 	{
218
-		QStringList::iterator previous = result;
218
+		TQStringList::iterator previous = result;
219 219
 		++result;
220 220
 		if(result != results.end() && *result == *previous)
221 221
 		{

+ 4
- 4
arts/kde/kplayobjectfactory.h View File

@@ -51,7 +51,7 @@ public:
51 51
 	~KPlayObjectFactory();
52 52
 
53 53
 	KPlayObject *createPlayObject(const KURL& url, bool createBUS);
54
-	KPlayObject *createPlayObject(const KURL& url, const QString &mimetype, bool createBUS);
54
+	KPlayObject *createPlayObject(const KURL& url, const TQString &mimetype, bool createBUS);
55 55
 
56 56
 	void setAllowStreaming(bool s) { m_allowStreaming = s; }
57 57
 	bool allowStreaming() { return m_allowStreaming; }
@@ -76,7 +76,7 @@ class POFHelper;
76 76
 	 * use the KDE multimedia framework can be found in the documentation
77 77
 	 * for KDE::PlayObject.
78 78
 	 */
79
-class KDE_EXPORT PlayObjectFactory// : public QObject ### for KDE4 make it a QObject to be able to receive signals
79
+class KDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals
80 80
 {
81 81
 public:
82 82
 	/**
@@ -116,7 +116,7 @@ public:
116 116
 	 * This method also creates a KDE::PlayObject, but does no automatic
117 117
 	 * mimetype detection. Use this method with care.
118 118
 	 */
119
-	KDE::PlayObject *createPlayObject(const KURL& url, const QString &mimetype, bool createBUS);
119
+	KDE::PlayObject *createPlayObject(const KURL& url, const TQString &mimetype, bool createBUS);
120 120
 
121 121
 	/**
122 122
 	 * setAllowStreaming( true ) allows the factory to create a
@@ -134,7 +134,7 @@ public:
134 134
 	/**
135 135
 	 * Return the mimetypes that are playable
136 136
 	 */
137
-	static QStringList mimeTypes(void);
137
+	static TQStringList mimeTypes(void);
138 138
 
139 139
 /*private slots: ### KDE4 and remove Helper class
140 140
 	void connectAmanPlay();*/

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

@@ -20,7 +20,7 @@
20 20
 #ifndef KPLAYOBJECTFACTORY_P_H
21 21
 #define KPLAYOBJECTFACTORY_P_H
22 22
 
23
-#include <qobject.h>
23
+#include <tqobject.h>
24 24
 #include "kplayobjectfactory.h"
25 25
 
26 26
 namespace KDE

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

@@ -16,8 +16,8 @@
16 16
 #ifdef HAVE_USLEEP
17 17
 #include <unistd.h>
18 18
 #endif
19
-#include <qaccel.h>
20
-#include <qcursor.h>
19
+#include <tqaccel.h>
20
+#include <tqcursor.h>
21 21
 
22 22
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
23 23
 #include <X11/Xlib.h>
@@ -49,7 +49,7 @@ KFullscreenVideoWidget::KFullscreenVideoWidget( KVideoWidget *parent, const char
49 49
 {
50 50
     this->videoWidget = parent;
51 51
     setEraseColor( black );
52
-    setCursor(QCursor(Qt::BlankCursor));
52
+    setCursor(TQCursor(Qt::BlankCursor));
53 53
 }
54 54
 
55 55
 void KFullscreenVideoWidget::windowActivationChange( bool )
@@ -73,18 +73,18 @@ bool KFullscreenVideoWidget::x11Event( XEvent *event )
73 73
     return false;
74 74
 }
75 75
 
76
-KVideoWidget::KVideoWidget( KXMLGUIClient *clientParent, QWidget *parent, const char *name, WFlags f )
76
+KVideoWidget::KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent, const char *name, WFlags f )
77 77
     : KXMLGUIClient( clientParent ),
78
-    QWidget( parent, name, f )
78
+    TQWidget( parent, name, f )
79 79
 {
80 80
 	init();
81 81
 	// ???
82
-	QString toolbarName = i18n("Video Toolbar");
83
-	setXML(QString("<!DOCTYPE kpartgui>\n<kpartgui name=\"kvideowidget\" version=\"1\"><MenuBar><Menu name=\"edit\"><Separator/><Action name=\"double_size\"/><Action name=\"normal_size\"/><Action name=\"half_size\"/><Separator/><Action name=\"fullscreen_mode\"/></Menu></MenuBar><Toolbar name=\"VideoToolbar\"><text>Video Toolbar</text><Action name=\"fullscreen_mode\"/></Toolbar></kpartgui>"), true);
82
+	TQString toolbarName = i18n("Video Toolbar");
83
+	setXML(TQString("<!DOCTYPE kpartgui>\n<kpartgui name=\"kvideowidget\" version=\"1\"><MenuBar><Menu name=\"edit\"><Separator/><Action name=\"double_size\"/><Action name=\"normal_size\"/><Action name=\"half_size\"/><Separator/><Action name=\"fullscreen_mode\"/></Menu></MenuBar><Toolbar name=\"VideoToolbar\"><text>Video Toolbar</text><Action name=\"fullscreen_mode\"/></Toolbar></kpartgui>"), true);
84 84
 }
85 85
 
86
-KVideoWidget::KVideoWidget( QWidget *parent, const char *name, WFlags f )
87
-    : QWidget( parent, name, f )
86
+KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
87
+    : TQWidget( parent, name, f )
88 88
 {
89 89
 	init();
90 90
 }
@@ -92,7 +92,7 @@ KVideoWidget::KVideoWidget( QWidget *parent, const char *name, WFlags f )
92 92
 void KVideoWidget::init(void)
93 93
 {
94 94
     setMinimumSize(0, 0);
95
-    setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
95
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
96 96
     setFocusPolicy( ClickFocus );
97 97
 
98 98
     fullscreenWidget = 0;
@@ -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, SLOT(fullscreenActivated()),
105
+		       CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
106 106
 		       actionCollection(), "fullscreen_mode" );
107 107
     new KRadioAction( i18n("&Half Size"), ALT+Key_0,
108
-		      this, SLOT(halfSizeActivated()),
108
+		      this, TQT_SLOT(halfSizeActivated()),
109 109
 		      actionCollection(), "half_size" );
110 110
     new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
111
-		      this, SLOT(normalSizeActivated()),
111
+		      this, TQT_SLOT(normalSizeActivated()),
112 112
 		      actionCollection(), "normal_size" );
113 113
     new KRadioAction( i18n("&Double Size"), ALT+Key_2,
114
-		      this, SLOT(doubleSizeActivated()),
114
+		      this, TQT_SLOT(doubleSizeActivated()),
115 115
 		      actionCollection(), "double_size" );
116 116
 
117 117
     ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -189,7 +189,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
189 189
     action("fullscreen_mode")->setEnabled(enable);
190 190
 }
191 191
 
192
-QImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
192
+TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
193 193
 {
194 194
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
195 195
     Window root;
@@ -199,7 +199,7 @@ QImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
199 199
     int x, y;
200 200
 
201 201
     if (vpo.isNull() || (long)(pixmap = vpo.x11Snapshot()) == -1)
202
-	return QImage();
202
+	return TQImage();
203 203
 
204 204
     // Get 32bit RGBA image data (stored in 1bpp pixmap)
205 205
     XGetGeometry( qt_xdisplay(), pixmap, &root, &x, &y, &width, &height, &border, &depth );
@@ -209,11 +209,11 @@ QImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
209 209
     if (xImage == 0)
210 210
     {
211 211
 	XFreePixmap( qt_xdisplay(), pixmap );
212
-	return QImage();
212
+	return TQImage();
213 213
     }
214 214
 
215 215
     // Convert 32bit RGBA image data into Qt image
216
-    QImage qImage = QImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, QImage::IgnoreEndian ).copy();
216
+    TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, TQImage::IgnoreEndian ).copy();
217 217
 
218 218
     // Free X11 resources and return Qt image
219 219
     XDestroyImage( xImage );
@@ -286,9 +286,9 @@ void KVideoWidget::setDoubleSize()
286 286
     doubleSizeActivated();
287 287
 }
288 288
 
289
-QSize KVideoWidget::sizeHint() const
289
+TQSize KVideoWidget::sizeHint() const
290 290
 {
291
-    return QSize( videoWidth, videoHeight );
291
+    return TQSize( videoWidth, videoHeight );
292 292
 }
293 293
 
294 294
 int KVideoWidget::heightForWidth( int w ) const
@@ -299,9 +299,9 @@ int KVideoWidget::heightForWidth( int w ) const
299 299
 		return int( double(w)*double(videoHeight)/double(videoWidth) );
300 300
 }
301 301
 
302
-void KVideoWidget::mousePressEvent( QMouseEvent *event )
302
+void KVideoWidget::mousePressEvent( TQMouseEvent *event )
303 303
 {
304
-	QPoint pos = mapToGlobal( event->pos() );
304
+	TQPoint pos = mapToGlobal( event->pos() );
305 305
 
306 306
 	emit mouseButtonPressed( event->button(), pos, event->state() );
307 307
 
@@ -310,14 +310,14 @@ void KVideoWidget::mousePressEvent( QMouseEvent *event )
310 310
 		emit rightButtonPressed( pos );
311 311
 }
312 312
 
313
-void KVideoWidget::mouseDoubleClickEvent( QMouseEvent *event )
313
+void KVideoWidget::mouseDoubleClickEvent( TQMouseEvent *event )
314 314
 {
315 315
 	emit mouseButtonDoubleClick( mapToGlobal( event->pos() ), event->state() );
316 316
 }
317 317
 
318
-void KVideoWidget::resizeEvent( QResizeEvent *event )
318
+void KVideoWidget::resizeEvent( TQResizeEvent *event )
319 319
 {
320
-    QWidget::resizeEvent( event );
320
+    TQWidget::resizeEvent( event );
321 321
 
322 322
     if (width() > minimumWidth() || height() > minimumHeight())
323 323
     {
@@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated()
379 379
 	fullscreenWidget = new KFullscreenVideoWidget( this );
380 380
 
381 381
 	// Interconnect mouse button signals
382
-	connect( fullscreenWidget, SIGNAL(mouseButtonPressed( int, const QPoint &, int )),
383
-		 this, SIGNAL(mouseButtonPressed( int, const QPoint &, int)) );
382
+	connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )),
383
+		 this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) );
384 384
 
385
-	connect( fullscreenWidget, SIGNAL(mouseButtonDoubleClick( const QPoint &, int )),
386
-		 this, SIGNAL(mouseButtonDoubleClick( const QPoint &, int )) );
385
+	connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )),
386
+		 this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) );
387 387
 
388 388
 	// ### Remove in KDE4
389
-	 connect( fullscreenWidget, SIGNAL(rightButtonPressed(const QPoint &)),
390
-		this, SIGNAL(rightButtonPressed(const QPoint &)) );
389
+	 connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)),
390
+		this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) );
391 391
 		 
392 392
 	// Leave fullscreen mode with <Escape> key
393
-	QAccel *a = new QAccel( fullscreenWidget );
393
+	TQAccel *a = new TQAccel( fullscreenWidget );
394 394
 	a->connectItem( a->insertItem( Key_Escape ),
395
-			this, SLOT(setWindowed()) );
395
+			this, TQT_SLOT(setWindowed()) );
396 396
 
397 397
 	fullscreenWidget->setFocus();
398 398
 	fullscreenWidget->showFullScreen();

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

@@ -11,24 +11,24 @@
11 11
 #ifndef ARTSKDE_KVIDEOWIDGET_H
12 12
 #define ARTSKDE_KVIDEOWIDGET_H
13 13
 
14
-#include <qevent.h>
15
-#include <qimage.h>
16
-#include <qwidget.h>
14
+#include <tqevent.h>
15
+#include <tqimage.h>
16
+#include <tqwidget.h>
17 17
 #include <kmedia2.h>
18 18
 #include <kxmlguiclient.h>
19 19
 
20 20
 
21
-class KDE_ARTS_EXPORT KVideoWidget : public QWidget, virtual public KXMLGUIClient
21
+class KDE_ARTS_EXPORT KVideoWidget : public TQWidget, virtual public KXMLGUIClient
22 22
 {
23 23
 Q_OBJECT
24 24
 
25 25
 public:
26
-    KVideoWidget( KXMLGUIClient *clientParent, QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
27
-    KVideoWidget( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
26
+    KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
27
+    KVideoWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
28 28
     virtual ~KVideoWidget();
29 29
 
30 30
     void embed( Arts::VideoPlayObject vpo );
31
-    static QImage snapshot( Arts::VideoPlayObject vpo );
31
+    static TQImage snapshot( Arts::VideoPlayObject vpo );
32 32
 
33 33
     bool isEmbedded();
34 34
     bool isFullscreen();
@@ -36,14 +36,14 @@ public:
36 36
     bool isNormalSize();
37 37
     bool isDoubleSize();
38 38
 
39
-    QSize sizeHint() const;
39
+    TQSize sizeHint() const;
40 40
 
41 41
     virtual int heightForWidth ( int w ) const;
42 42
 
43 43
 protected:
44
-    virtual void mousePressEvent( QMouseEvent *event );
45
-    virtual void mouseDoubleClickEvent( QMouseEvent *event);
46
-    virtual void resizeEvent( QResizeEvent *event );
44
+    virtual void mousePressEvent( TQMouseEvent *event );
45
+    virtual void mouseDoubleClickEvent( TQMouseEvent *event);
46
+    virtual void resizeEvent( TQResizeEvent *event );
47 47
     virtual bool x11Event( XEvent *event );
48 48
 
49 49
 public slots:
@@ -63,17 +63,17 @@ protected slots:
63 63
 
64 64
 signals:
65 65
     void adaptSize( int width, int height );
66
-    void mouseButtonPressed( int type, const QPoint &, int state );
67
-    void mouseButtonDoubleClick( const QPoint &, int state );
66
+    void mouseButtonPressed( int type, const TQPoint &, int state );
67
+    void mouseButtonDoubleClick( const TQPoint &, int state );
68 68
     /**
69 69
      * @deprecated
70
-     * use mouseButtonPressed( int type, const QPoint & ) instead.
70
+     * use mouseButtonPressed( int type, const TQPoint & ) instead.
71 71
      */
72
-    void rightButtonPressed( const QPoint & );
72
+    void rightButtonPressed( const TQPoint & );
73 73
 
74 74
 private:
75 75
     void init(void);
76
-    QWidget *fullscreenWidget;
76
+    TQWidget *fullscreenWidget;
77 77
     int videoWidth;
78 78
     int videoHeight;
79 79
     Arts::VideoPlayObject poVideo;

+ 18
- 18
arts/kde/mcop-dcop/kmcop.cpp View File

@@ -23,8 +23,8 @@
23 23
 #include <klocale.h>
24 24
 #include <dcopclient.h>
25 25
 
26
-#include <qvaluelist.h>
27
-#include <qcstring.h>
26
+#include <tqvaluelist.h>
27
+#include <tqcstring.h>
28 28
 
29 29
 #include <kartsdispatcher.h>
30 30
 #include <soundserver.h>
@@ -43,7 +43,7 @@ class KMCOPPrivate
43 43
 {
44 44
 public:
45 45
 	MCOPInfo mcopInfo; 
46
-	QPtrList<MCOPDCOPObject> list;
46
+	TQPtrList<MCOPDCOPObject> list;
47 47
 };
48 48
 
49 49
 int main(int argc, char **argv)
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
74 74
     return app.exec();
75 75
 }
76 76
 
77
-KMCOP::KMCOP() : QObject(), DCOPObject("arts")
77
+KMCOP::KMCOP() : TQObject(), DCOPObject("arts")
78 78
 {
79 79
     d = new KMCOPPrivate();
80 80
 	d->mcopInfo = Reference("global:Arts_MCOPInfo");
@@ -91,10 +91,10 @@ int KMCOP::objectCount()
91 91
 	return d->mcopInfo.objectCount();
92 92
 }
93 93
 
94
-QCString KMCOP::correctType(const QCString &str)
94
+TQCString KMCOP::correctType(const TQCString &str)
95 95
 {
96 96
 	if(str == "string")
97
-		return "QCString";
97
+		return "TQCString";
98 98
 	return str;
99 99
 }
100 100
 
@@ -106,7 +106,7 @@ void KMCOP::addInterfacesHackHackHack()
106 106
 		
107 107
 		if(!obj.isNull())		
108 108
 		{
109
-			QCString interfaceName = obj._interfaceName().c_str();
109
+			TQCString interfaceName = obj._interfaceName().c_str();
110 110
 
111 111
 			if(interfaceName != "Arts::TraderOffer")
112 112
 			{
@@ -121,21 +121,21 @@ void KMCOP::addInterfacesHackHackHack()
121 121
 				vector<MethodDef>::iterator ifaceMethodsIterator;
122 122
 				for(ifaceMethodsIterator = ifaceMethods.begin(); ifaceMethodsIterator != ifaceMethods.end(); ifaceMethodsIterator++)
123 123
 				{
124
-					QCString function, signature;
124
+					TQCString function, signature;
125 125
 
126 126
 					MCOPEntryInfo *entry = new MCOPEntryInfo();
127 127
 					
128 128
 					MethodDef currentMethod = *ifaceMethodsIterator;
129 129
 					vector<ParamDef> currentParameters = currentMethod.signature;
130 130
 
131
-					QCString newType = correctType(QCString(currentMethod.type.c_str()));
131
+					TQCString newType = correctType(TQCString(currentMethod.type.c_str()));
132 132
 					
133 133
 					entry->setFunctionType(newType);
134
-					entry->setFunctionName(QCString(currentMethod.name.c_str()));
134
+					entry->setFunctionName(TQCString(currentMethod.name.c_str()));
135 135
 					
136
-					function = entry->functionType() + QCString(" ") + entry->functionName() + QCString("(");
136
+					function = entry->functionType() + TQCString(" ") + entry->functionName() + TQCString("(");
137 137
 					
138
-					signature = QCString("(");
138
+					signature = TQCString("(");
139 139
 
140 140
 					QCStringList signatureList;
141 141
 					
@@ -145,20 +145,20 @@ void KMCOP::addInterfacesHackHackHack()
145 145
 						ParamDef parameter = *methodParametersIterator;
146 146
 						if(methodParametersIterator != currentParameters.begin())
147 147
 						{
148
-							function += QCString(", ");						
149
-							signature += QCString(",");
148
+							function += TQCString(", ");						
149
+							signature += TQCString(",");
150 150
 						}
151 151
 						
152
-						QCString correctParameter = correctType(QCString(parameter.type.c_str()));
152
+						TQCString correctParameter = correctType(TQCString(parameter.type.c_str()));
153 153
 						
154 154
 						function += correctParameter;
155 155
 						signature += correctParameter;
156 156
 
157
-						signatureList.append(QCString(parameter.type.c_str()));
157
+						signatureList.append(TQCString(parameter.type.c_str()));
158 158
 					}
159 159
 					
160
-					function += QCString(")");
161
-					signature += QCString(")");
160
+					function += TQCString(")");
161
+					signature += TQCString(")");
162 162
 
163 163
 					entry->setSignature(signature);
164 164
 					entry->setSignatureList(signatureList);

+ 3
- 3
arts/kde/mcop-dcop/kmcop.h View File

@@ -20,13 +20,13 @@
20 20
 #ifndef KMCOP_H
21 21
 #define KMCOP_H
22 22
 
23
-#include <qobject.h>
23
+#include <tqobject.h>
24 24
 
25 25
 #include <dcopobject.h>
26 26
 
27 27
 class KMCOPPrivate;
28 28
 
29
-class KMCOP : public QObject,
29
+class KMCOP : public TQObject,
30 30
 			  public DCOPObject
31 31
 {
32 32
 Q_OBJECT
@@ -41,7 +41,7 @@ k_dcop:
41 41
 	void addInterfacesHackHackHack();
42 42
 
43 43
 private:
44
-	QCString correctType(const QCString &str);
44
+	TQCString correctType(const TQCString &str);
45 45
     KMCOPPrivate *d;
46 46
 };
47 47
 

+ 15
- 15
arts/kde/mcop-dcop/mcopdcopobject.cpp View File

@@ -23,8 +23,8 @@
23 23
 //#include <reference.h>
24 24
 #include <dynamicrequest.h>
25 25
 
26
-#include <qmap.h>
27
-#include <qdatastream.h>
26
+#include <tqmap.h>
27
+#include <tqdatastream.h>
28 28
 
29 29
 using namespace std;
30 30
 
@@ -34,10 +34,10 @@ using namespace std;
34 34
 class MCOPDCOPObjectPrivate
35 35
 {
36 36
 public:
37
-	QMap<QCString, MCOPEntryInfo *> dynamicFunctions;
37
+	TQMap<TQCString, MCOPEntryInfo *> dynamicFunctions;
38 38
 };
39 39
 
40
-MCOPDCOPObject::MCOPDCOPObject(QCString name) : DCOPObject(name)
40
+MCOPDCOPObject::MCOPDCOPObject(TQCString name) : DCOPObject(name)
41 41
 {
42 42
     d = new MCOPDCOPObjectPrivate();
43 43
 }
@@ -51,14 +51,14 @@ QCStringList MCOPDCOPObject::functionsDynamic()
51 51
 {
52 52
 	QCStringList returnList;
53 53
 	
54
-	QMap<QCString, MCOPEntryInfo *>::iterator it;
54
+	TQMap<TQCString, MCOPEntryInfo *>::iterator it;
55 55
 	for(it = d->dynamicFunctions.begin(); it != d->dynamicFunctions.end(); ++it)
56 56
 		returnList.append(it.key());
57 57
 	
58 58
 	return returnList;
59 59
 }
60 60
 
61
-Arts::Buffer *MCOPDCOPObject::callFunction(MCOPEntryInfo *entry, QCString ifaceName, const QByteArray &data)
61
+Arts::Buffer *MCOPDCOPObject::callFunction(MCOPEntryInfo *entry, TQCString ifaceName, const TQByteArray &data)
62 62
 {
63 63
 	Arts::Object workingObject = Arts::SubClass(string(ifaceName));
64 64
 	Arts::DynamicRequest request(workingObject);
@@ -71,11 +71,11 @@ Arts::Buffer *MCOPDCOPObject::callFunction(MCOPEntryInfo *entry, QCString ifaceN
71 71
 		QCStringList::iterator it;
72 72
 		for(it = list.begin(); it != list.end(); ++it)
73 73
 		{
74
-			QCString param = *it;
74
+			TQCString param = *it;
75 75
 
76 76
 			kdDebug() << "PARAM: " << param << endl;
77 77
 			
78
-			QDataStream argStream(data, IO_ReadOnly);
78
+			TQDataStream argStream(data, IO_ReadOnly);
79 79
 
80 80
 			if(param == "long")
81 81
 				request.param(MCOPDCOPTools::getLong(argStream));
@@ -94,16 +94,16 @@ Arts::Buffer *MCOPDCOPObject::callFunction(MCOPEntryInfo *entry, QCString ifaceN
94 94
 	return newBuffer;
95 95
 }
96 96
 
97
-bool MCOPDCOPObject::processDynamic(const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData)
97
+bool MCOPDCOPObject::processDynamic(const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData)
98 98
 {
99
-	QMap<QCString, MCOPEntryInfo *>::iterator it;
99
+	TQMap<TQCString, MCOPEntryInfo *>::iterator it;
100 100
 	for(it = d->dynamicFunctions.begin(); it != d->dynamicFunctions.end(); ++it)
101 101
 	{
102 102
 		MCOPEntryInfo *entry = it.data();
103 103
 
104 104
 		if((entry->functionName() + entry->signature()) == fun)
105 105
 		{
106
-			QCString type = entry->functionType();
106
+			TQCString type = entry->functionType();
107 107
 
108 108
 			if(type == "void")
109 109
 			{
@@ -116,9 +116,9 @@ bool MCOPDCOPObject::processDynamic(const QCString &fun, const QByteArray &data,
116 116
 			}
117 117
 			else if(type == "string")
118 118
 			{
119
-				replyType = "QCString";
119
+				replyType = "TQCString";
120 120
 				
121
-				QDataStream reply(replyData, IO_WriteOnly);
121
+				TQDataStream reply(replyData, IO_WriteOnly);
122 122
 				reply << "fooo!";
123 123
 			}
124 124
 			else if(type == "long")
@@ -135,7 +135,7 @@ bool MCOPDCOPObject::processDynamic(const QCString &fun, const QByteArray &data,
135 135
 					delete result;
136 136
 				}
137 137
 				
138
-				QDataStream reply(replyData, IO_WriteOnly);
138
+				TQDataStream reply(replyData, IO_WriteOnly);
139 139
 				reply << returnCode;
140 140
 			}
141 141
 			
@@ -146,7 +146,7 @@ bool MCOPDCOPObject::processDynamic(const QCString &fun, const QByteArray &data,
146 146
 	return false;
147 147
 }
148 148
 
149
-void MCOPDCOPObject::addDynamicFunction(QCString value, MCOPEntryInfo *entry)
149
+void MCOPDCOPObject::addDynamicFunction(TQCString value, MCOPEntryInfo *entry)
150 150
 {
151 151
 	d->dynamicFunctions.insert(value, entry);
152 152
 }

+ 14
- 14
arts/kde/mcop-dcop/mcopdcopobject.h View File

@@ -22,10 +22,10 @@
22 22
 
23 23
 #include <dcopobject.h>
24 24
 
25
-#include <qvaluelist.h>
26
-#include <qcstring.h>
25
+#include <tqvaluelist.h>
26
+#include <tqcstring.h>
27 27
 
28
-typedef QValueList<QCString> QCStringList;
28
+typedef TQValueList<TQCString> QCStringList;
29 29
 
30 30
 class MCOPDCOPObjectPrivate;
31 31
 
@@ -38,47 +38,47 @@ public:
38 38
 	~MCOPEntryInfo()
39 39
 	{ }
40 40
 
41
-	QCString functionType()
41
+	TQCString functionType()
42 42
 	{ return m_functionType; }
43 43
 	
44
-	QCString functionName()
44
+	TQCString functionName()
45 45
 	{ return m_functionName; }
46 46
 
47
-	QCString signature()
47
+	TQCString signature()
48 48
 	{ return m_signature; }
49 49
 	
50 50
 	QCStringList signatureList()
51 51
 	{ return m_signatureList; }
52 52
 	
53
-	void setFunctionType(QCString s)
53
+	void setFunctionType(TQCString s)
54 54
 	{ m_functionType = s; }
55 55
 
56
-	void setFunctionName(QCString s)
56
+	void setFunctionName(TQCString s)
57 57
 	{ m_functionName = s; }
58 58
 
59
-	void setSignature(QCString s)
59
+	void setSignature(TQCString s)
60 60
 	{ m_signature = s; }
61 61
 
62 62
 	void setSignatureList(QCStringList s)
63 63
 	{ m_signatureList = s; }
64 64
 
65 65
 private:
66
-	QCString m_functionType, m_functionName, m_signature;
66
+	TQCString m_functionType, m_functionName, m_signature;
67 67
 	QCStringList m_signatureList;
68 68
 };
69 69
 
70 70
 class MCOPDCOPObject : public DCOPObject
71 71
 {
72 72
 public:
73
-	MCOPDCOPObject(QCString name);
73
+	MCOPDCOPObject(TQCString name);
74 74
 	~MCOPDCOPObject();
75 75
 
76
-	virtual bool processDynamic(const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData);
76
+	virtual bool processDynamic(const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData);
77 77
 	virtual QCStringList functionsDynamic();
78 78
 
79
-	void addDynamicFunction(QCString value, MCOPEntryInfo *entry);
79
+	void addDynamicFunction(TQCString value, MCOPEntryInfo *entry);
80 80
 
81
-	Arts::Buffer *callFunction(MCOPEntryInfo *entry, QCString ifaceName, const QByteArray &data);
81
+	Arts::Buffer *callFunction(MCOPEntryInfo *entry, TQCString ifaceName, const TQByteArray &data);
82 82
 	
83 83
 private:
84 84
     MCOPDCOPObjectPrivate *d;

+ 4
- 4
arts/kde/mcop-dcop/mcopdcoptools.h View File

@@ -22,12 +22,12 @@
22 22
 
23 23
 #include <string>
24 24
 
25
-#include <qdatastream.h>
25
+#include <tqdatastream.h>
26 26
 
27 27
 class MCOPDCOPTools
28 28
 {
29 29
 public:
30
-	static long getLong(QDataStream &stream)
30
+	static long getLong(TQDataStream &stream)
31 31
 	{
32 32
 		long l;
33 33
 		stream << l;
@@ -35,9 +35,9 @@ public:
35 35
 		return l;
36 36
 	}
37 37
 
38
-	static std::string getString(QDataStream &stream)
38
+	static std::string getString(TQDataStream &stream)
39 39
 	{
40
-		QCString s;
40
+		TQCString s;
41 41
 		stream << s;
42 42
 
43 43
 		return std::string(s);