1 files changed, 30 insertions, 27 deletions

diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index 23fff02b..67061595 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.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.
@@ -38,9 +38,10 @@
 class FormWindow;
 class TQPaintEvent;
 
-class Layout : public QObject
+class Layout : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
@@ -49,15 +50,15 @@ public:
     virtual void doLayout() = 0;
     virtual void undoLayout();
     virtual void breakLayout();
-    virtual bool prepareLayout( bool &needMove, bool &needReparent );
-    virtual void finishLayout( bool needMove, TQLayout *layout );
+    virtual bool prepareLayout( bool &needMove, bool &needRetqparent );
+    virtual void finishLayout( bool needMove, TQLayout *tqlayout );
 
 protected:
     TQWidgetList widgets;
-    TQWidget *parent;
+    TQWidget *tqparent;
     TQPoint startPoint;
     TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
-    TQWidget *layoutBase;
+    TQWidget *tqlayoutBase;
     FormWindow *formWindow;
     TQRect oldGeometry;
     bool isBreak;
@@ -74,7 +75,7 @@ protected slots:
 class HorizontalLayout : public Layout
 {
 public:
-    HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+   HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
 
     void doLayout();
 
@@ -86,7 +87,7 @@ protected:
 class VerticalLayout : public Layout
 {
 public:
-    VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+   VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
 
     void doLayout();
 
@@ -115,16 +116,17 @@ protected:
 
 };
 
-class Spacer : public QWidget
+class Spacer : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_OVERRIDE( TQCString name )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_OVERRIDE( TQCString name )
+    TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
     Q_ENUMS( SizeType )
-    Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
-    Q_OVERRIDE( TQRect geometry DESIGNABLE false )
+    TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
+    TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+    TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
 
 private:
     enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -138,15 +140,15 @@ public:
 		    MinimumExpanding = Minimum|ExpMask,
 		    Expanding = MinimumExpanding|MayShrink };
 
-    Spacer( TQWidget *parent, const char *name );
+    Spacer( TQWidget *tqparent, const char *name );
 
-    TQSize minimumSize() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSize() const;
+    TQSize tqsizeHint() const;
     void setSizeType( SizeType t );
     SizeType sizeType() const;
-    int alignment() const;
-    Orientation orientation() const;
-    void setOrientation( Orientation o );
+    int tqalignment() const;
+    Qt::Orientation orientation() const;
+    void setOrientation( Qt::Orientation o );
     void setInteraciveMode( bool b ) { interactive = b; };
     void setSizeHint( const TQSize &s );
 
@@ -159,12 +161,13 @@ protected:
     TQSize sh;
 };
 
-class QDesignerGridLayout : public QGridLayout
+class TQDesignerGridLayout : public TQGridLayout
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-    QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){};
-    QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
+    TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
+    TQDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
 
     void addWidget( TQWidget *, int row, int col, int align = 0 );
     void addMultiCellWidget( TQWidget *, int fromRow, int toRow,
@@ -178,7 +181,7 @@ public:
 	int column;
 	int rowspan;
 	int colspan;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     TQMap<TQWidget*, Item> items;