Replace Q_OBJECT with TQ_OBJECT

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

154 files changed, 157 insertions, 157 deletions

diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h
index c5074255..48aaf6cd 100644
--- a/umbrello/umbrello/activitywidget.h
+++ b/umbrello/umbrello/activitywidget.h
@@ -32,7 +32,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ActivityWidget : public UMLWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/actor.h b/umbrello/umbrello/actor.h
index f3e8b5b2..b78e3a82 100644
--- a/umbrello/umbrello/actor.h
+++ b/umbrello/umbrello/actor.h
@@ -26,7 +26,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLActor : public UMLCanvasObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 14ce464d..df8e75ff 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -29,7 +29,7 @@ class UMLWidget;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class AlignToolBar : public TDEToolBar {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/artifact.h b/umbrello/umbrello/artifact.h
index 04a90fae..c84d9990 100644
--- a/umbrello/umbrello/artifact.h
+++ b/umbrello/umbrello/artifact.h
@@ -27,7 +27,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLArtifact : public UMLCanvasObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/association.h b/umbrello/umbrello/association.h
index a97628d3..a933d0ef 100644
--- a/umbrello/umbrello/association.h
+++ b/umbrello/umbrello/association.h
@@ -30,7 +30,7 @@ class UMLRole;
  */
 
 class UMLAssociation : public UMLObject {
-    Q_OBJECT
+    TQ_OBJECT
   
     friend class AssociationWidget;
 public:
diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h
index ab63ebd3..6b89bee3 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -53,7 +53,7 @@ class UMLOperation;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class AssociationWidget : public WidgetBase, public LinkWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/attribute.h b/umbrello/umbrello/attribute.h
index 32ce99ba..2f5e43fa 100644
--- a/umbrello/umbrello/attribute.h
+++ b/umbrello/umbrello/attribute.h
@@ -26,7 +26,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLAttribute : public UMLClassifierListItem {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index 6b4eea53..17d61161 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -20,7 +20,7 @@
 
 class AutolayoutDlg : public MyDialog1
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     AutolayoutDlg(TDEConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
diff --git a/umbrello/umbrello/classifier.h b/umbrello/umbrello/classifier.h
index 55fc1d2e..d6ab339f 100644
--- a/umbrello/umbrello/classifier.h
+++ b/umbrello/umbrello/classifier.h
@@ -36,7 +36,7 @@ class IDChangeLog;
  */
 
 class UMLClassifier : public UMLPackage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h
index 5e9085dc..5cae1ec6 100644
--- a/umbrello/umbrello/classifiercodedocument.h
+++ b/umbrello/umbrello/classifiercodedocument.h
@@ -41,7 +41,7 @@ class UMLRole;
 class ClassifierCodeDocument : public CodeDocument
 {
     friend class HierarchicalCodeBlock;
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/classifierlistitem.h b/umbrello/umbrello/classifierlistitem.h
index 4dd0ef20..2075e3ab 100644
--- a/umbrello/umbrello/classifierlistitem.h
+++ b/umbrello/umbrello/classifierlistitem.h
@@ -29,7 +29,7 @@ class UMLClassifier;
  */
 
 class UMLClassifierListItem : public UMLObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index 27dc1d3c..361a9f68 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -32,7 +32,7 @@ class TQMimeSource;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLClipboard : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index 35aa2caf..1d96b404 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -36,7 +36,7 @@ class UMLDragPrivate;
 class UMLClassifier;
 
 class TQ_EXPORT UMLDrag : public TQDragObject  {
-    Q_OBJECT
+    TQ_OBJECT
   
     UMLDragPrivate* data;
 public:
diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h
index b10112ab..e4afd810 100644
--- a/umbrello/umbrello/codeaccessormethod.h
+++ b/umbrello/umbrello/codeaccessormethod.h
@@ -26,7 +26,7 @@ class CodeClassField;
 class CodeAccessorMethod : public CodeMethodBlock
 {
     friend class CodeClassField;
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codeblock.h b/umbrello/umbrello/codeblock.h
index dd5ca11e..0cf94ec2 100644
--- a/umbrello/umbrello/codeblock.h
+++ b/umbrello/umbrello/codeblock.h
@@ -32,7 +32,7 @@ class HierarchicalCodeBlock;
 
 class CodeBlock : public TextBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codeblockwithcomments.h b/umbrello/umbrello/codeblockwithcomments.h
index 9ca60e8a..b692e859 100644
--- a/umbrello/umbrello/codeblockwithcomments.h
+++ b/umbrello/umbrello/codeblockwithcomments.h
@@ -31,7 +31,7 @@ class HierarchicalCodeBlock;
 
 class CodeBlockWithComments : public CodeBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h
index ffc4ca35..12f543e2 100644
--- a/umbrello/umbrello/codeclassfield.h
+++ b/umbrello/umbrello/codeclassfield.h
@@ -39,7 +39,7 @@ class UMLRole;
 
 class CodeClassField : public CodeParameter
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h
index 74861948..a7c18660 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.h
@@ -34,7 +34,7 @@ class CodeClassField;
 class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public OwnedCodeBlock
 {
     friend class CodeClassField;
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codecomment.h b/umbrello/umbrello/codecomment.h
index 98f38582..045831e6 100644
--- a/umbrello/umbrello/codecomment.h
+++ b/umbrello/umbrello/codecomment.h
@@ -30,7 +30,7 @@
 
 class CodeComment : public TextBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codedocument.h b/umbrello/umbrello/codedocument.h
index ce27ec40..9761df6c 100644
--- a/umbrello/umbrello/codedocument.h
+++ b/umbrello/umbrello/codedocument.h
@@ -45,7 +45,7 @@ class UMLPackage;
 class CodeDocument : public TQObject, public CodeGenObjectWithTextBlocks
 {
     friend class HierarchicalCodeBlock;
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h
index 3d065dee..e27a6519 100644
--- a/umbrello/umbrello/codegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerationpolicy.h
@@ -33,7 +33,7 @@ class CodeGenerationPolicyPage;
   */
 
 class CodeGenerationPolicy : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h
index 64a39158..93b0bafa 100644
--- a/umbrello/umbrello/codegenerator.h
+++ b/umbrello/umbrello/codegenerator.h
@@ -80,7 +80,7 @@ class TDEConfig;
 
 
 class CodeGenerator : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/codegenerators/adawriter.h b/umbrello/umbrello/codegenerators/adawriter.h
index 46e14694..17affb45 100644
--- a/umbrello/umbrello/codegenerators/adawriter.h
+++ b/umbrello/umbrello/codegenerators/adawriter.h
@@ -31,7 +31,7 @@ class UMLOperation;
   * that concept
   */
 class AdaWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/aswriter.h b/umbrello/umbrello/codegenerators/aswriter.h
index 6c21d63d..253de1a0 100644
--- a/umbrello/umbrello/codegenerators/aswriter.h
+++ b/umbrello/umbrello/codegenerators/aswriter.h
@@ -27,7 +27,7 @@
   * Just call writeClass and feed it a UMLClassifier;
   */
 class ASWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
index 3caa656c..4ff4ab0f 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
@@ -27,7 +27,7 @@ class ClassifierCodeDocument;
 
 class CPPCodeClassField : public CodeClassField
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.h b/umbrello/umbrello/codegenerators/cppcodecomment.h
index 0b7c7d7f..f98b8815 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.h
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.h
@@ -30,7 +30,7 @@
 
 class CPPCodeComment : virtual public CodeComment
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
index 4e3b04b2..ee7c7031 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
@@ -24,7 +24,7 @@ class TQCheckListItem;
  */
 
 class CPPCodeGenerationForm : public CPPCodeGenerationFormBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index b2742ae0..baf1aa23 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -26,7 +26,7 @@ class CodeGenerationPolicyPage;
 
 class CPPCodeGenerationPolicy : public CodeGenPolicyExt
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
index 4b10dc04..de44b1f7 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
@@ -27,7 +27,7 @@
  */
 
 class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index a6687249..6742957f 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -32,7 +32,7 @@ class TDEConfig;
 
 class CPPCodeGenerator : public CodeGenerator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index e3f91dae..dd637261 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -24,7 +24,7 @@
 
 class CPPHeaderClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
index 865b0175..c202b94f 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
@@ -24,7 +24,7 @@ class CodeClassField;
 
 class CPPHeaderCodeAccessorMethod : public CodeAccessorMethod
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
index 10565854..0fbe3177 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
@@ -22,7 +22,7 @@
 
 class CPPHeaderCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.h b/umbrello/umbrello/codegenerators/cppheadercodedocument.h
index e3578c82..a77d8e08 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.h
@@ -33,7 +33,7 @@ class CPPHeaderClassDeclarationBlock;
 
 class CPPHeaderCodeDocument : public ClassifierCodeDocument
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
index bf435180..af4e13fe 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
@@ -25,7 +25,7 @@ class CPPHeaderCodeDocument;
 
 class CPPHeaderCodeOperation : virtual public CodeOperation
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.h b/umbrello/umbrello/codegenerators/cppmakecodedocument.h
index 78e4c03e..6cb40a71 100644
--- a/umbrello/umbrello/codegenerators/cppmakecodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.h
@@ -29,7 +29,7 @@
 
 class CPPMakefileCodeDocument : public CodeDocument
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
index 6e832b2c..d4e6eb02 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
@@ -24,7 +24,7 @@ class CodeClassField;
 
 class CPPSourceCodeAccessorMethod : public CodeAccessorMethod
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
index 0bb2e3e6..fcb30e94 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
@@ -22,7 +22,7 @@
 
 class CPPSourceCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
index 5b03cb7f..0e88bcbd 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
@@ -30,7 +30,7 @@
 
 class CPPSourceCodeDocument : public ClassifierCodeDocument
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
index 7748d198..6c9d1b43 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
@@ -25,7 +25,7 @@ class CPPSourceCodeDocument;
 
 class CPPSourceCodeOperation : virtual public CodeOperation
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h
index 728c29af..7e054d7f 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.h
+++ b/umbrello/umbrello/codegenerators/csharpwriter.h
@@ -30,7 +30,7 @@
   */
 class CSharpWriter : public SimpleCodeGenerator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     CSharpWriter();
diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.h b/umbrello/umbrello/codegenerators/javaantcodedocument.h
index d11211ec..4b220077 100644
--- a/umbrello/umbrello/codegenerators/javaantcodedocument.h
+++ b/umbrello/umbrello/codegenerators/javaantcodedocument.h
@@ -31,7 +31,7 @@
 
 class JavaANTCodeDocument : public CodeDocument
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index eaaf982a..088ccbf5 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -24,7 +24,7 @@
 
 class JavaClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
index e12169c9..fda91ac7 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
@@ -39,7 +39,7 @@ class JavaCodeGenerationPolicy;
 
 class JavaClassifierCodeDocument : public ClassifierCodeDocument
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
index 5c1751a9..0512c9d8 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
@@ -24,7 +24,7 @@ class CodeClassField;
 
 class JavaCodeAccessorMethod : public CodeAccessorMethod
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h
index e2e02c32..bf9fe0ab 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h
@@ -26,7 +26,7 @@ class ClassifierCodeDocument;
 
 class JavaCodeClassField : public CodeClassField
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
index b0f84663..6b0d306f 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
@@ -22,7 +22,7 @@
 
 class JavaCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodecomment.h b/umbrello/umbrello/codegenerators/javacodecomment.h
index d0a571d2..23336658 100644
--- a/umbrello/umbrello/codegenerators/javacodecomment.h
+++ b/umbrello/umbrello/codegenerators/javacodecomment.h
@@ -30,7 +30,7 @@
 
 class JavaCodeComment : virtual public CodeComment
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.h b/umbrello/umbrello/codegenerators/javacodedocumentation.h
index 7806885c..a3a3dcf3 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.h
@@ -32,7 +32,7 @@ class JavaClassifierCodeDocument;
 
 class JavaCodeDocumentation : virtual public CodeComment
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index 89e6b294..53ede10d 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -26,7 +26,7 @@ class CodeGenerationPolicyPage;
 
 class JavaCodeGenerationPolicy : public CodeGenPolicyExt
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
index b8e0639b..bedb02bc 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
@@ -27,7 +27,7 @@
  */
 
 class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h
index c1a56701..e22e70ba 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.h
@@ -35,7 +35,7 @@ class CodeViewerDialog;
 
 class JavaCodeGenerator : public CodeGenerator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.h b/umbrello/umbrello/codegenerators/javacodeoperation.h
index c33bc805..5dde5f05 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.h
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.h
@@ -25,7 +25,7 @@ class JavaClassifierCodeDocument;
 
 class JavaCodeOperation : virtual public CodeOperation
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/jswriter.h b/umbrello/umbrello/codegenerators/jswriter.h
index 40f05339..3b6e50fb 100644
--- a/umbrello/umbrello/codegenerators/jswriter.h
+++ b/umbrello/umbrello/codegenerators/jswriter.h
@@ -27,7 +27,7 @@
   * Just call writeClass and feed it a UMLClassifier;
   */
 class JSWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.h b/umbrello/umbrello/codegenerators/pascalwriter.h
index 8c1dd67c..c2e52f10 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.h
+++ b/umbrello/umbrello/codegenerators/pascalwriter.h
@@ -23,7 +23,7 @@ class UMLOperation;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class PascalWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/perlwriter.h b/umbrello/umbrello/codegenerators/perlwriter.h
index dd8ad677..5452cb00 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.h
+++ b/umbrello/umbrello/codegenerators/perlwriter.h
@@ -31,7 +31,7 @@ class UMLClassifier;
   * Just call writeClass and feed it a UMLClassifier;
   */
 class PerlWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/php5writer.h b/umbrello/umbrello/codegenerators/php5writer.h
index 26921966..64bff7a6 100644
--- a/umbrello/umbrello/codegenerators/php5writer.h
+++ b/umbrello/umbrello/codegenerators/php5writer.h
@@ -29,7 +29,7 @@
   * Just call writeClass and feed it a UMLClassifier;
   */
 class Php5Writer : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/phpwriter.h b/umbrello/umbrello/codegenerators/phpwriter.h
index c888e198..1d0680ed 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.h
+++ b/umbrello/umbrello/codegenerators/phpwriter.h
@@ -27,7 +27,7 @@
   * Just call writeClass and feed it a UMLClassifier;
   */
 class PhpWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.h b/umbrello/umbrello/codegenerators/pythonwriter.h
index a4622029..9b346b9a 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.h
+++ b/umbrello/umbrello/codegenerators/pythonwriter.h
@@ -30,7 +30,7 @@ enum Access {PRIVATE, PUBLIC, PROTECTED};
   * Just call writeClass and feed it a UMLClassifier;
   */
 class PythonWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index 9c680858..67e2acc4 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -32,7 +32,7 @@
 
 class RubyClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
index 0861cd5d..f4dae048 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
@@ -41,7 +41,7 @@ class RubyCodeGenerationPolicy;
 
 class RubyClassifierCodeDocument : public ClassifierCodeDocument
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
index 09459247..a8b35ded 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
@@ -30,7 +30,7 @@
 
 class RubyCodeAccessorMethod : public CodeAccessorMethod
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
index 6370bdbd..9fffd7c6 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
@@ -28,7 +28,7 @@ class ClassifierCodeDocument;
 
 class RubyCodeClassField : public CodeClassField
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
index a46c4184..aeae3667 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
@@ -26,7 +26,7 @@
 
 class RubyCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.h b/umbrello/umbrello/codegenerators/rubycodecomment.h
index 09b54fce..599e4ff3 100644
--- a/umbrello/umbrello/codegenerators/rubycodecomment.h
+++ b/umbrello/umbrello/codegenerators/rubycodecomment.h
@@ -33,7 +33,7 @@
 
 class RubyCodeComment : virtual public CodeComment
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.h b/umbrello/umbrello/codegenerators/rubycodedocumentation.h
index 33f8f1f5..e43cd856 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.h
@@ -34,7 +34,7 @@ class RubyClassifierCodeDocument;
 
 class RubyCodeDocumentation : virtual public CodeComment
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index f9f35894..464554f1 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -29,7 +29,7 @@ class CodeGenerationPolicyPage;
 
 class RubyCodeGenerationPolicy : public CodeGenPolicyExt
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
index 1ccb7650..5ab41744 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
@@ -30,7 +30,7 @@
  */
 
 class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h
index 37393af1..31d9cf21 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h
@@ -35,7 +35,7 @@ class CodeViewerDialog;
 
 class RubyCodeGenerator : public CodeGenerator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.h b/umbrello/umbrello/codegenerators/rubycodeoperation.h
index a79f0dff..7d3c24af 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.h
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.h
@@ -27,7 +27,7 @@ class RubyClassifierCodeDocument;
 
 class RubyCodeOperation : virtual public CodeOperation
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/rubywriter.h b/umbrello/umbrello/codegenerators/rubywriter.h
index 37e657a4..c615c365 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.h
+++ b/umbrello/umbrello/codegenerators/rubywriter.h
@@ -32,7 +32,7 @@ class ClassifierInfo;
   * Just call writeClass and feed it a UMLClassifier;
   */
 class RubyWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h
index 9a5d53a1..55214d1f 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.h
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h
@@ -34,7 +34,7 @@ class UMLDoc;
   */
 class SimpleCodeGenerator : public CodeGenerator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.h b/umbrello/umbrello/codegenerators/sqlwriter.h
index 26032f42..fef135a8 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.h
+++ b/umbrello/umbrello/codegenerators/sqlwriter.h
@@ -28,7 +28,7 @@
   * that concept
   */
 class SQLWriter : public SimpleCodeGenerator {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
 
diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.h b/umbrello/umbrello/codegenerators/xmlcodecomment.h
index fe3fb58b..0059880c 100644
--- a/umbrello/umbrello/codegenerators/xmlcodecomment.h
+++ b/umbrello/umbrello/codegenerators/xmlcodecomment.h
@@ -30,7 +30,7 @@ class CodeDocument;
 
 class XMLCodeComment: virtual public CodeComment
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index a3cadc39..fe385e03 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -27,7 +27,7 @@ class UMLAttribute;
 
 class XMLElementCodeBlock : public HierarchicalCodeBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h
index 18c668e5..d1222997 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.h
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h
@@ -37,7 +37,7 @@
 
 class XMLSchemaWriter : public SimpleCodeGenerator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h
index 0dae9519..1367361b 100644
--- a/umbrello/umbrello/codemethodblock.h
+++ b/umbrello/umbrello/codemethodblock.h
@@ -34,7 +34,7 @@ class ClassifierCodeDocument;
 class CodeMethodBlock : public CodeBlockWithComments, public OwnedCodeBlock
 {
     friend class CodeGenObjectWithTextBlocks;
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h
index c34d0017..ddb1a8bb 100644
--- a/umbrello/umbrello/codeoperation.h
+++ b/umbrello/umbrello/codeoperation.h
@@ -26,7 +26,7 @@
 
 class CodeOperation : public CodeMethodBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h
index 2c084524..61b6e46f 100644
--- a/umbrello/umbrello/codeparameter.h
+++ b/umbrello/umbrello/codeparameter.h
@@ -33,7 +33,7 @@ class UMLObject;
 
 class CodeParameter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/component.h b/umbrello/umbrello/component.h
index f9efecce..13e00226 100644
--- a/umbrello/umbrello/component.h
+++ b/umbrello/umbrello/component.h
@@ -28,7 +28,7 @@
  */
 
 class UMLComponent : public UMLPackage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h
index cabc5ab2..9764d9cb 100644
--- a/umbrello/umbrello/dialogs/activitydialog.h
+++ b/umbrello/umbrello/dialogs/activitydialog.h
@@ -37,7 +37,7 @@ class ActivityWidget;
  */
 
 class ActivityDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/activitypage.h b/umbrello/umbrello/dialogs/activitypage.h
index b97d2d61..d6abd873 100644
--- a/umbrello/umbrello/dialogs/activitypage.h
+++ b/umbrello/umbrello/dialogs/activitypage.h
@@ -27,7 +27,7 @@ class ListPopupMenu;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ActivityPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h
index e532c57c..51f016c3 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.h
+++ b/umbrello/umbrello/dialogs/assocgenpage.h
@@ -41,7 +41,7 @@ class KComboBox;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class AssocGenPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h
index 13e12e2b..e9a224e4 100644
--- a/umbrello/umbrello/dialogs/assocpage.h
+++ b/umbrello/umbrello/dialogs/assocpage.h
@@ -39,7 +39,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class AssocPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 47338878..808a6b61 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -30,7 +30,7 @@ class UMLDoc;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class AssocPropDlg : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h
index 21752b63..19dd8dc9 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.h
+++ b/umbrello/umbrello/dialogs/assocrolepage.h
@@ -37,7 +37,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class AssocRolePage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h
index ccddadbe..2ac41e34 100644
--- a/umbrello/umbrello/dialogs/classgenpage.h
+++ b/umbrello/umbrello/dialogs/classgenpage.h
@@ -37,7 +37,7 @@ class UMLDoc;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ClassGenPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 0846dc7f..e1acef78 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -37,7 +37,7 @@ class UMLDoc;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ClassifierListPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index 54073a4f..5797b989 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -39,7 +39,7 @@ class UMLWidget;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ClassPropDlg : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index 7fa27eeb..7e974b50 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -42,7 +42,7 @@ class ParaInfo;
 
 class CodeEditor : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
index 745cb993..b2b4b1ed 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
@@ -38,7 +38,7 @@ class CodeGenerationPolicyPage;
 // structure.
 
 class CodeGenerationOptionsPage : public CodeGenerationOptionsBase  {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     CodeGenerationOptionsPage(TQWidget *parent=0);
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
index 171b80a2..2dfbdb2d 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
@@ -30,7 +30,7 @@ class CodeGenPolicyExt;
  */
 
 class CodeGenerationPolicyPage : public CodeGenerationPolicyBase  {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.h b/umbrello/umbrello/dialogs/codegenerationwizard.h
index 52a35bd9..853149d9 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.h
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.h
@@ -38,7 +38,7 @@ class CodeGenerationOptionsPage;
  */
 
 class CodeGenerationWizard : public CodeGenerationWizardBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     CodeGenerationWizard(UMLClassifierList *classList);
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index 308e2e4c..eda21843 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -41,7 +41,7 @@ class UMLObject;
   */
 class CodeViewerDialog : public CodeViewerDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h
index e0a9ee04..daef15c7 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.h
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h
@@ -27,7 +27,7 @@
  */
 
 class CodeViewerOptionsPage : public CodeViewerOptionsBase  {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0);
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
index 95458eac..f62e848f 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
@@ -23,7 +23,7 @@ class CodeGenePolicyExt;
 
 class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h
index 0729e71b..8a02c26c 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -35,7 +35,7 @@ class TQGroupBox;
  */
 
 class DiagramPrintPage : public KPrintDialogPage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h
index 5c4bcba9..44446ed0 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -27,7 +27,7 @@ class KFileFilterCombo;
  * Designer and uic don't recognize it.
  */
 class ExportAllViewsDialog : public ExportAllViewsDialogBase {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h
index b4112811..aafa7078 100644
--- a/umbrello/umbrello/dialogs/notedialog.h
+++ b/umbrello/umbrello/dialogs/notedialog.h
@@ -26,7 +26,7 @@ class TQTextEdit;
 
 class NoteDialog : public KDialogBase {
 
-   Q_OBJECT
+   TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h
index 78f512c0..109ee853 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.h
+++ b/umbrello/umbrello/dialogs/overwritedialogue.h
@@ -28,7 +28,7 @@ class TQCheckBox;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class OverwriteDialogue: public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 29233187..6cee66ff 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -36,7 +36,7 @@ class UMLDoc;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ParmPropDlg : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h
index 654310e5..3af87e93 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.h
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.h
@@ -26,7 +26,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class PkgContentsPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h
index e588159e..b2a77457 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.h
+++ b/umbrello/umbrello/dialogs/selectopdlg.h
@@ -38,7 +38,7 @@ class UMLView;
 
 class SelectOpDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index 59305270..73fd2371 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -42,7 +42,7 @@ class CodeGenerator;
 
 class SettingsDlg : public KDialogBase {
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h
index 2897899c..dfa22cbc 100644
--- a/umbrello/umbrello/dialogs/statedialog.h
+++ b/umbrello/umbrello/dialogs/statedialog.h
@@ -36,7 +36,7 @@ class TDEFontChooser;
  */
 
 class StateDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.h b/umbrello/umbrello/dialogs/umlattributedialog.h
index 68ea3f2e..1a9f2802 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.h
+++ b/umbrello/umbrello/dialogs/umlattributedialog.h
@@ -28,7 +28,7 @@ class KComboBox;
 class TQLineEdit;
 
 class UMLAttributeDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute );
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.h b/umbrello/umbrello/dialogs/umlentityattributedialog.h
index b7ce401b..c2804024 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.h
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.h
@@ -28,7 +28,7 @@ class KComboBox;
 class TQLineEdit;
 
 class UMLEntityAttributeDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     UMLEntityAttributeDialog( TQWidget* pParent, UMLEntityAttribute* pEntityAttribute );
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h
index f2b3f9e4..658ba776 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.h
+++ b/umbrello/umbrello/dialogs/umloperationdialog.h
@@ -36,7 +36,7 @@ class UMLDoc;
 class KArrowButton;
 
 class UMLOperationDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h
index 8f24e9ba..9b7a397f 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.h
+++ b/umbrello/umbrello/dialogs/umlroledialog.h
@@ -24,7 +24,7 @@ class UMLRole;
 class UMLRoleProperties;
 
 class UMLRoleDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h
index 1c93ce63..88b17f25 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.h
+++ b/umbrello/umbrello/dialogs/umlroleproperties.h
@@ -23,7 +23,7 @@
  * @author Brian Thomas <brian.thomas@gsfc.nasa.gov>
  */
 class UMLRoleProperties : public UMLRolePropertiesBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.h b/umbrello/umbrello/dialogs/umltemplatedialog.h
index 93d5aad3..1346d455 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.h
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.h
@@ -30,7 +30,7 @@ class UMLTemplate;
  */
 
 class UMLTemplateDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pAttribute);
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h
index 41713aec..79153006 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.h
+++ b/umbrello/umbrello/dialogs/umlviewdialog.h
@@ -36,7 +36,7 @@ class DiagramPropertiesPage;
 
 
 class UMLViewDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
index a3d4c5dd..31a5038d 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 class TQGroupBox;
 
 class UMLWidgetColorPage : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.h b/umbrello/umbrello/docgenerators/docbookgenerator.h
index 0dc873f3..b58d5fa7 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.h
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.h
@@ -40,7 +40,7 @@ namespace TDEIO
  */
 class DocbookGenerator : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.h b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
index a6b8e6a4..8b67de54 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.h
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
@@ -40,7 +40,7 @@ namespace TDEIO
  */
 class XhtmlGenerator : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 
diff --git a/umbrello/umbrello/docwindow.h b/umbrello/umbrello/docwindow.h
index 14f2d00b..fd3af5f2 100644
--- a/umbrello/umbrello/docwindow.h
+++ b/umbrello/umbrello/docwindow.h
@@ -28,7 +28,7 @@ class UMLWidget;
  */
 
 class DocWindow : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/entity.h b/umbrello/umbrello/entity.h
index 65f38d6b..08c659ae 100644
--- a/umbrello/umbrello/entity.h
+++ b/umbrello/umbrello/entity.h
@@ -27,7 +27,7 @@ class UMLEntityAttribute;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLEntity : public UMLClassifier {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/entityattribute.h b/umbrello/umbrello/entityattribute.h
index c72e01d6..7271e515 100644
--- a/umbrello/umbrello/entityattribute.h
+++ b/umbrello/umbrello/entityattribute.h
@@ -25,7 +25,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLEntityAttribute : public UMLAttribute {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/enum.h b/umbrello/umbrello/enum.h
index 3999bffc..b43e8de0 100644
--- a/umbrello/umbrello/enum.h
+++ b/umbrello/umbrello/enum.h
@@ -27,7 +27,7 @@ class UMLEnumLiteral;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLEnum : public UMLClassifier {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/floatingtextwidget.h b/umbrello/umbrello/floatingtextwidget.h
index 324000ae..9fac43c3 100644
--- a/umbrello/umbrello/floatingtextwidget.h
+++ b/umbrello/umbrello/floatingtextwidget.h
@@ -36,7 +36,7 @@ class FloatingTextWidgetController;
  */
 
 class FloatingTextWidget : public UMLWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     friend class FloatingTextWidgetController;
diff --git a/umbrello/umbrello/folder.h b/umbrello/umbrello/folder.h
index 5d4c074b..3f21adec 100644
--- a/umbrello/umbrello/folder.h
+++ b/umbrello/umbrello/folder.h
@@ -32,7 +32,7 @@
  */
 
 class UMLFolder : public UMLPackage {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/hierarchicalcodeblock.h b/umbrello/umbrello/hierarchicalcodeblock.h
index 89180f9a..20dc6aea 100644
--- a/umbrello/umbrello/hierarchicalcodeblock.h
+++ b/umbrello/umbrello/hierarchicalcodeblock.h
@@ -27,7 +27,7 @@
 
 class HierarchicalCodeBlock : public CodeBlockWithComments, public CodeGenObjectWithTextBlocks
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     friend class CodeGenObjectWithTextBlocks;
 public:
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 08c5a3ed..e77c1b4e 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -25,7 +25,7 @@
   */
 class KPlayerSlider : public TQSlider
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -104,7 +104,7 @@ protected:
   */
 class KPlayerPopupFrame : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -127,7 +127,7 @@ protected:
   */
 class KPlayerPopupSliderAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -168,7 +168,7 @@ protected:
   */
 class KPlayerSliderAction : public KWidgetAction
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/umbrello/umbrello/kstartuplogo.h b/umbrello/umbrello/kstartuplogo.h
index 99cb6d06..a617174d 100644
--- a/umbrello/umbrello/kstartuplogo.h
+++ b/umbrello/umbrello/kstartuplogo.h
@@ -25,7 +25,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class TDEStartupLogo : public TQWidget  {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     TDEStartupLogo(TQWidget *parent=0, const char *name=0);
diff --git a/umbrello/umbrello/linepath.h b/umbrello/umbrello/linepath.h
index eb7c73b9..c643d77e 100644
--- a/umbrello/umbrello/linepath.h
+++ b/umbrello/umbrello/linepath.h
@@ -43,7 +43,7 @@ typedef TQPtrListIterator<TQCanvasRectangle> RectListIt;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class LinePath : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index 6b493432..a49fc128 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -39,7 +39,7 @@ class MessageWidgetController;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class MessageWidget : public UMLWidget, public LinkWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     friend class MessageWidgetController;
diff --git a/umbrello/umbrello/node.h b/umbrello/umbrello/node.h
index 49c29f8e..99702df4 100644
--- a/umbrello/umbrello/node.h
+++ b/umbrello/umbrello/node.h
@@ -26,7 +26,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLNode : public UMLCanvasObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/notewidget.h b/umbrello/umbrello/notewidget.h
index 232810a1..49e652d1 100644
--- a/umbrello/umbrello/notewidget.h
+++ b/umbrello/umbrello/notewidget.h
@@ -33,7 +33,7 @@ class TQTextEdit;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class NoteWidget : public UMLWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     friend class NoteWidgetController;
diff --git a/umbrello/umbrello/objectwidget.h b/umbrello/umbrello/objectwidget.h
index 2136f767..892093a7 100644
--- a/umbrello/umbrello/objectwidget.h
+++ b/umbrello/umbrello/objectwidget.h
@@ -33,7 +33,7 @@ class SeqLineWidget;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class ObjectWidget : public UMLWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/operation.h b/umbrello/umbrello/operation.h
index 04404572..0b93d08b 100644
--- a/umbrello/umbrello/operation.h
+++ b/umbrello/umbrello/operation.h
@@ -23,7 +23,7 @@ class UMLClassifier;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLOperation : public UMLClassifierListItem {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/ownedcodeblock.h b/umbrello/umbrello/ownedcodeblock.h
index d710bbd8..33be95fc 100644
--- a/umbrello/umbrello/ownedcodeblock.h
+++ b/umbrello/umbrello/ownedcodeblock.h
@@ -34,7 +34,7 @@ class UMLObject;
 
 class OwnedCodeBlock : virtual public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h
index a1e15456..3bd4466f 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.h
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.h
@@ -29,7 +29,7 @@ class CodeDocument;
 
 class OwnedHierarchicalCodeBlock : public HierarchicalCodeBlock, public OwnedCodeBlock
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/package.h b/umbrello/umbrello/package.h
index 7a483e4d..2421cbfb 100644
--- a/umbrello/umbrello/package.h
+++ b/umbrello/umbrello/package.h
@@ -32,7 +32,7 @@ class UMLAssociation;
  */
 
 class UMLPackage : public UMLCanvasObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h
index 351ef05c..2b731f08 100644
--- a/umbrello/umbrello/plugin.h
+++ b/umbrello/umbrello/plugin.h
@@ -88,7 +88,7 @@ class Plugin :
             public TQObject,
             public Configurable
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     friend class PluginLoader;
 public:
diff --git a/umbrello/umbrello/pluginloader.h b/umbrello/umbrello/pluginloader.h
index 87f01db3..3fe7fcaf 100644
--- a/umbrello/umbrello/pluginloader.h
+++ b/umbrello/umbrello/pluginloader.h
@@ -66,7 +66,7 @@ class Plugin;
  */
 class PluginLoader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /** Destry the plugin loader */
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h
index ab68b140..ec38e44e 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.h
+++ b/umbrello/umbrello/refactoring/refactoringassistant.h
@@ -30,7 +30,7 @@ class TQPoint;
 
 class RefactoringAssistant : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     typedef std::map<TQListViewItem*, UMLObject*> UMLObjectMap;
diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h
index 18d7b48e..c4b9ae2b 100644
--- a/umbrello/umbrello/statewidget.h
+++ b/umbrello/umbrello/statewidget.h
@@ -36,7 +36,7 @@
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class StateWidget : public UMLWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/textblock.h b/umbrello/umbrello/textblock.h
index 82a6c6be..c6d857ec 100644
--- a/umbrello/umbrello/textblock.h
+++ b/umbrello/umbrello/textblock.h
@@ -32,7 +32,7 @@ class CodeDocument;
 class TextBlock : virtual public TQObject {
     friend class CodeGenObjectWithTextBlocks;
     friend class ClassifierCodeDocument;
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/toolbarstate.h b/umbrello/umbrello/toolbarstate.h
index d7a34c9e..842c07d9 100644
--- a/umbrello/umbrello/toolbarstate.h
+++ b/umbrello/umbrello/toolbarstate.h
@@ -69,7 +69,7 @@ class UMLWidget;
  *       release and other similar strange combinations?
  */
 class ToolBarState: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h
index 89597211..ef06382c 100644
--- a/umbrello/umbrello/toolbarstatearrow.h
+++ b/umbrello/umbrello/toolbarstatearrow.h
@@ -32,7 +32,7 @@ class TQCanvasLine;
  * This is the default tool.
  */
 class ToolBarStateArrow : public ToolBarState {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/toolbarstateassociation.h b/umbrello/umbrello/toolbarstateassociation.h
index b07e4ad9..3f54dd99 100644
--- a/umbrello/umbrello/toolbarstateassociation.h
+++ b/umbrello/umbrello/toolbarstateassociation.h
@@ -36,7 +36,7 @@ class TQCanvasLine;
  * @todo refactor with common code in ToolBarStateMessages?
  */
 class ToolBarStateAssociation : public ToolBarStatePool {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/toolbarstatemessages.h b/umbrello/umbrello/toolbarstatemessages.h
index d6bee5b6..c32ccb3c 100644
--- a/umbrello/umbrello/toolbarstatemessages.h
+++ b/umbrello/umbrello/toolbarstatemessages.h
@@ -48,7 +48,7 @@ class ObjectWidget;
  * the message is smaller than the line.
  */
 class ToolBarStateMessages : public ToolBarStatePool {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/toolbarstateother.h b/umbrello/umbrello/toolbarstateother.h
index f5e0cba8..b389037c 100644
--- a/umbrello/umbrello/toolbarstateother.h
+++ b/umbrello/umbrello/toolbarstateother.h
@@ -23,7 +23,7 @@
  * spaces.
  */
 class ToolBarStateOther : public ToolBarStatePool {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h
index 9989d98e..078ba68d 100644
--- a/umbrello/umbrello/toolbarstatepool.h
+++ b/umbrello/umbrello/toolbarstatepool.h
@@ -22,7 +22,7 @@
  * tool bar state.
  */
 class ToolBarStatePool : public ToolBarState {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index b0e88b39..23051ab2 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -76,7 +76,7 @@ class TQCustomEvent;
  */
 
 class UMLApp : public KDockMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/umlcanvasobject.h b/umbrello/umbrello/umlcanvasobject.h
index 67baa747..ade2d478 100644
--- a/umbrello/umbrello/umlcanvasobject.h
+++ b/umbrello/umbrello/umlcanvasobject.h
@@ -34,7 +34,7 @@
  */
 
 class UMLCanvasObject : public UMLObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index 99b3bfb3..4b7478fe 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -75,7 +75,7 @@ class UMLFolder;
   * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
   */
 class UMLDoc : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index 2e9bf421..912a8d95 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -42,7 +42,7 @@ class UMLObject;
 class UMLClassifierListItem;
 
 class UMLListView : public TDEListView {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index 37e47065..d7454e3c 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -34,7 +34,7 @@ class UMLObject;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLObject : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h
index caee7237..28755cf4 100644
--- a/umbrello/umbrello/umlrole.h
+++ b/umbrello/umbrello/umlrole.h
@@ -24,7 +24,7 @@ class UMLAssociation;
  */
 
 class UMLRole : public UMLObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 718d0144..e549adb8 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -58,7 +58,7 @@ class ToolBarStateFactory;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLView : public TQCanvasView {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     friend class UMLViewImageExporterModel;
diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h
index 9563c573..86af8f4c 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -41,7 +41,7 @@ class TQFontMetrics;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class UMLWidget : public WidgetBase, public TQCanvasRectangle {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     friend class UMLWidgetController;
diff --git a/umbrello/umbrello/widgetbase.h b/umbrello/umbrello/widgetbase.h
index b6c66dc4..b2b157ce 100644
--- a/umbrello/umbrello/widgetbase.h
+++ b/umbrello/umbrello/widgetbase.h
@@ -28,7 +28,7 @@ class UMLObject;
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.trinitydesktop.org
  */
 class WidgetBase : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h
index 63522b05..5265e57f 100644
--- a/umbrello/umbrello/worktoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
@@ -40,7 +40,7 @@ class TQMainWindow;
 
 
 class WorkToolBar : public TDEToolBar {
-    Q_OBJECT
+    TQ_OBJECT
   
 public: