TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


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

1 files changed, 37 insertions, 35 deletions

diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h
index a5db52df..a33c5e25 100644
--- a/kdevdesigner/designer/mainwindow.h
+++ b/kdevdesigner/designer/mainwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** 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
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,7 +43,7 @@
 #include <tqmainwindow.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqobjectlist.h>
 
 class TQToolBox;
@@ -65,10 +65,10 @@ class ReplaceDialog;
 class GotoLineDialog;
 class SourceFile;
 class FormFile;
-class QAssistantClient;
+class TQAssistantClient;
 class DesignerAction;
 
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include <tqtoolbar.h>
 #else
 class TQToolBar;
@@ -77,9 +77,10 @@ class Preferences;
 
 class KDevDesignerPart;
 
-class MainWindow : public QMainWindow
+class MainWindow : public TQMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum LineMode { Error, Step, StackFrame };
@@ -108,8 +109,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 );
     bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
@@ -138,7 +139,7 @@ public:
     TemplateWizardInterface* templateWizardInterface( const TQString& className );
     TQStringList sourceTemplates() const;
     SourceTemplateInterface* sourceTemplateInterface( const TQString& templ );
-    QUnknownInterface* designerInterface() const { return desInterface; }
+    TQUnknownInterface* designerInterface() const { return desInterface; }
     TQPtrList<DesignerProject> projectList() const;
     TQStringList projectNames() const;
     TQStringList projectFileNames() const;
@@ -186,7 +187,7 @@ public:
     void setPluginDirectory( const TQString &pd );
     TQString pluginDirectory() const { return pluginDir; }
 
-    QAssistantClient* assistantClient() const { return assistant; }
+    TQAssistantClient* assistantClient() const { return assistant; }
 
     void addRecentlyOpenedFile( const TQString &fn ) { addRecentlyOpened( fn, recentlyFiles ); }
 
@@ -264,8 +265,8 @@ public slots:
     SourceEditor *editSource( SourceFile *f );
     SourceEditor *openSourceEditor();
     SourceEditor *createSourceEditor( TQObject *object, Project *project,
-				      const TQString &lang = TQString::null,
-				      const TQString &func = TQString::null,
+				      const TQString &lang = TQString(),
+				      const TQString &func = TQString(),
 				      bool rereadSource = FALSE );
     void editFormSettings();
     void editProjectSettings();
@@ -291,7 +292,7 @@ public slots:
     void helpContents();
     void helpManual();
     void helpAbout();
-    void helpAboutQt();
+    void helpAboutTQt();
     void helpRegister();
 
 private slots:
@@ -374,7 +375,7 @@ private:
 	TQString title;
 	TQObject *receiver;
 	const char *init_slot, *accept_slot;
-	Q_DUMMY_COMPARISON_OPERATOR( Tab )
+	TQ_DUMMY_COMPARISON_OPERATOR( Tab )
     };
 
 private:
@@ -385,7 +386,7 @@ private:
     TQWorkspace *qworkspace;
     TQMenuBar *menubar;
     TQGuardedPtr<FormWindow> lastActiveFormWindow;
-    bool breakLayout, layoutChilds, layoutSelected;
+    bool breakLayout, tqlayoutChilds, tqlayoutSelected;
     TQPoint grd;
     bool sGrid, snGrid;
     bool restoreConfig;
@@ -405,9 +406,9 @@ private:
     TQActionGroup *actionGroupTools, *actionGroupProjects;
     TQAction* actionPointerTool, *actionConnectTool, *actionOrderTool, *actionBuddyTool;
     TQAction* actionCurrentTool;
-    DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutQt, *actionHelpWhatsThis;
+    DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutTQt, *actionHelpWhatsThis;
     DesignerAction *actionHelpManual;
-#if defined(QT_NON_COMMERCIAL)
+#if defined(TQT_NON_COMMERCIAL)
     DesignerAction *actionHelpRegister;
 #endif
     DesignerAction *actionToolsCustomWidget, *actionEditPreferences;
@@ -424,8 +425,8 @@ private:
     TQPopupMenu *rmbWidgets;
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *customWidgetMenu, *windowMenu, *fileMenu, *recentlyFilesMenu, *recentlyProjectsMenu;
-    TQPopupMenu *toolsMenu, *layoutMenu, *previewMenu;
-    TQToolBar *customWidgetToolBar, *layoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
+    TQPopupMenu *toolsMenu, *tqlayoutMenu, *previewMenu;
+    TQToolBar *customWidgetToolBar, *tqlayoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
     TQToolBar *commonWidgetsToolBar;
     TQPtrList<TQToolBar> widgetToolBars;
 
@@ -435,16 +436,16 @@ private:
     TQString templPath;
     ActionEditor *actionEditor;
     Project *currentProject;
-    QPluginManager<ActionInterface> *actionPluginManager;
-    QPluginManager<EditorInterface> *editorPluginManager;
-    QPluginManager<TemplateWizardInterface> *templateWizardPluginManager;
-    QPluginManager<InterpreterInterface> *interpreterPluginManager;
-    QPluginManager<PreferenceInterface> *preferencePluginManager;
-    QPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
-    QPluginManager<SourceTemplateInterface> *sourceTemplatePluginManager;
+    TQPluginManager<ActionInterface> *actionPluginManager;
+    TQPluginManager<EditorInterface> *editorPluginManager;
+    TQPluginManager<TemplateWizardInterface> *templateWizardPluginManager;
+    TQPluginManager<InterpreterInterface> *interpreterPluginManager;
+    TQPluginManager<PreferenceInterface> *preferencePluginManager;
+    TQPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
+    TQPluginManager<SourceTemplateInterface> *sourceTemplatePluginManager;
     TQPtrList<SourceEditor> sourceEditors;
     bool previewing;
-    QUnknownInterface *desInterface;
+    TQUnknownInterface *desInterface;
     TQStringList recentlyFiles;
     TQStringList recentlyProjects;
     OutputWindow *oWindow;
@@ -472,7 +473,7 @@ private:
     uint guiStuffVisible : 1;
     uint editorsReadOnly : 1;
     uint savePluginPaths : 1;
-    QAssistantClient *assistant;
+    TQAssistantClient *assistant;
     bool shStartDialog;
     TQString pluginDir;
     bool sSignalHandlers;
@@ -487,12 +488,13 @@ public:
 friend class KDevDesignerPart;
 };
 
-class SenderObject : public QObject
+class SenderObject : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SenderObject( QUnknownInterface *i ) : iface( i ) { iface->addRef(); }
+    SenderObject( TQUnknownInterface *i ) : iface( i ) { iface->addRef(); }
     ~SenderObject() { iface->release(); }
 
 public slots:
@@ -500,11 +502,11 @@ public slots:
     void emitAcceptSignal() { emit acceptSignal( iface ); }
 
 signals:
-    void initSignal( QUnknownInterface * );
-    void acceptSignal( QUnknownInterface * );
+    void initSignal( TQUnknownInterface * );
+    void acceptSignal( TQUnknownInterface * );
 
 private:
-    QUnknownInterface *iface;
+    TQUnknownInterface *iface;
 
 };