TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 6 deletions

diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index 1f4a9346..a8ac770e 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  This file may be distributed and/or modified under the terms of the
  GNU General Public License version 2 as published by the Free Software
@@ -53,7 +53,7 @@ class MessageLog;
 class ReplaceDialog;
 class Workspace;
 
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include <tqtoolbar.h>
 #else
 class TQToolBar;
@@ -68,6 +68,7 @@ namespace KParts {
 class MainWindow : public KParts::DockMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MainWindow( bool asClient );
@@ -93,8 +94,8 @@ public:
     void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw );
     void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w );
 
-    TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent );
-    TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot );
+    TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent );
+    TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot );
 
     FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 );
     
@@ -255,7 +256,7 @@ private:
     TQWorkspace *qworkspace;
     KMenuBar *menubar;
     FormWindow *lastActiveFormWindow;
-    bool breakLayout, layoutChilds, layoutSelected;
+    bool breakLayout, tqlayoutChilds, tqlayoutSelected;
     TQPoint grd;
     bool sGrid, snGrid;
     bool restoreConfig;
@@ -279,7 +280,7 @@ private:
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *windowMenu, *fileMenu;
 
-    TQToolBar *layoutToolBar;
+    TQToolBar *tqlayoutToolBar;
     KToolBar *fileTb;
 
     Preferences *prefDia;