1 files changed, 33 insertions, 33 deletions

diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index 06dce7ac..e9874ca6 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -21,12 +21,12 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
-#include <qwidget.h>
-#include <qmap.h>
-#include <qguardedptr.h>
-#include <qobject.h>
-#include <qlayout.h>
-#include <qwidgetlist.h>
+#include <tqwidget.h>
+#include <tqmap.h>
+#include <tqguardedptr.h>
+#include <tqobject.h>
+#include <tqlayout.h>
+#include <tqwidgetlist.h>
 
 class FormWindow;
 class QPaintEvent;
@@ -36,23 +36,23 @@ class Layout : public QObject
     Q_OBJECT
 
 public:
-    Layout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+    Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
     virtual ~Layout() {}
 
     virtual void doLayout() = 0;
     virtual void undoLayout();
     virtual void breakLayout();
     virtual bool prepareLayout( bool &needMove, bool &needReparent );
-    virtual void finishLayout( bool needMove, QLayout *layout );
+    virtual void finishLayout( bool needMove, TQLayout *layout );
 
 protected:
-    QWidgetList widgets;
-    QWidget *parent;
-    QPoint startPoint;
-    QMap<QGuardedPtr<QWidget>, QRect> geometries;
-    QWidget *layoutBase;
+    TQWidgetList widgets;
+    TQWidget *parent;
+    TQPoint startPoint;
+    TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
+    TQWidget *layoutBase;
     FormWindow *formWindow;
-    QRect oldGeometry;
+    TQRect oldGeometry;
     bool isBreak;
     bool useSplitter;
 
@@ -67,7 +67,7 @@ protected slots:
 class HorizontalLayout : public Layout
 {
 public:
-    HorizontalLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *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();
 
@@ -79,7 +79,7 @@ protected:
 class VerticalLayout : public Layout
 {
 public:
-    VerticalLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *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();
 
@@ -93,7 +93,7 @@ class Grid;
 class GridLayout : public Layout
 {
 public:
-    GridLayout( const QWidgetList &wl, QWidget *p, FormWindow *fw, QWidget *lb, const QSize &res, bool doSetup = TRUE );
+    GridLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, const TQSize &res, bool doSetup = TRUE );
     ~GridLayout();
 
     void doLayout();
@@ -103,7 +103,7 @@ protected:
 
 protected:
     void buildGrid();
-    QSize resolution;
+    TQSize resolution;
     Grid* grid;
 
 };
@@ -112,12 +112,12 @@ class Spacer : public QWidget
 {
     Q_OBJECT
 
-    Q_OVERRIDE( QCString name )
+    Q_OVERRIDE( TQCString name )
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_ENUMS( SizeType )
     Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
-    Q_PROPERTY( QSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
-    Q_OVERRIDE( QRect geometry DESIGNABLE false )
+    Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+    Q_OVERRIDE( TQRect geometry DESIGNABLE false )
 
 private:
     enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -131,36 +131,36 @@ public:
 		    MinimumExpanding = Minimum|ExpMask,
 		    Expanding = MinimumExpanding|MayShrink };
 
-    Spacer( QWidget *parent, const char *name );
+    Spacer( TQWidget *parent, const char *name );
 
-    QSize minimumSize() const;
-    QSize sizeHint() const;
+    TQSize minimumSize() const;
+    TQSize sizeHint() const;
     void setSizeType( SizeType t );
     SizeType sizeType() const;
     int alignment() const;
     Orientation orientation() const;
     void setOrientation( Orientation o );
     void setInteraciveMode( bool b ) { interactive = b; };
-    void setSizeHint( const QSize &s );
+    void setSizeHint( const TQSize &s );
 
 protected:
-    void paintEvent( QPaintEvent *e );
-    void resizeEvent( QResizeEvent* e );
+    void paintEvent( TQPaintEvent *e );
+    void resizeEvent( TQResizeEvent* e );
     void updateMask();
     Qt::Orientation orient;
     bool interactive;
-    QSize sh;
+    TQSize sh;
 };
 
 class QDesignerGridLayout : public QGridLayout
 {
    Q_OBJECT
 public:
-    QDesignerGridLayout( QWidget *parent ) : QGridLayout( parent ){};
-    QDesignerGridLayout( QLayout *parentLayout ) : QGridLayout( parentLayout ){};
+    QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){};
+    QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
 
-    void addWidget( QWidget *, int row, int col, int align = 0 );
-    void addMultiCellWidget( QWidget *, int fromRow, int toRow,
+    void addWidget( TQWidget *, int row, int col, int align = 0 );
+    void addMultiCellWidget( TQWidget *, int fromRow, int toRow,
 			       int fromCol, int toCol, int align = 0 );
 
     struct Item
@@ -173,7 +173,7 @@ public:
 	int colspan;
     };
 
-    QMap<QWidget*, Item> items;
+    TQMap<TQWidget*, Item> items;
 };