Fix kmrml build for 14.1.xr14.1.1

Signed-off-by: Ray-V <[email protected]>

16 files changed, 22 insertions, 22 deletions

diff --git a/kmrml/kmrml/algorithmcombo.h b/kmrml/kmrml/algorithmcombo.h
index 0868708f..9cb60818 100644
--- a/kmrml/kmrml/algorithmcombo.h
+++ b/kmrml/kmrml/algorithmcombo.h
@@ -28,7 +28,7 @@ namespace KMrml
 
     class AlgorithmCombo : public KComboBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/algorithmdialog.h b/kmrml/kmrml/algorithmdialog.h
index 72f08e7d..5c80b1f4 100644
--- a/kmrml/kmrml/algorithmdialog.h
+++ b/kmrml/kmrml/algorithmdialog.h
@@ -31,7 +31,7 @@ namespace KMrml
 
     class AlgorithmDialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/browser.h b/kmrml/kmrml/browser.h
index d19d1543..a6bb2991 100644
--- a/kmrml/kmrml/browser.h
+++ b/kmrml/kmrml/browser.h
@@ -27,7 +27,7 @@ namespace KMrml
 
     class Browser : public KParts::BrowserExtension
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/collectioncombo.h b/kmrml/kmrml/collectioncombo.h
index e0125ae4..4d67e0e3 100644
--- a/kmrml/kmrml/collectioncombo.h
+++ b/kmrml/kmrml/collectioncombo.h
@@ -28,7 +28,7 @@ namespace KMrml
 
     class CollectionCombo : public KComboBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h
index 05396870..6a3e5987 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.h
+++ b/kmrml/kmrml/kcontrol/indexcleaner.h
@@ -22,7 +22,7 @@ namespace KMrmlConfig
 {
     class IndexCleaner : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h
index 72755081..25b96126 100644
--- a/kmrml/kmrml/kcontrol/indexer.h
+++ b/kmrml/kmrml/kcontrol/indexer.h
@@ -30,7 +30,7 @@ namespace KMrmlConfig
 {
     class Indexer : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/kcontrol/indextest.h b/kmrml/kmrml/kcontrol/indextest.h
index 1071cdbd..22e8e274 100644
--- a/kmrml/kmrml/kcontrol/indextest.h
+++ b/kmrml/kmrml/kcontrol/indextest.h
@@ -10,7 +10,7 @@
 
 class IndexTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h
index 02778d0a..85f302e1 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.h
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.h
@@ -30,7 +30,7 @@ namespace KMrmlConfig
 
     class KCMKMrml : public TDECModule
     {
-        Q_OBJECT
+        TQ_OBJECT
   
     
     public:
diff --git a/kmrml/kmrml/kcontrol/mainpage.h b/kmrml/kmrml/kcontrol/mainpage.h
index 3b79da6d..ca60d278 100644
--- a/kmrml/kmrml/kcontrol/mainpage.h
+++ b/kmrml/kmrml/kcontrol/mainpage.h
@@ -45,7 +45,7 @@ namespace KMrmlConfig
 
     class MainPage : public TQVBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/kmrml/kmrml/lib/watcher_stub.cpp b/kmrml/kmrml/lib/watcher_stub.cpp
index d10dcbc7..ca9ca7b2 100644
--- a/kmrml/kmrml/lib/watcher_stub.cpp
+++ b/kmrml/kmrml/lib/watcher_stub.cpp
@@ -78,7 +78,7 @@ TQStringList Watcher_stub::runningDaemons()
     TQByteArray data, replyData;
     TQCString replyType;
     if ( dcopClient()->call( app(), obj(), "runningDaemons()", data, replyType, replyData ) ) {
-	if ( replyType == TQSTRINGLIST_OBJECT_NAME_STRING ) {
+	if ( replyType == "TQStringList" ) {
 	    TQDataStream _reply_stream( replyData, IO_ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
diff --git a/kmrml/kmrml/loader.h b/kmrml/kmrml/loader.h
index 4c8b8b21..2d6479a7 100644
--- a/kmrml/kmrml/loader.h
+++ b/kmrml/kmrml/loader.h
@@ -42,7 +42,7 @@ public:
 class Loader : public TQObject
 {
     friend class gcc_sucks;
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 822ca042..d5aa1114 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -53,7 +53,7 @@ class MrmlView;
 
 class MrmlPart : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -150,7 +150,7 @@ private:
 
 class PartFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h
index dde6a0e6..d6c85ddd 100644
--- a/kmrml/kmrml/mrml_view.h
+++ b/kmrml/kmrml/mrml_view.h
@@ -51,7 +51,7 @@ class MrmlView : public TQScrollView
 {
     friend class MrmlViewItem;
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -103,7 +103,7 @@ private:
 
 class MrmlViewItem : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmrml/kmrml/propertywidgets.h b/kmrml/kmrml/propertywidgets.h
index bfb207a0..fd7f8afc 100644
--- a/kmrml/kmrml/propertywidgets.h
+++ b/kmrml/kmrml/propertywidgets.h
@@ -27,7 +27,7 @@ namespace KMrml
 {
     class IntegerWidget : public TQHBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         
     public:
@@ -43,7 +43,7 @@ namespace KMrml
     
     class ComboWidget : public TQHBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         
     public:
@@ -59,7 +59,7 @@ namespace KMrml
     
     class CheckBoxWidget : public TQHBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         
     public:
@@ -77,7 +77,7 @@ namespace KMrml
     
     class LineEditWidget : public TQHBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         
     public:
@@ -93,7 +93,7 @@ namespace KMrml
     
     class ListBoxWidget : public TQHBox
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         
     public:
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 67f0c69a..38f88e83 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -188,7 +188,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
 
 void Watcher::slotTimeout()
 {
-    TQTimer *timer = static_cast<TQTimer*>( TQT_TQOBJECT( const_cast<TQT_BASE_OBJECT_NAME*>(sender()) ) );
+    TQTimer *timer = const_cast<TQTimer *>(static_cast<const TQTimer *>(sender()));
     DaemonData *daemon = findDaemonFromTimer( timer );
     if ( daemon )
     {
diff --git a/kmrml/kmrml/server/watcher.h b/kmrml/kmrml/server/watcher.h
index e9cc0656..a08208a8 100644
--- a/kmrml/kmrml/server/watcher.h
+++ b/kmrml/kmrml/server/watcher.h
@@ -60,7 +60,7 @@ namespace KMrml
 
     class Watcher : public KDEDModule
     {
-        Q_OBJECT
+        TQ_OBJECT
 //        
         K_DCOP