Replace Q_OBJECT with TQ_OBJECT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8eb500c4e81229a9853e2f9bac4f39450083f3d7)

10 files changed, 15 insertions, 21 deletions

diff --git a/dcop/HOWTO b/dcop/HOWTO
index dedcf97dd..0fa520e1e 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -387,7 +387,7 @@ Example:
 
 class MyClass: public QObject, virtual public MyInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     MyClass(); 
@@ -431,7 +431,7 @@ just as well have defined a k_dcop section directly within MyClass:
 
 class MyClass: public QObject, virtual public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 62fd3cf44..266f2d9fe 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -291,7 +291,7 @@ Example:
 \code
 class MyClass: public QObject, virtual public MyInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     MyClass();
@@ -340,7 +340,7 @@ just as well have defined a k_dcop section directly within MyClass:
 \code
 class MyClass: public QObject, virtual public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h
index 461c53cba..a0ee25f19 100644
--- a/dcop/dcop_deadlock_test.h
+++ b/dcop/dcop_deadlock_test.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class MyDCOPObject : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyDCOPObject(const TQCString &name, const TQCString &remoteName);
   bool process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 4cb4b2f6e..7035e3c72 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -67,7 +67,7 @@ typedef TQValueList<TQCString> QCStringList;
  */
 class DCOP_EXPORT DCOPClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index 302da3e14..710cbc3f4 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -235,7 +235,6 @@ FALSE			return T_FALSE;
 "k_dcop_signals"		return T_DCOP_SIGNAL_AREA;
 typedef			return T_TYPEDEF;
 K_DCOP			return T_DCOP;
-Q_OBJECT		;
 TQ_OBJECT		;
 ("0"|"0L")		return T_NULL;
 "extern "[A-Za-z0-9_ \t*]+	return T_EXTERN;
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index 66f18f92f..1d6d95a36 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -10,7 +10,7 @@
 
 class TDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    DefaultTest();
@@ -70,7 +70,7 @@ public:
 
 class NonHashingTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    NonHashingTest();
@@ -80,7 +80,7 @@ k_dcop:
 
 class HashingTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    HashingTest();
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 38b38a013..312a62eb1 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -113,7 +113,6 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
     Q_WS_QWS => 'undef',
     Q_WS_MAC => 'undef',
-    Q_OBJECT => <<'CODE',
     TQ_OBJECT => <<'CODE',
 public:
     virtual QMetaObject *metaObject() const;
@@ -373,7 +372,7 @@ sub readSourceLine
 =head2 readCxxLine
 
 	Reads a C++ source line, skipping comments, blank lines,
-	preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros
+	preprocessor tokens and the TQ_OBJECT macros
 
 =cut
 
@@ -401,10 +400,6 @@ LOOP:
 			}
 		}
 
-		if ( $p =~ /^\s*Q_OBJECT/ ) {
-			push @inputqueue, @codeqobject;
-			next;
-		}
 		if ( $p =~ /^\s*TQ_OBJECT/ ) {
 			push @inputqueue, @codeqobject;
 			next;
@@ -423,7 +418,7 @@ LOOP:
 		}
 
 		next if ( $p =~ /^\s*$/s ); 		# blank lines
-#			|| $p =~ /^\s*Q_OBJECT/		# QObject macro
+#			|| $p =~ /^\s*TQ_OBJECT/		# QObject macro
 #			);
 #
 
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index f0f5d1137..77c88f62e 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -116,7 +116,7 @@ public:
  */
 class DCOPServer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DCOPServer(bool _suicide);
     ~DCOPServer();
diff --git a/dcop/testdcop.h b/dcop/testdcop.h
index 3cb81372f..c3288bce9 100644
--- a/dcop/testdcop.h
+++ b/dcop/testdcop.h
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class TestObject : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TestObject(const TQCString &app);
 
@@ -58,7 +58,7 @@ private:
 
 class MyDCOPObject : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyDCOPObject(const TQCString &name) : DCOPObject(name) {}
   bool process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/tests/driver.h b/dcop/tests/driver.h
index 3565d88ab..654707c4f 100644
--- a/dcop/tests/driver.h
+++ b/dcop/tests/driver.h
@@ -7,7 +7,7 @@
 
 class Driver : public TQObject, public Test_stub
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		Driver(const char*);