Remove spurious TQ_OBJECT instances

157 files changed, 160 insertions, 160 deletions

diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h
index 1b82a4aa..f34b7df9 100644
--- a/umbrello/umbrello/activitywidget.h
+++ b/umbrello/umbrello/activitywidget.h
@@ -33,7 +33,7 @@
  */
 class ActivityWidget : public UMLWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     enum ActivityType
diff --git a/umbrello/umbrello/actor.h b/umbrello/umbrello/actor.h
index f09f3c71..8248eb99 100644
--- a/umbrello/umbrello/actor.h
+++ b/umbrello/umbrello/actor.h
@@ -27,7 +27,7 @@
  */
 class UMLActor : public UMLCanvasObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructs an Actor.
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 7720b9b3..0567bee4 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -30,7 +30,7 @@ class UMLWidget;
  */
 class AlignToolBar : public KToolBar {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/artifact.h b/umbrello/umbrello/artifact.h
index 98a3fb71..ce885702 100644
--- a/umbrello/umbrello/artifact.h
+++ b/umbrello/umbrello/artifact.h
@@ -28,7 +28,7 @@
  */
 class UMLArtifact : public UMLCanvasObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/association.h b/umbrello/umbrello/association.h
index 139a2eb6..b419c8d9 100644
--- a/umbrello/umbrello/association.h
+++ b/umbrello/umbrello/association.h
@@ -31,7 +31,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 175a64ec..147b18fc 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -54,7 +54,7 @@ class UMLOperation;
  */
 class AssociationWidget : public WidgetBase, public LinkWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Enumeration used for stating where a line is on a widget.
diff --git a/umbrello/umbrello/attribute.h b/umbrello/umbrello/attribute.h
index 4f900389..a9195dd6 100644
--- a/umbrello/umbrello/attribute.h
+++ b/umbrello/umbrello/attribute.h
@@ -27,7 +27,7 @@
  */
 class UMLAttribute : public UMLClassifierListItem {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up an attribute.
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index 7278841e..35f75231 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -21,7 +21,7 @@
 class AutolayoutDlg : public MyDialog1
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
   public slots:
diff --git a/umbrello/umbrello/classifier.h b/umbrello/umbrello/classifier.h
index 495f4812..c208dce0 100644
--- a/umbrello/umbrello/classifier.h
+++ b/umbrello/umbrello/classifier.h
@@ -37,7 +37,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 dfdb4438..5e9085dc 100644
--- a/umbrello/umbrello/classifiercodedocument.h
+++ b/umbrello/umbrello/classifiercodedocument.h
@@ -42,7 +42,7 @@ class ClassifierCodeDocument : public CodeDocument
 {
     friend class HierarchicalCodeBlock;
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/classifierlistitem.h b/umbrello/umbrello/classifierlistitem.h
index c7333150..f10262c6 100644
--- a/umbrello/umbrello/classifierlistitem.h
+++ b/umbrello/umbrello/classifierlistitem.h
@@ -30,7 +30,7 @@ class UMLClassifier;
 
 class UMLClassifierListItem : public UMLObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructor.  Empty.
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index 017a4beb..31b4d376 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -33,7 +33,7 @@ class TQMimeSource;
  */
 class UMLClipboard : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructor.
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index fa535399..8d264ce1 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -37,7 +37,7 @@ 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 2e8457a2..b10112ab 100644
--- a/umbrello/umbrello/codeaccessormethod.h
+++ b/umbrello/umbrello/codeaccessormethod.h
@@ -27,7 +27,7 @@ class CodeAccessorMethod : public CodeMethodBlock
 {
     friend class CodeClassField;
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // some types of accessor methods that are possible:
diff --git a/umbrello/umbrello/codeblock.h b/umbrello/umbrello/codeblock.h
index b6ec86dd..dd5ca11e 100644
--- a/umbrello/umbrello/codeblock.h
+++ b/umbrello/umbrello/codeblock.h
@@ -33,7 +33,7 @@ class HierarchicalCodeBlock;
 class CodeBlock : public TextBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     enum ContentType {AutoGenerated=0, UserGenerated };
diff --git a/umbrello/umbrello/codeblockwithcomments.h b/umbrello/umbrello/codeblockwithcomments.h
index 3b5d3f66..9ca60e8a 100644
--- a/umbrello/umbrello/codeblockwithcomments.h
+++ b/umbrello/umbrello/codeblockwithcomments.h
@@ -32,7 +32,7 @@ class HierarchicalCodeBlock;
 class CodeBlockWithComments : public CodeBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h
index bbc3c8d6..ffc4ca35 100644
--- a/umbrello/umbrello/codeclassfield.h
+++ b/umbrello/umbrello/codeclassfield.h
@@ -40,7 +40,7 @@ class UMLRole;
 class CodeClassField : public CodeParameter
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     enum ClassFieldType { Attribute, PlainAssociation, Self, Aggregation, Composition, Unknown_Assoc };
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h
index 3233c8f7..74861948 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.h
@@ -35,7 +35,7 @@ class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public Owne
 {
     friend class CodeClassField;
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codecomment.h b/umbrello/umbrello/codecomment.h
index b8c10127..98f38582 100644
--- a/umbrello/umbrello/codecomment.h
+++ b/umbrello/umbrello/codecomment.h
@@ -31,7 +31,7 @@
 class CodeComment : public TextBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codedocument.h b/umbrello/umbrello/codedocument.h
index a3ea7f36..ce27ec40 100644
--- a/umbrello/umbrello/codedocument.h
+++ b/umbrello/umbrello/codedocument.h
@@ -46,7 +46,7 @@ class CodeDocument : public TQObject, public CodeGenObjectWithTextBlocks
 {
     friend class HierarchicalCodeBlock;
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h
index 50dfd998..146299c2 100644
--- a/umbrello/umbrello/codegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerationpolicy.h
@@ -34,7 +34,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 e7e2c24d..5bca8eb6 100644
--- a/umbrello/umbrello/codegenerator.h
+++ b/umbrello/umbrello/codegenerator.h
@@ -81,7 +81,7 @@ class KConfig;
 
 class CodeGenerator : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/umbrello/umbrello/codegenerators/adawriter.h b/umbrello/umbrello/codegenerators/adawriter.h
index 09e2e543..46e14694 100644
--- a/umbrello/umbrello/codegenerators/adawriter.h
+++ b/umbrello/umbrello/codegenerators/adawriter.h
@@ -32,7 +32,7 @@ class UMLOperation;
   */
 class AdaWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/codegenerators/aswriter.h b/umbrello/umbrello/codegenerators/aswriter.h
index 8156a04b..6c21d63d 100644
--- a/umbrello/umbrello/codegenerators/aswriter.h
+++ b/umbrello/umbrello/codegenerators/aswriter.h
@@ -28,7 +28,7 @@
   */
 class ASWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     ASWriter();
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
index 7a76c7cc..3caa656c 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
@@ -28,7 +28,7 @@ class ClassifierCodeDocument;
 class CPPCodeClassField : public CodeClassField
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.h b/umbrello/umbrello/codegenerators/cppcodecomment.h
index 4d7e7e6e..0b7c7d7f 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.h
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.h
@@ -31,7 +31,7 @@
 class CPPCodeComment : virtual public CodeComment
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
index aebaa5d5..4e3b04b2 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
@@ -25,7 +25,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 5788a2fe..d3b2d1b0 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -27,7 +27,7 @@ class CodeGenerationPolicyPage;
 class CPPCodeGenerationPolicy : public CodeGenPolicyExt
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     static const bool DEFAULT_AUTO_GEN_EMPTY_CONSTRUCTORS;
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
index a918acfb..4b10dc04 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
@@ -28,7 +28,7 @@
 
 class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 5d73f881..1b7cfe0b 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -33,7 +33,7 @@ class KConfig;
 class CPPCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     static const bool DEFAULT_BUILD_MAKEFILE;
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index 7277ea87..e3f91dae 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -25,7 +25,7 @@
 class CPPHeaderClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
index 021436fa..865b0175 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h
@@ -25,7 +25,7 @@ class CodeClassField;
 class CPPHeaderCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
index d4e28bb9..10565854 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
@@ -23,7 +23,7 @@
 class CPPHeaderCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.h b/umbrello/umbrello/codegenerators/cppheadercodedocument.h
index 59cc9c8d..e3578c82 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.h
@@ -34,7 +34,7 @@ class CPPHeaderClassDeclarationBlock;
 class CPPHeaderCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
index 915c4ac1..bf435180 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h
@@ -26,7 +26,7 @@ class CPPHeaderCodeDocument;
 class CPPHeaderCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.h b/umbrello/umbrello/codegenerators/cppmakecodedocument.h
index 18f97707..78e4c03e 100644
--- a/umbrello/umbrello/codegenerators/cppmakecodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.h
@@ -30,7 +30,7 @@
 class CPPMakefileCodeDocument : public CodeDocument
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     static const char * DOCUMENT_ID_VALUE;
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
index f1565f2b..6e832b2c 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h
@@ -25,7 +25,7 @@ class CodeClassField;
 class CPPSourceCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
index 46183b70..0bb2e3e6 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
@@ -23,7 +23,7 @@
 class CPPSourceCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
index c820d5a4..5b03cb7f 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h
@@ -31,7 +31,7 @@
 class CPPSourceCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
index 86e5ff35..7748d198 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h
@@ -26,7 +26,7 @@ class CPPSourceCodeDocument;
 class CPPSourceCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h
index 322ce06c..728c29af 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.h
+++ b/umbrello/umbrello/codegenerators/csharpwriter.h
@@ -31,7 +31,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 27c8e7c5..d11211ec 100644
--- a/umbrello/umbrello/codegenerators/javaantcodedocument.h
+++ b/umbrello/umbrello/codegenerators/javaantcodedocument.h
@@ -32,7 +32,7 @@
 class JavaANTCodeDocument : public CodeDocument
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index 19a743d5..eaaf982a 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -25,7 +25,7 @@
 class JavaClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
index 5813609f..e12169c9 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h
@@ -40,7 +40,7 @@ class JavaCodeGenerationPolicy;
 class JavaClassifierCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
index 902b37c4..5c1751a9 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h
@@ -25,7 +25,7 @@ class CodeClassField;
 class JavaCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h
index 325d0b3a..e2e02c32 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h
@@ -27,7 +27,7 @@ class ClassifierCodeDocument;
 class JavaCodeClassField : public CodeClassField
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
index 869954cf..b0f84663 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
@@ -23,7 +23,7 @@
 class JavaCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodecomment.h b/umbrello/umbrello/codegenerators/javacodecomment.h
index 2d756d70..d0a571d2 100644
--- a/umbrello/umbrello/codegenerators/javacodecomment.h
+++ b/umbrello/umbrello/codegenerators/javacodecomment.h
@@ -31,7 +31,7 @@
 class JavaCodeComment : virtual public CodeComment
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.h b/umbrello/umbrello/codegenerators/javacodedocumentation.h
index dff2da00..7806885c 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.h
@@ -33,7 +33,7 @@ class JavaClassifierCodeDocument;
 class JavaCodeDocumentation : virtual public CodeComment
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index 8f95c1c8..bde47753 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -27,7 +27,7 @@ class CodeGenerationPolicyPage;
 class JavaCodeGenerationPolicy : public CodeGenPolicyExt
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS;
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
index 8236e1a2..b8e0639b 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
@@ -28,7 +28,7 @@
 
 class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h
index 24ab718a..c1a56701 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.h
@@ -36,7 +36,7 @@ class CodeViewerDialog;
 class JavaCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.h b/umbrello/umbrello/codegenerators/javacodeoperation.h
index 51b7f48a..c33bc805 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.h
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.h
@@ -26,7 +26,7 @@ class JavaClassifierCodeDocument;
 class JavaCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/jswriter.h b/umbrello/umbrello/codegenerators/jswriter.h
index 3f54101e..40f05339 100644
--- a/umbrello/umbrello/codegenerators/jswriter.h
+++ b/umbrello/umbrello/codegenerators/jswriter.h
@@ -28,7 +28,7 @@
   */
 class JSWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     JSWriter();
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.h b/umbrello/umbrello/codegenerators/pascalwriter.h
index e8db48ba..bc3ae0ba 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.h
+++ b/umbrello/umbrello/codegenerators/pascalwriter.h
@@ -24,7 +24,7 @@ class UMLOperation;
  */
 class PascalWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/codegenerators/perlwriter.h b/umbrello/umbrello/codegenerators/perlwriter.h
index 99e39bb1..dd8ad677 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.h
+++ b/umbrello/umbrello/codegenerators/perlwriter.h
@@ -32,7 +32,7 @@ class UMLClassifier;
   */
 class PerlWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     PerlWriter();
diff --git a/umbrello/umbrello/codegenerators/php5writer.h b/umbrello/umbrello/codegenerators/php5writer.h
index 726cf09b..26921966 100644
--- a/umbrello/umbrello/codegenerators/php5writer.h
+++ b/umbrello/umbrello/codegenerators/php5writer.h
@@ -30,7 +30,7 @@
   */
 class Php5Writer : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     Php5Writer();
diff --git a/umbrello/umbrello/codegenerators/phpwriter.h b/umbrello/umbrello/codegenerators/phpwriter.h
index b7b9affa..c888e198 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.h
+++ b/umbrello/umbrello/codegenerators/phpwriter.h
@@ -28,7 +28,7 @@
   */
 class PhpWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     PhpWriter();
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.h b/umbrello/umbrello/codegenerators/pythonwriter.h
index b7f324e7..a4622029 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.h
+++ b/umbrello/umbrello/codegenerators/pythonwriter.h
@@ -31,7 +31,7 @@ enum Access {PRIVATE, PUBLIC, PROTECTED};
   */
 class PythonWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     PythonWriter();
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index d181fc65..9c680858 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -33,7 +33,7 @@
 class RubyClassDeclarationBlock : public OwnedHierarchicalCodeBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
index 05f73e14..0861cd5d 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h
@@ -42,7 +42,7 @@ class RubyCodeGenerationPolicy;
 class RubyClassifierCodeDocument : public ClassifierCodeDocument
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
index cc58ce2e..09459247 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h
@@ -31,7 +31,7 @@
 class RubyCodeAccessorMethod : public CodeAccessorMethod
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
index f6cb27fe..6370bdbd 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
@@ -29,7 +29,7 @@ class ClassifierCodeDocument;
 class RubyCodeClassField : public CodeClassField
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
index 493f768c..a46c4184 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
@@ -27,7 +27,7 @@
 class RubyCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.h b/umbrello/umbrello/codegenerators/rubycodecomment.h
index 8c7cec59..09b54fce 100644
--- a/umbrello/umbrello/codegenerators/rubycodecomment.h
+++ b/umbrello/umbrello/codegenerators/rubycodecomment.h
@@ -34,7 +34,7 @@
 class RubyCodeComment : virtual public CodeComment
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructors
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.h b/umbrello/umbrello/codegenerators/rubycodedocumentation.h
index a4db50ab..33f8f1f5 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.h
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.h
@@ -35,7 +35,7 @@ class RubyClassifierCodeDocument;
 class RubyCodeDocumentation : virtual public CodeComment
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index 542f3166..afbc26b4 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -30,7 +30,7 @@ class CodeGenerationPolicyPage;
 class RubyCodeGenerationPolicy : public CodeGenPolicyExt
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS;
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
index fc29fc3f..1ccb7650 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
@@ -31,7 +31,7 @@
 
 class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h
index 035daa86..37393af1 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h
@@ -36,7 +36,7 @@ class CodeViewerDialog;
 class RubyCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.h b/umbrello/umbrello/codegenerators/rubycodeoperation.h
index 1bdc4556..a79f0dff 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.h
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.h
@@ -28,7 +28,7 @@ class RubyClassifierCodeDocument;
 class RubyCodeOperation : virtual public CodeOperation
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/rubywriter.h b/umbrello/umbrello/codegenerators/rubywriter.h
index 929a7306..37e657a4 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.h
+++ b/umbrello/umbrello/codegenerators/rubywriter.h
@@ -33,7 +33,7 @@ class ClassifierInfo;
   */
 class RubyWriter : public SimpleCodeGenerator {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     RubyWriter();
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h
index c27e02ff..9a5d53a1 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.h
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h
@@ -35,7 +35,7 @@ class UMLDoc;
 class SimpleCodeGenerator : public CodeGenerator
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.h b/umbrello/umbrello/codegenerators/sqlwriter.h
index d9e5f954..26032f42 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.h
+++ b/umbrello/umbrello/codegenerators/sqlwriter.h
@@ -29,7 +29,7 @@
   */
 class SQLWriter : public SimpleCodeGenerator {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
 
     SQLWriter();
diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.h b/umbrello/umbrello/codegenerators/xmlcodecomment.h
index 688ade91..fe3fb58b 100644
--- a/umbrello/umbrello/codegenerators/xmlcodecomment.h
+++ b/umbrello/umbrello/codegenerators/xmlcodecomment.h
@@ -31,7 +31,7 @@ class CodeDocument;
 class XMLCodeComment: virtual public CodeComment
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index 46342658..a3cadc39 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -28,7 +28,7 @@ class UMLAttribute;
 class XMLElementCodeBlock : public HierarchicalCodeBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h
index cb5546d8..18c668e5 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.h
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h
@@ -38,7 +38,7 @@
 class XMLSchemaWriter : public SimpleCodeGenerator
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h
index e733a254..21891b29 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h
@@ -15,7 +15,7 @@ static const struct HashEntry keywordEntries[] = {
    { "k_dcop_signals", Token_k_dcop_signals, 0, 0, &keywordEntries[104] },
    { "auto", Token_auto, 0, 0, &keywordEntries[91] },
    { 0, 0, 0, 0, 0 },
-   { "TQ_OBJECT", Token_TQ_OBJECT, 0, 0, &keywordEntries[86] },
+   { "", Token_, 0, 0, &keywordEntries[86] },
    { "and_eq", Token_and_eq, 0, 0, 0 },
    { 0, 0, 0, 0, 0 },
    { "operator", Token_operator, 0, 0, 0 },
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
index 0e15f053..d27980f8 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
@@ -57,7 +57,7 @@ enum Type {
     Token_k_dcop_signals,
 
     Token_Q_OBJECT,
-    Token_TQ_OBJECT,
+    Token_,
     Token_signals,
     Token_slots,
     Token_emit,
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index b724faba..d765a602 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -1980,7 +1980,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node )
 	if ( !comment.isEmpty() )
 	    node->setComment( comment );
 	return true;
-    } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
+    } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_ || lex->lookAhead(0) == Token_K_DCOP ){
 	lex->nextToken();
 	return true;
     } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){
diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h
index 62651750..0dae9519 100644
--- a/umbrello/umbrello/codemethodblock.h
+++ b/umbrello/umbrello/codemethodblock.h
@@ -35,7 +35,7 @@ class CodeMethodBlock : public CodeBlockWithComments, public OwnedCodeBlock
 {
     friend class CodeGenObjectWithTextBlocks;
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h
index 8bdc34fd..c34d0017 100644
--- a/umbrello/umbrello/codeoperation.h
+++ b/umbrello/umbrello/codeoperation.h
@@ -27,7 +27,7 @@
 class CodeOperation : public CodeMethodBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h
index dd4cd7d9..2c084524 100644
--- a/umbrello/umbrello/codeparameter.h
+++ b/umbrello/umbrello/codeparameter.h
@@ -34,7 +34,7 @@ class UMLObject;
 class CodeParameter : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/component.h b/umbrello/umbrello/component.h
index 4012d4bf..3703a001 100644
--- a/umbrello/umbrello/component.h
+++ b/umbrello/umbrello/component.h
@@ -29,7 +29,7 @@
 
 class UMLComponent : public UMLPackage {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up a Component.
diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h
index f8dbe366..99af61e0 100644
--- a/umbrello/umbrello/dialogs/activitydialog.h
+++ b/umbrello/umbrello/dialogs/activitydialog.h
@@ -38,7 +38,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 a6165a8a..6743e2aa 100644
--- a/umbrello/umbrello/dialogs/activitypage.h
+++ b/umbrello/umbrello/dialogs/activitypage.h
@@ -28,7 +28,7 @@ class ListPopupMenu;
  */
 class ActivityPage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      *  Constructor
diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h
index 6d6ffcdf..7d536211 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.h
+++ b/umbrello/umbrello/dialogs/assocgenpage.h
@@ -42,7 +42,7 @@ class KComboBox;
  */
 class AssocGenPage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h
index dbb0eec8..ab7aff20 100644
--- a/umbrello/umbrello/dialogs/assocpage.h
+++ b/umbrello/umbrello/dialogs/assocpage.h
@@ -40,7 +40,7 @@
  */
 class AssocPage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      *  Constructs an instance of AssocPage.
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 10fe344b..1970e59b 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -31,7 +31,7 @@ class UMLDoc;
  */
 class AssocPropDlg : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h
index beede96e..55dede9b 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.h
+++ b/umbrello/umbrello/dialogs/assocrolepage.h
@@ -38,7 +38,7 @@
  */
 class AssocRolePage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h
index fed32a2d..7c7dc71e 100644
--- a/umbrello/umbrello/dialogs/classgenpage.h
+++ b/umbrello/umbrello/dialogs/classgenpage.h
@@ -38,7 +38,7 @@ class UMLDoc;
  */
 class ClassGenPage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 2675fd35..8d3bfea0 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -38,7 +38,7 @@ class UMLDoc;
  */
 class ClassifierListPage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      *  Sets up the ClassifierListPage
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index 8078f372..e8bcb2c6 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -40,7 +40,7 @@ class UMLWidget;
  */
 class ClassPropDlg : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      *  Sets up a ClassPropDlg.
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index d5c42d1f..7fa27eeb 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -43,7 +43,7 @@ class ParaInfo;
 class CodeEditor : public TQTextEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0);
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
index 15ac05b4..fff7ac9a 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
@@ -39,7 +39,7 @@ class CodeGenerationPolicyPage;
 
 class CodeGenerationOptionsPage : public CodeGenerationOptionsBase  {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CodeGenerationOptionsPage(TQWidget *parent=0);
     ~CodeGenerationOptionsPage();
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
index 6325a91e..171b80a2 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
@@ -31,7 +31,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 13d36927..ec75e1f6 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.h
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.h
@@ -39,7 +39,7 @@ class CodeGenerationOptionsPage;
 
 class CodeGenerationWizard : public CodeGenerationWizardBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CodeGenerationWizard(UMLClassifierList *classList);
     ~CodeGenerationWizard();
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index eef90445..308e2e4c 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -42,7 +42,7 @@ class UMLObject;
 class CodeViewerDialog : public CodeViewerDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state,
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h
index 1e1b4eea..e0a9ee04 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.h
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h
@@ -28,7 +28,7 @@
 
 class CodeViewerOptionsPage : public CodeViewerOptionsBase  {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0);
     ~CodeViewerOptionsPage();
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
index bbc1c85a..95458eac 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
@@ -24,7 +24,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 8f18bbad..4152d18f 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -36,7 +36,7 @@ class TQGroupBox;
 
 class DiagramPrintPage : public KPrintDialogPage {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      *  Constructs the diagram print page.
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h
index 69a4135d..5c4bcba9 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -28,7 +28,7 @@ class KFileFilterCombo;
  */
 class ExportAllViewsDialog : public ExportAllViewsDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h
index ed42319f..a7e895b3 100644
--- a/umbrello/umbrello/dialogs/notedialog.h
+++ b/umbrello/umbrello/dialogs/notedialog.h
@@ -27,7 +27,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 fb85e967..4fef1282 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.h
+++ b/umbrello/umbrello/dialogs/overwritedialogue.h
@@ -29,7 +29,7 @@ class TQCheckBox;
  */
 class OverwriteDialogue: public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 0164277d..a30b5a6e 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -37,7 +37,7 @@ class UMLDoc;
  */
 class ParmPropDlg : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructs a ParmPropDlg.
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h
index 65db8d8f..75918404 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.h
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.h
@@ -27,7 +27,7 @@
  */
 class PkgContentsPage : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructs an instance of PkgContentsPage.
diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h
index be8a38ad..bb3928f3 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.h
+++ b/umbrello/umbrello/dialogs/selectopdlg.h
@@ -39,7 +39,7 @@ class UMLView;
 class SelectOpDlg : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      *  Constructs a SelectOpDlg instance.
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index 228ac654..ff745bd7 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -43,7 +43,7 @@ class CodeGenerator;
 class SettingsDlg : public KDialogBase {
 
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SettingsDlg(TQWidget * parent, Settings::OptionState *state);
diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h
index 5e3c9300..873ad067 100644
--- a/umbrello/umbrello/dialogs/statedialog.h
+++ b/umbrello/umbrello/dialogs/statedialog.h
@@ -37,7 +37,7 @@ class KFontChooser;
 
 class StateDialog : public KDialogBase {
     Q_OBJECT
-    TQ_OBJECT
+    
 
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.h b/umbrello/umbrello/dialogs/umlattributedialog.h
index d21d2834..5d852206 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.h
+++ b/umbrello/umbrello/dialogs/umlattributedialog.h
@@ -29,7 +29,7 @@ class TQLineEdit;
 
 class UMLAttributeDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute );
     ~UMLAttributeDialog();
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.h b/umbrello/umbrello/dialogs/umlentityattributedialog.h
index 1cd5c338..bf727271 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.h
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.h
@@ -29,7 +29,7 @@ class TQLineEdit;
 
 class UMLEntityAttributeDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     UMLEntityAttributeDialog( TQWidget* pParent, UMLEntityAttribute* pEntityAttribute );
     ~UMLEntityAttributeDialog();
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h
index 7a932554..49ec1aba 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.h
+++ b/umbrello/umbrello/dialogs/umloperationdialog.h
@@ -37,7 +37,7 @@ 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 c429e2e4..8f24e9ba 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.h
+++ b/umbrello/umbrello/dialogs/umlroledialog.h
@@ -25,7 +25,7 @@ class UMLRoleProperties;
 
 class UMLRoleDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
     *   Constructor
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h
index f52eaf4d..1c93ce63 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.h
+++ b/umbrello/umbrello/dialogs/umlroleproperties.h
@@ -24,7 +24,7 @@
  */
 class UMLRoleProperties : public UMLRolePropertiesBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.h b/umbrello/umbrello/dialogs/umltemplatedialog.h
index cdf8b3f1..dc27cdc0 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.h
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.h
@@ -31,7 +31,7 @@ class UMLTemplate;
 
 class UMLTemplateDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pAttribute);
     ~UMLTemplateDialog();
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h
index 6484aab3..8effb99c 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.h
+++ b/umbrello/umbrello/dialogs/umlviewdialog.h
@@ -37,7 +37,7 @@ class DiagramPropertiesPage;
 
 class UMLViewDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
     *   Constructor
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
index b5c33e2c..0110790f 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
@@ -29,7 +29,7 @@ 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 17e89bab..04c295a9 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.h
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.h
@@ -41,7 +41,7 @@ namespace KIO
 class DocbookGenerator : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 
     /**
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.h b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
index 0d249bbb..c63b3bba 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.h
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
@@ -41,7 +41,7 @@ namespace KIO
 class XhtmlGenerator : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 
     /**
diff --git a/umbrello/umbrello/docwindow.h b/umbrello/umbrello/docwindow.h
index a2dce505..2ea1934a 100644
--- a/umbrello/umbrello/docwindow.h
+++ b/umbrello/umbrello/docwindow.h
@@ -29,7 +29,7 @@ class UMLWidget;
 
 class DocWindow : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructor
diff --git a/umbrello/umbrello/entity.h b/umbrello/umbrello/entity.h
index c9ec4633..0ead0830 100644
--- a/umbrello/umbrello/entity.h
+++ b/umbrello/umbrello/entity.h
@@ -28,7 +28,7 @@ class UMLEntityAttribute;
  */
 class UMLEntity : public UMLClassifier {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up an entity.
diff --git a/umbrello/umbrello/entityattribute.h b/umbrello/umbrello/entityattribute.h
index aee70bcf..7767fc17 100644
--- a/umbrello/umbrello/entityattribute.h
+++ b/umbrello/umbrello/entityattribute.h
@@ -26,7 +26,7 @@
  */
 class UMLEntityAttribute : public UMLAttribute {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up an entityattribute.
diff --git a/umbrello/umbrello/enum.h b/umbrello/umbrello/enum.h
index edf107ae..7e4ffe52 100644
--- a/umbrello/umbrello/enum.h
+++ b/umbrello/umbrello/enum.h
@@ -28,7 +28,7 @@ class UMLEnumLiteral;
  */
 class UMLEnum : public UMLClassifier {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up an enum.
diff --git a/umbrello/umbrello/floatingtextwidget.h b/umbrello/umbrello/floatingtextwidget.h
index 635d750e..f8e169e1 100644
--- a/umbrello/umbrello/floatingtextwidget.h
+++ b/umbrello/umbrello/floatingtextwidget.h
@@ -37,7 +37,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 42e0e586..b35e7436 100644
--- a/umbrello/umbrello/folder.h
+++ b/umbrello/umbrello/folder.h
@@ -33,7 +33,7 @@
 
 class UMLFolder : public UMLPackage {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up a Folder.
diff --git a/umbrello/umbrello/hierarchicalcodeblock.h b/umbrello/umbrello/hierarchicalcodeblock.h
index 2b37f38e..89180f9a 100644
--- a/umbrello/umbrello/hierarchicalcodeblock.h
+++ b/umbrello/umbrello/hierarchicalcodeblock.h
@@ -28,7 +28,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 14866991..5965a8dd 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -26,7 +26,7 @@
 class KPlayerSlider : public TQSlider
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     /** The KPlayerSlider constructor. Parameters are passed on to TQSlider.
@@ -105,7 +105,7 @@ protected:
 class KPlayerPopupFrame : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     /** The KPlayerPopupFrame constructor. Parameters are passed on to TQFrame.
@@ -128,7 +128,7 @@ protected:
 class KPlayerPopupSliderAction : public KAction
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction.
@@ -169,7 +169,7 @@ protected:
 class KPlayerSliderAction : public KWidgetAction
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     /** The KPlayerSliderAction constructor. Parameters are passed on to KAction.
diff --git a/umbrello/umbrello/kstartuplogo.h b/umbrello/umbrello/kstartuplogo.h
index 84302075..3f9bef10 100644
--- a/umbrello/umbrello/kstartuplogo.h
+++ b/umbrello/umbrello/kstartuplogo.h
@@ -26,7 +26,7 @@
  */
 class KStartupLogo : public TQWidget  {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KStartupLogo(TQWidget *parent=0, const char *name=0);
     ~KStartupLogo();
diff --git a/umbrello/umbrello/linepath.h b/umbrello/umbrello/linepath.h
index c0343478..4e9f91df 100644
--- a/umbrello/umbrello/linepath.h
+++ b/umbrello/umbrello/linepath.h
@@ -44,7 +44,7 @@ typedef TQPtrListIterator<TQCanvasRectangle> RectListIt;
  */
 class LinePath : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
     *   Constructor
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index db24fd36..05aa6162 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -40,7 +40,7 @@ class MessageWidgetController;
  */
 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 88d1be8a..edad39ef 100644
--- a/umbrello/umbrello/node.h
+++ b/umbrello/umbrello/node.h
@@ -27,7 +27,7 @@
  */
 class UMLNode : public UMLCanvasObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up a Node.
diff --git a/umbrello/umbrello/notewidget.h b/umbrello/umbrello/notewidget.h
index 1ba65a57..601e0555 100644
--- a/umbrello/umbrello/notewidget.h
+++ b/umbrello/umbrello/notewidget.h
@@ -34,7 +34,7 @@ class TQTextEdit;
  */
 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 812ea067..56ef3ad0 100644
--- a/umbrello/umbrello/objectwidget.h
+++ b/umbrello/umbrello/objectwidget.h
@@ -34,7 +34,7 @@ class SeqLineWidget;
  */
 class ObjectWidget : public UMLWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Creates an ObjectWidget.
diff --git a/umbrello/umbrello/operation.h b/umbrello/umbrello/operation.h
index a088ef5e..9e9e3308 100644
--- a/umbrello/umbrello/operation.h
+++ b/umbrello/umbrello/operation.h
@@ -24,7 +24,7 @@ class UMLClassifier;
  */
 class UMLOperation : public UMLClassifierListItem {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructs an UMLOperation.
diff --git a/umbrello/umbrello/ownedcodeblock.h b/umbrello/umbrello/ownedcodeblock.h
index a911351b..d710bbd8 100644
--- a/umbrello/umbrello/ownedcodeblock.h
+++ b/umbrello/umbrello/ownedcodeblock.h
@@ -35,7 +35,7 @@ class UMLObject;
 class OwnedCodeBlock : virtual public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h
index 6cbdb983..a1e15456 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.h
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.h
@@ -30,7 +30,7 @@ class CodeDocument;
 class OwnedHierarchicalCodeBlock : public HierarchicalCodeBlock, public OwnedCodeBlock
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/package.h b/umbrello/umbrello/package.h
index 6eef0eff..32495d87 100644
--- a/umbrello/umbrello/package.h
+++ b/umbrello/umbrello/package.h
@@ -33,7 +33,7 @@ class UMLAssociation;
 
 class UMLPackage : public UMLCanvasObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up a Package.
diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h
index 1fa4d7f4..ce5beff0 100644
--- a/umbrello/umbrello/plugin.h
+++ b/umbrello/umbrello/plugin.h
@@ -89,7 +89,7 @@ class Plugin :
             public Configurable
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class PluginLoader;
 public:
     /** Destroy a plugin.*/
diff --git a/umbrello/umbrello/pluginloader.h b/umbrello/umbrello/pluginloader.h
index 12bdfba5..f367eeb3 100644
--- a/umbrello/umbrello/pluginloader.h
+++ b/umbrello/umbrello/pluginloader.h
@@ -67,7 +67,7 @@ class Plugin;
 class PluginLoader : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /** Destry the plugin loader */
     ~PluginLoader();
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h
index 7acec605..e59b8423 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.h
+++ b/umbrello/umbrello/refactoring/refactoringassistant.h
@@ -31,7 +31,7 @@ class TQPoint;
 class RefactoringAssistant : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef std::map<TQListViewItem*, UMLObject*> UMLObjectMap;
 
diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h
index eabe0670..f4a8008a 100644
--- a/umbrello/umbrello/statewidget.h
+++ b/umbrello/umbrello/statewidget.h
@@ -37,7 +37,7 @@
  */
 class StateWidget : public UMLWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /// Enumeration that codes the different types of state.
diff --git a/umbrello/umbrello/textblock.h b/umbrello/umbrello/textblock.h
index 9386f3d6..82a6c6be 100644
--- a/umbrello/umbrello/textblock.h
+++ b/umbrello/umbrello/textblock.h
@@ -33,7 +33,7 @@ class TextBlock : virtual public TQObject {
     friend class CodeGenObjectWithTextBlocks;
     friend class ClassifierCodeDocument;
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     // Constructors/Destructors
diff --git a/umbrello/umbrello/toolbarstate.h b/umbrello/umbrello/toolbarstate.h
index 976a4a90..d7a34c9e 100644
--- a/umbrello/umbrello/toolbarstate.h
+++ b/umbrello/umbrello/toolbarstate.h
@@ -70,7 +70,7 @@ class UMLWidget;
  */
 class ToolBarState: public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h
index c098c300..89597211 100644
--- a/umbrello/umbrello/toolbarstatearrow.h
+++ b/umbrello/umbrello/toolbarstatearrow.h
@@ -33,7 +33,7 @@ class TQCanvasLine;
  */
 class ToolBarStateArrow : public ToolBarState {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/toolbarstateassociation.h b/umbrello/umbrello/toolbarstateassociation.h
index 734e603f..b07e4ad9 100644
--- a/umbrello/umbrello/toolbarstateassociation.h
+++ b/umbrello/umbrello/toolbarstateassociation.h
@@ -37,7 +37,7 @@ class TQCanvasLine;
  */
 class ToolBarStateAssociation : public ToolBarStatePool {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/toolbarstatemessages.h b/umbrello/umbrello/toolbarstatemessages.h
index 35719581..d6bee5b6 100644
--- a/umbrello/umbrello/toolbarstatemessages.h
+++ b/umbrello/umbrello/toolbarstatemessages.h
@@ -49,7 +49,7 @@ class ObjectWidget;
  */
 class ToolBarStateMessages : public ToolBarStatePool {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/toolbarstateother.h b/umbrello/umbrello/toolbarstateother.h
index ea94feae..f5e0cba8 100644
--- a/umbrello/umbrello/toolbarstateother.h
+++ b/umbrello/umbrello/toolbarstateother.h
@@ -24,7 +24,7 @@
  */
 class ToolBarStateOther : public ToolBarStatePool {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h
index 4541911b..9989d98e 100644
--- a/umbrello/umbrello/toolbarstatepool.h
+++ b/umbrello/umbrello/toolbarstatepool.h
@@ -23,7 +23,7 @@
  */
 class ToolBarStatePool : public ToolBarState {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index f8e1be48..8a9a8c95 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -77,7 +77,7 @@ class TQCustomEvent;
 
 class UMLApp : public KDockMainWindow {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructor. Calls all init functions to create the application.
diff --git a/umbrello/umbrello/umlcanvasobject.h b/umbrello/umbrello/umlcanvasobject.h
index 7ddaf48f..6fd561c7 100644
--- a/umbrello/umbrello/umlcanvasobject.h
+++ b/umbrello/umbrello/umlcanvasobject.h
@@ -35,7 +35,7 @@
 
 class UMLCanvasObject : public UMLObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up a UMLCanvasObject.
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index 5ee9cc39..8e992bee 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -76,7 +76,7 @@ class UMLFolder;
   */
 class UMLDoc : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructor for the fileclass of the application
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index f2328cef..e6d39894 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -43,7 +43,7 @@ class UMLClassifierListItem;
 
 class UMLListView : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index aedc2325..2d3804cf 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -35,7 +35,7 @@ class UMLObject;
  */
 class UMLObject : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**
diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h
index 57bacbb1..caee7237 100644
--- a/umbrello/umbrello/umlrole.h
+++ b/umbrello/umbrello/umlrole.h
@@ -25,7 +25,7 @@ class UMLAssociation;
 
 class UMLRole : public UMLObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Sets up an association.
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index ce84e17c..805c28af 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -59,7 +59,7 @@ class ToolBarStateFactory;
  */
 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 6a74579f..fd1c2d00 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -42,7 +42,7 @@ class TQFontMetrics;
  */
 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 5dd863f8..41a7629f 100644
--- a/umbrello/umbrello/widgetbase.h
+++ b/umbrello/umbrello/widgetbase.h
@@ -29,7 +29,7 @@ class UMLObject;
  */
 class WidgetBase : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Creates a WidgetBase object.
diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h
index 6893284b..375252e0 100644
--- a/umbrello/umbrello/worktoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
@@ -41,7 +41,7 @@ class TQMainWindow;
 
 class WorkToolBar : public KToolBar {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     /**