diff --git a/kdiff3plugin/kdiff3plugin.h b/kdiff3plugin/kdiff3plugin.h
index 352d1ff..0210b59 100644
--- a/kdiff3plugin/kdiff3plugin.h
+++ b/kdiff3plugin/kdiff3plugin.h
@@ -27,7 +27,7 @@ class TQStringList;
 
 class KDiff3Plugin : public KonqPopupMenuPlugin
 {
-   Q_OBJECT
+   TQ_OBJECT
    
 public:
   KDiff3Plugin (KonqPopupMenu *, const char *name, const TQStringList & list);
diff --git a/src/difftextwindow.h b/src/difftextwindow.h
index f5f5d01..f63aa99 100644
--- a/src/difftextwindow.h
+++ b/src/difftextwindow.h
@@ -29,7 +29,7 @@ class DiffTextWindowFrame;
 
 class DiffTextWindow : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    DiffTextWindow(
@@ -113,7 +113,7 @@ class DiffTextWindowFrameData;
 
 class DiffTextWindowFrame : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx );
diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
index 05d1217..a342099 100644
--- a/src/directorymergewindow.h
+++ b/src/directorymergewindow.h
@@ -116,7 +116,7 @@ public:
 
 class DirectoryMergeWindow : public TQListView
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader );
@@ -332,7 +332,7 @@ protected slots:
 
 class DirectoryMergeInfo : public TQFrame
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    DirectoryMergeInfo( TQWidget* pParent );
diff --git a/src/fileaccess.h b/src/fileaccess.h
index d6afad0..b87c54a 100644
--- a/src/fileaccess.h
+++ b/src/fileaccess.h
@@ -121,7 +121,7 @@ class t_DirectoryList : public std::list<FileAccess>
 
 class FileAccessJobHandler : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    FileAccessJobHandler( FileAccess* pFileAccess );
@@ -174,7 +174,7 @@ private slots:
 
 class ProgressDialog : public TQDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    ProgressDialog( TQWidget* pParent );
diff --git a/src/kdiff3.h b/src/kdiff3.h
index e48f42b..dea8594 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -62,7 +62,7 @@ class DirectoryMergeInfo;
 
 class ReversibleScrollBar : public TQScrollBar
 {
-   Q_OBJECT
+   TQ_OBJECT
   
    bool* m_pbRightToLeftLanguage;
    int m_realVal;
@@ -96,7 +96,7 @@ signals:
 
 class KDiff3App : public TQSplitter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/src/kdiff3_part.h b/src/kdiff3_part.h
index f529a7b..7df6887 100644
--- a/src/kdiff3_part.h
+++ b/src/kdiff3_part.h
@@ -37,7 +37,7 @@ class KDiff3App;
  */
 class KDiff3Part : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
@@ -84,7 +84,7 @@ class TDEAboutData;
 
 class KDiff3PartFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     KDiff3PartFactory();
diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h
index b11f3b8..388c9a6 100644
--- a/src/kdiff3_shell.h
+++ b/src/kdiff3_shell.h
@@ -38,7 +38,7 @@ class TDEToggleAction;
  */
 class KDiff3Shell : public KParts::MainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index b8c8b74..cc8c2ab 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -87,7 +87,7 @@ typedef TQPopupMenu TDEPopupMenu;
 
 class KDialogBase : public TQTabDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name,
@@ -171,7 +171,7 @@ namespace KParts
 
 class TDEMainWindow : public TQMainWindow
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
    KStatusBar m_statusBar;
@@ -219,7 +219,7 @@ public:
 
 class TDEAction : public TQAction
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    TDEAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true);
@@ -272,7 +272,7 @@ public:
 
 class TDEFontChooser : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
    TQFont m_font;
    TQPushButton* m_pSelectFont;
@@ -288,7 +288,7 @@ private slots:
 
 class KColorButton : public TQPushButton
 {
-   Q_OBJECT
+   TQ_OBJECT
   
    TQColor m_color;
 public:
@@ -391,7 +391,7 @@ extern TDEApplication* kapp;
 
 class KLibFactory : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    TQObject* create(TQObject*,const TQString&,const TQString&);
@@ -499,7 +499,7 @@ namespace KParts
 
    class Factory : public KLibFactory
    {
-      Q_OBJECT
+      TQ_OBJECT
   
    public:
    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h
index 57f25d7..82cbb7e 100644
--- a/src/mergeresultwindow.h
+++ b/src/mergeresultwindow.h
@@ -28,7 +28,7 @@ class TQPainter;
 
 class Overview : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    Overview( TQWidget* pParent, OptionDialog* pOptions );
@@ -96,7 +96,7 @@ enum e_MergeSrcSelector
 
 class MergeResultWindow : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    MergeResultWindow(
@@ -426,7 +426,7 @@ class TQComboBox;
 class TQLabel;
 class WindowTitleWidget : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
    TQLabel*      m_pLabel;
diff --git a/src/optiondialog.h b/src/optiondialog.h
index b097294..7aefa29 100644
--- a/src/optiondialog.h
+++ b/src/optiondialog.h
@@ -48,7 +48,7 @@ enum e_LineEndStyle
 
 class OptionDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
 public:
diff --git a/src/smalldialogs.h b/src/smalldialogs.h
index da7c671..026023a 100644
--- a/src/smalldialogs.h
+++ b/src/smalldialogs.h
@@ -32,7 +32,7 @@ class TQLabel;
 
 class OpenDialog : public TQDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    OpenDialog(
@@ -69,7 +69,7 @@ signals:
 
 class FindDialog : public TQDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    FindDialog(TQWidget* pParent);
@@ -93,7 +93,7 @@ public:
 
 class RegExpTester : public TQDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
    TQLineEdit* m_pAutoMergeRegExpEdit;