diff --git a/bab/bab.h b/bab/bab.h
index 68c7dcd..3f76c0c 100644
--- a/bab/bab.h
+++ b/bab/bab.h
@@ -35,7 +35,7 @@
 class bab;
 
 class BabSwitcher : public KSystemTray , public babInterface{
-   Q_OBJECT
+   TQ_OBJECT
 public: 
    
    enum State {Jaguar = 0, Panther, iTunes, Tiger, Milk};
@@ -77,7 +77,7 @@ class TQCheckBox;
  */
 class bab : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     
     enum TabState {Tab = 0, Clever, Chooser};
@@ -97,7 +97,7 @@ private slots:
 
 class Corner : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         enum Side {left = 0, right};
         Corner(Side side);
diff --git a/bab/styleconfdialog.h b/bab/styleconfdialog.h
index 4eed340..4423347 100644
--- a/bab/styleconfdialog.h
+++ b/bab/styleconfdialog.h
@@ -26,7 +26,7 @@
 class TDEConfig;
 class StyleConfigDialog: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   StyleConfigDialog(TQWidget* parent, TQString styleName);
 
diff --git a/config/colordialog.h b/config/colordialog.h
index 42b6225..1dc649e 100644
--- a/config/colordialog.h
+++ b/config/colordialog.h
@@ -17,7 +17,7 @@ enum Colors { Back = 0, Button, Base, Text, High, HighText, ButText, Alternate,
 
 class DemoWindow : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
       
 public:
    DemoWindow( ColorDialog* parent = 0, const char* name = 0);
@@ -59,7 +59,7 @@ class ColorDialog : public TQDialog
 {
    friend class DemoWindow;
    friend class AppSetter;
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
    ColorDialog( TQWidget* parent = 0, const char* name = 0);
diff --git a/config/colorpicker.h b/config/colorpicker.h
index 59f27cf..4a0f9a7 100644
--- a/config/colorpicker.h
+++ b/config/colorpicker.h
@@ -8,7 +8,7 @@ class TQColor;
 
 class ColorPicker : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ColorPicker( TQWidget* parent = 0, const char* name = 0);
diff --git a/config/tdestyle_baghira_config.h b/config/tdestyle_baghira_config.h
index 5d014dd..ba3fd1b 100644
--- a/config/tdestyle_baghira_config.h
+++ b/config/tdestyle_baghira_config.h
@@ -39,7 +39,7 @@ class TQGroupBox;
 
 class tdestyle_baghira_config: public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    tdestyle_baghira_config( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
@@ -119,7 +119,7 @@ class ColorDialog;
 
 class AppSetter : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 public:
    AppSetter(TQWidget *parent=0, const char *name=0);
    ~AppSetter();
diff --git a/deco/baghiraclient.h b/deco/baghiraclient.h
index d661fa0..f9ca4b9 100644
--- a/deco/baghiraclient.h
+++ b/deco/baghiraclient.h
@@ -109,7 +109,7 @@ class BaghiraClient;
 class ResizeHandle : public TQWidget
 {
 friend class BaghiraClient;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ResizeHandle(BaghiraClient *parent);
 protected:
@@ -129,7 +129,7 @@ class DeMaximizer : public TQWidget
 {
 friend class BaghiraClient;
 friend class BaghiraFactory;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DeMaximizer();
     void setClient(BaghiraClient *);
@@ -323,7 +323,7 @@ inline int BaghiraFactory::borderSize(int current)
 
 class BaghiraButton : public TQButton
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
     BaghiraButton(BaghiraClient *parent=0, const char *name=0, const TQString &tip=NULL, bool small=false, ButtonType type=MinButton, int style=0);
     ~BaghiraButton();
@@ -373,7 +373,7 @@ class BaghiraClient : public KDecoration
 {
 friend class BaghiraButton;
 friend class ResizeHandle;
-    Q_OBJECT
+    TQ_OBJECT
 public:
    BaghiraClient(KDecorationBridge *b, KDecorationFactory *f);
    virtual ~BaghiraClient();
diff --git a/deco/config/aquariusbutton.h b/deco/config/aquariusbutton.h
index 3632408..fbef1b9 100644
--- a/deco/config/aquariusbutton.h
+++ b/deco/config/aquariusbutton.h
@@ -10,7 +10,7 @@ class TQColor;
 
 class AquariusButton : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AquariusButton( TQPixmap &pixmap, TQWidget* parent = 0, const char* name = 0);
diff --git a/deco/config/baghiraconfig.h b/deco/config/baghiraconfig.h
index 1a31269..be1f246 100644
--- a/deco/config/baghiraconfig.h
+++ b/deco/config/baghiraconfig.h
@@ -44,7 +44,7 @@ class TQComboBox;
 
 class ButtonColors : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ButtonColors(TQWidget* parent, const char * name = 0);
     ~ButtonColors();
@@ -122,7 +122,7 @@ private slots:
 
 class BaghiraConfig : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BaghiraConfig(TDEConfig* config, TQWidget* parent);
     ~BaghiraConfig();
diff --git a/deco/config/colorpicker.h b/deco/config/colorpicker.h
index 7e4f776..10d1d27 100644
--- a/deco/config/colorpicker.h
+++ b/deco/config/colorpicker.h
@@ -11,7 +11,7 @@ class TQColor;
 
 class ColorPicker : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ColorPicker( TQWidget* parent = 0, const char* name = 0);
diff --git a/deco/config/new/baghiraconfig.h b/deco/config/new/baghiraconfig.h
index 9d244bb..92b06e7 100644
--- a/deco/config/new/baghiraconfig.h
+++ b/deco/config/new/baghiraconfig.h
@@ -45,7 +45,7 @@ class TQComboBox;
 
 class ButtonColors : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ButtonColors(TQWidget* parent, const char * name = 0);
     ~ButtonColors();
@@ -124,7 +124,7 @@ class CustomDecoSettings;
 
 class BaghiraConfig : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BaghiraConfig(TDEConfig* config, TQWidget* parent);
     ~BaghiraConfig();
diff --git a/kickermenu-3.3/menuapplet.h b/kickermenu-3.3/menuapplet.h
index 782d922..6bdbe61 100644
--- a/kickermenu-3.3/menuapplet.h
+++ b/kickermenu-3.3/menuapplet.h
@@ -45,7 +45,7 @@ class MenuEmbed;
 
 class Applet : public KPanelApplet, public DCOPObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         ASYNC configure();
@@ -93,7 +93,7 @@ class Applet : public KPanelApplet, public DCOPObject
 class MenuEmbed
     : public QXEmbed
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	MenuEmbed( WId mainwindow, bool desktop,
             TQWidget* parent = NULL, const char* name = NULL );
diff --git a/kickermenu/menuapplet.h b/kickermenu/menuapplet.h
index dea5481..9500fa1 100644
--- a/kickermenu/menuapplet.h
+++ b/kickermenu/menuapplet.h
@@ -48,7 +48,7 @@ class MenuEmbed;
 
 class Applet : public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 k_dcop:
    ASYNC configure();
@@ -99,7 +99,7 @@ private:
 
 class MenuEmbed : public QXEmbed
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    MenuEmbed( WId mainwindow, bool desktop, TQWidget* parent = NULL, const char* name = NULL );
    WId mainWindow() const;
diff --git a/sessionapplet/usermanager.h b/sessionapplet/usermanager.h
index 9fcb142..76fcaf2 100644
--- a/sessionapplet/usermanager.h
+++ b/sessionapplet/usermanager.h
@@ -38,7 +38,7 @@ class TQPopunMenu;
 
 class UserManager : public KPanelApplet
 {
-   Q_OBJECT
+   TQ_OBJECT
     
 public:
    UserManager(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/sidebar/baghirasidebar.h b/sidebar/baghirasidebar.h
index 1a8f982..640c354 100644
--- a/sidebar/baghirasidebar.h
+++ b/sidebar/baghirasidebar.h
@@ -15,7 +15,7 @@ class TQListBoxItem;
 
 class baghiraSidebar : public KonqSidebarPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
diff --git a/sidebar/dndlistbox.h b/sidebar/dndlistbox.h
index 4f12823..c5e2cfb 100644
--- a/sidebar/dndlistbox.h
+++ b/sidebar/dndlistbox.h
@@ -26,7 +26,7 @@ class TQResizeEvent;
 
 class ResizingLinkBox : public TDEListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
    ResizingLinkBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
@@ -62,7 +62,7 @@ signals:
 
 class MediaListBox : public ResizingLinkBox, virtual public BaghiraSidebarIface
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    MediaListBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
    ~MediaListBox();
@@ -89,7 +89,7 @@ private slots:
 
 class DnDListBox : public ResizingLinkBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
      DnDListBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
diff --git a/sidebar/linkview.h b/sidebar/linkview.h
index 1817d52..996c43c 100644
--- a/sidebar/linkview.h
+++ b/sidebar/linkview.h
@@ -14,7 +14,7 @@ class MediaListBox;
 
 class LinkView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
      LinkView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0);
diff --git a/starter/baghiralinkdrag.h b/starter/baghiralinkdrag.h
index 23dc9c0..d75c399 100644
--- a/starter/baghiralinkdrag.h
+++ b/starter/baghiralinkdrag.h
@@ -6,7 +6,7 @@
 
 class BaghiraLinkDrag : public TQDragObject
 {
-//    Q_OBJECT
+//    TQ_OBJECT
       
 public:
    BaghiraLinkDrag(TQString title, TQString command, TQString icon, int index = -1, TQWidget* dragSource = 0);
diff --git a/starter/menu.h b/starter/menu.h
index aecbc6a..9deea68 100644
--- a/starter/menu.h
+++ b/starter/menu.h
@@ -34,7 +34,7 @@ class Panel : public TQWidget//TQScrollView
 {
    friend class StartMenu;
    friend class StartMenuButton;
-Q_OBJECT
+TQ_OBJECT
       
 public:
    Panel(int size = 32, TQWidget * parent = 0, const char * name = 0);
@@ -79,7 +79,7 @@ class TQTextDrag;
 class StartMenuButton : public TQWidget
 {
    friend class Panel;
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    enum Orientation { Horizontal = 0, Vertical, Status };
@@ -123,7 +123,7 @@ class AppList;
 class StartMenuEntry : public TQWidget
 {
    friend class AppList;
-   Q_OBJECT
+   TQ_OBJECT
 public:
    StartMenuEntry(KService * service, TQString relPath, int size = 32, bool neewbie = false, TQWidget * parent = 0);
    ~StartMenuEntry();
@@ -183,7 +183,7 @@ class HelpDialog;
 class AppList : public TQScrollView
 {
    friend class StartMenu;
-Q_OBJECT
+TQ_OBJECT
 
 public:
    AppList(int size = 32, TQWidget * parent = 0);
@@ -248,7 +248,7 @@ class TQStringList;
 
 class SearchLine : public KLineEdit
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    SearchLine( TQWidget * parent );
    bool blocked;
@@ -270,7 +270,7 @@ class KSqueezedTextLabel;
 class StartMenu : public TQWidget
 {
    friend class starter; // to allow setting the shortcutlis directly
-   Q_OBJECT
+   TQ_OBJECT
 public:
    enum PanelPosition { North = 0, South, West, East, Nowhere };
    StartMenu ( int size = 32, TQWidget * parent = 0, WFlags f = 0 );
diff --git a/starter/starter.h b/starter/starter.h
index 3cbd14a..59634f4 100644
--- a/starter/starter.h
+++ b/starter/starter.h
@@ -24,7 +24,7 @@ class StarterConfig;
 
 class starter : public KPanelApplet, virtual public StarterIface
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     starter(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/style/baghira.h b/style/baghira.h
index 64a3eab..460c448 100644
--- a/style/baghira.h
+++ b/style/baghira.h
@@ -95,7 +95,7 @@ class ButtonTile
 
 class OptionHandler : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    OptionHandler( TQObject *parent );
    void reloadSettings();
@@ -462,7 +462,7 @@ protected:
 
 class EventKiller : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    bool eventFilter( TQObject *, TQEvent *)
    {
@@ -472,7 +472,7 @@ public:
 
 class BMShower : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BMShower(TQObject *parent);
    bool eventFilter( TQObject *object, TQEvent *event );
@@ -493,7 +493,7 @@ public:
 
 class LiquidStyle : public TDEStyle
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    friend class OptionHandler;
    LiquidStyle();