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, 20 insertions, 17 deletions

diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h
index 7405ef3a..5145b3b5 100644
--- a/kdevdesigner/designer/hierarchyview.h
+++ b/kdevdesigner/designer/hierarchyview.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.
@@ -31,7 +31,7 @@
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 #include <tqguardedptr.h>
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include "../interfaces/classbrowserinterface.h"
 
 class FormWindow;
@@ -42,7 +42,7 @@ class TQMouseEvent;
 class TQWizard;
 class SourceEditor;
 
-class HierarchyItem : public QListViewItem
+class HierarchyItem : public TQListViewItem
 {
 public:
     enum Type {
@@ -68,9 +68,9 @@ public:
 	Variable
     };
 
-    HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
+    HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
 		   const TQString &txt1, const TQString &txt2, const TQString &txt3 );
-    HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
+    HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
 		   const TQString &txt1, const TQString &txt2, const TQString &txt3 );
 
     void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -95,12 +95,13 @@ private:
 
 };
 
-class HierarchyList : public QListView
+class HierarchyList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE );
+    HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE );
 
     virtual void setup();
     virtual void setCurrent( TQObject *o );
@@ -116,7 +117,7 @@ public:
 	TQListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
     }
 
-    void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString::null );
+    void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString() );
 
 protected:
     void keyPressEvent( TQKeyEvent *e );
@@ -129,7 +130,7 @@ public slots:
     void removeTabPage();
 
 private:
-    void insertObject( TQObject *o, TQListViewItem *parent );
+    void insertObject( TQObject *o, TQListViewItem *tqparent );
     TQObject *findObject( TQListViewItem *i );
     TQListViewItem *findItem( TQObject *o );
     TQObject *current() const;
@@ -155,9 +156,10 @@ protected:
 class FormDefinitionView : public HierarchyList
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FormDefinitionView( TQWidget *parent, FormWindow *fw );
+    FormDefinitionView( TQWidget *tqparent, FormWindow *fw );
 
     void setup();
     void setupVariables();
@@ -185,12 +187,13 @@ private:
 };
 
 
-class HierarchyView : public QTabWidget
+class HierarchyView : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HierarchyView( TQWidget *parent );
+    HierarchyView( TQWidget *tqparent );
     ~HierarchyView();
 
     void setFormWindow( FormWindow *fw, TQObject *o );
@@ -232,9 +235,9 @@ private:
 	ClassBrowser( TQListView * = 0, ClassBrowserInterface * = 0 );
 	~ClassBrowser();
 	TQListView *lv;
-	QInterfacePtr<ClassBrowserInterface> iface;
+	TQInterfacePtr<ClassBrowserInterface> iface;
 
-	Q_DUMMY_COMPARISON_OPERATOR( ClassBrowser )
+	TQ_DUMMY_COMPARISON_OPERATOR( ClassBrowser )
     };
     FormWindow *formwindow;
     HierarchyList *listview;