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, 47 insertions, 39 deletions

diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h
index af5a76e5..5d1c314d 100644
--- a/kommander/editor/actiondnd.h
+++ b/kommander/editor/actiondnd.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -30,20 +30,21 @@
 #include <tqtoolbar.h>
 #include <tqguardedptr.h>
 
-class QDesignerPopupMenu;
-class QDesignerIndicatorWidget;
+class TQDesignerPopupMenu;
+class TQDesignerIndicatorWidget;
 class FormWindow;
 
-class QDesignerActionGroup : public QActionGroup
+class TQDesignerActionGroup : public TQActionGroup
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerActionGroup( TQObject *parent )
-	: TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {}
+    TQDesignerActionGroup( TQObject *tqparent )
+	: TQActionGroup( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ) {}
 
     TQWidget *widget() const { return wid; }
-    TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); }
+    TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); }
     int index() const { return idx; }
 
 protected:
@@ -64,15 +65,16 @@ private:
 
 };
 
-class QDesignerAction : public QAction
+class TQDesignerAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerAction( TQObject *parent )
-	: TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {}
-    QDesignerAction( TQWidget *w, TQObject *parent )
-	: TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {}
+    TQDesignerAction( TQObject *tqparent )
+	: TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {}
+    TQDesignerAction( TQWidget *w, TQObject *tqparent )
+	: TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {}
 
     TQWidget *widget() const { return wid; }
     int index() const { return idx; }
@@ -98,31 +100,33 @@ private:
 
 };
 
-class QDesignerToolBarSeparator : public QWidget
+class TQDesignerToolBarSeparator : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
+    TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
 
-    TQSize sizeHint() const;
-    Orientation orientation() const { return orient; }
+    TQSize tqsizeHint() const;
+    Qt::Orientation orientation() const { return orient; }
 public slots:
-   void setOrientation( Orientation );
+   void setOrientation( Qt::Orientation );
 protected:
     void styleChange( TQStyle& );
     void paintEvent( TQPaintEvent * );
 private:
-    Orientation orient;
+    Qt::Orientation orient;
 };
 
 
-class QSeparatorAction : public QAction
+class TQSeparatorAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QSeparatorAction( TQObject *parent );
+    TQSeparatorAction( TQObject *tqparent );
 
     bool addTo( TQWidget *w );
     bool removeFrom( TQWidget *w );
@@ -135,13 +139,14 @@ private:
 
 };
 
-class QDesignerToolBar : public QToolBar
+class TQDesignerToolBar : public TQToolBar
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerToolBar( TQMainWindow *mw );
-    QDesignerToolBar( TQMainWindow *mw, Dock dock );
+    TQDesignerToolBar( TQMainWindow *mw );
+    TQDesignerToolBar( TQMainWindow *mw, Dock dock );
     TQPtrList<TQAction> insertedActions() const { return actionList; }
     void addAction( TQAction *a );
 
@@ -157,7 +162,7 @@ public:
 protected:
     bool eventFilter( TQObject *, TQEvent * );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -187,23 +192,24 @@ private:
     TQPtrList<TQAction> actionList;
     TQMap<TQWidget*, TQAction*> actionMap;
     TQPoint dragStartPos;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     bool widgetInserting;
     FormWindow *formWindow;
 
 };
 
-class QDesignerMenuBar : public QMenuBar
+class TQDesignerMenuBar : public TQMenuBar
 {
     Q_OBJECT
-    friend class QDesignerPopupMenu;
+  TQ_OBJECT
+    friend class TQDesignerPopupMenu;
 
-    Q_PROPERTY( int itemNumber WRITE setItemNumber READ itemNumber )
-    Q_PROPERTY( TQString itemText WRITE setItemText READ itemText )
-    Q_PROPERTY( TQCString itemName WRITE setItemName READ itemName )
+    TQ_PROPERTY( int itemNumber WRITE setItemNumber READ itemNumber )
+    TQ_PROPERTY( TQString itemText WRITE setItemText READ itemText )
+    TQ_PROPERTY( TQCString itemName WRITE setItemName READ itemName )
 
 public:
-    QDesignerMenuBar( TQWidget *mw );
+    TQDesignerMenuBar( TQWidget *mw );
 
     void setItemNumber( int num );
     int itemNumber() const;
@@ -217,7 +223,7 @@ protected:
     void mouseMoveEvent( TQMouseEvent *e );
     void mouseReleaseEvent( TQMouseEvent *e );
     void contextMenuEvent( TQContextMenuEvent *e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -235,18 +241,19 @@ private:
     bool mousePressed;
     TQPoint lastIndicatorPos;
     int insertAt;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     FormWindow *formWindow;
     int oldPos;
 
 };
 
-class QDesignerPopupMenu : public QPopupMenu
+class TQDesignerPopupMenu : public TQPopupMenu
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerPopupMenu( TQWidget *w );
+    TQDesignerPopupMenu( TQWidget *w );
     TQPtrList<TQAction> insertedActions() const { return actionList; }
     void addAction( TQAction *a );
     void reInsert();
@@ -259,7 +266,7 @@ protected:
     void mouseReleaseEvent( TQMouseEvent *e );
     void contextMenuEvent( TQContextMenuEvent *e );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -281,7 +288,7 @@ private:
     TQPtrList<TQAction> actionList;
     TQPoint dragStartPos;
     bool mousePressed;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     FormWindow *formWindow;
     TQGuardedPtr<TQPopupMenu> popupMenu;
     TQPoint popupPos;
@@ -289,12 +296,13 @@ private:
 
 };
 
-class QDesignerIndicatorWidget : public QWidget
+class TQDesignerIndicatorWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerIndicatorWidget( TQWidget *p )
+    TQDesignerIndicatorWidget( TQWidget *p )
 	: TQWidget( p, "qt_dockwidget_internal" ) {
 	    setBackgroundColor( red );
     }