Trinity Qt initial conversion

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

1 files changed, 187 insertions, 187 deletions

diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index 80a3e569..0c86fc63 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -24,14 +24,14 @@
 #include "metadatabase.h"
 #include "layout.h"
 
-#include <qstring.h>
-#include <qrect.h>
-#include <qvaluelist.h>
-#include <qvariant.h>
-#include <qobject.h>
-#include <qlistview.h>
-#include <qptrlist.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqrect.h>
+#include <tqvaluelist.h>
+#include <tqvariant.h>
+#include <tqobject.h>
+#include <tqlistview.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
 
 class QWizard;
 class QTabWidget;
@@ -53,7 +53,7 @@ class QToolBox;
 class Command : public Qt
 {
 public:
-    Command( const QString &n, FormWindow *fw );
+    Command( const TQString &n, FormWindow *fw );
     virtual ~Command();
 
     enum Type {
@@ -103,7 +103,7 @@ public:
     DeleteToolBoxPage
     };
 
-    QString name() const;
+    TQString name() const;
 
     virtual void execute() = 0;
     virtual void unexecute() = 0;
@@ -114,7 +114,7 @@ public:
     FormWindow *formWindow() const;
 
 private:
-    QString cmdName;
+    TQString cmdName;
     FormWindow *formWin;
 
 };
@@ -141,11 +141,11 @@ public slots:
 
 signals:
     void undoRedoChanged( bool undoAvailable, bool redoAvailable,
-			  const QString &undoCmd, const QString &redoCmd );
+			  const TQString &undoCmd, const TQString &redoCmd );
     void modificationChanged( bool m );
 
 private:
-    QPtrList<Command> history;
+    TQPtrList<Command> history;
     int current, steps;
     bool modified;
     int savedAt;
@@ -156,42 +156,42 @@ private:
 class ResizeCommand : public Command
 {
 public:
-    ResizeCommand( const QString &n, FormWindow *fw,
-		   QWidget *w, const QRect &oldr, const QRect &nr );
+    ResizeCommand( const TQString &n, FormWindow *fw,
+		   TQWidget *w, const TQRect &oldr, const TQRect &nr );
 
     void execute();
     void unexecute();
     Type type() const { return Resize; }
 
 private:
-    QWidget *widget;
-    QRect oldRect, newRect;
+    TQWidget *widget;
+    TQRect oldRect, newRect;
 
 };
 
 class InsertCommand : public Command
 {
 public:
-    InsertCommand( const QString &n, FormWindow *fw, QWidget *w, const QRect &g );
+    InsertCommand( const TQString &n, FormWindow *fw, TQWidget *w, const TQRect &g );
 
     void execute();
     void unexecute();
     Type type() const { return Insert; }
 
 private:
-    QWidget *widget;
-    QRect geometry;
+    TQWidget *widget;
+    TQRect geometry;
 
 };
 
 class MoveCommand : public Command
 {
 public:
-    MoveCommand( const QString &n, FormWindow *fw,
-		 const QWidgetList &w,
-		 const QValueList<QPoint> op,
-		 const QValueList<QPoint> np,
-		 QWidget *opr, QWidget *npr );
+    MoveCommand( const TQString &n, FormWindow *fw,
+		 const TQWidgetList &w,
+		 const TQValueList<TQPoint> op,
+		 const TQValueList<TQPoint> np,
+		 TQWidget *opr, TQWidget *npr );
     void execute();
     void unexecute();
     Type type() const { return Move; }
@@ -199,35 +199,35 @@ public:
     bool canMerge( Command *c );
 
 private:
-    QWidgetList widgets;
-    QValueList<QPoint> oldPos, newPos;
-    QWidget *oldParent, *newParent;
+    TQWidgetList widgets;
+    TQValueList<TQPoint> oldPos, newPos;
+    TQWidget *oldParent, *newParent;
 
 };
 
 class DeleteCommand : public Command
 {
 public:
-    DeleteCommand( const QString &n, FormWindow *fw,
-		   const QWidgetList &w );
+    DeleteCommand( const TQString &n, FormWindow *fw,
+		   const TQWidgetList &w );
     void execute();
     void unexecute();
     Type type() const { return Delete; }
 
 private:
-    QWidgetList widgets;
-    QMap< QWidget*, QValueList<MetaDataBase::Connection> > connections;
+    TQWidgetList widgets;
+    TQMap< TQWidget*, TQValueList<MetaDataBase::Connection> > connections;
 
 };
 
 class SetPropertyCommand : public Command
 {
 public:
-    SetPropertyCommand( const QString &n, FormWindow *fw,
-			QObject *w, PropertyEditor *e,
-			const QString &pn, const QVariant &ov,
-			const QVariant &nv, const QString &ncut,
-			const QString &ocut,
+    SetPropertyCommand( const TQString &n, FormWindow *fw,
+			TQObject *w, PropertyEditor *e,
+			const TQString &pn, const TQVariant &ov,
+			const TQVariant &nv, const TQString &ncut,
+			const TQString &ocut,
 			bool reset = FALSE );
 
     void execute();
@@ -238,13 +238,13 @@ public:
     bool checkProperty();
 
 private:
-    void setProperty( const QVariant &v, const QString &currentItemText, bool select = TRUE );
+    void setProperty( const TQVariant &v, const TQString &currentItemText, bool select = TRUE );
 
-    QObject *widget;
+    TQObject *widget;
     PropertyEditor *editor;
-    QString propName;
-    QVariant oldValue, newValue;
-    QString oldCurrentItemText, newCurrentItemText;
+    TQString propName;
+    TQVariant oldValue, newValue;
+    TQString oldCurrentItemText, newCurrentItemText;
     bool wasChanged;
     bool isResetCommand;
 
@@ -253,9 +253,9 @@ private:
 class LayoutHorizontalCommand : public Command
 {
 public:
-    LayoutHorizontalCommand( const QString &n, FormWindow *fw,
-			     QWidget *parent, QWidget *layoutBase,
-			     const QWidgetList &wl );
+    LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
+			     TQWidget *parent, TQWidget *layoutBase,
+			     const TQWidgetList &wl );
 
     void execute();
     void unexecute();
@@ -269,9 +269,9 @@ private:
 class LayoutHorizontalSplitCommand : public Command
 {
 public:
-    LayoutHorizontalSplitCommand( const QString &n, FormWindow *fw,
-				  QWidget *parent, QWidget *layoutBase,
-				  const QWidgetList &wl );
+    LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
+				  TQWidget *parent, TQWidget *layoutBase,
+				  const TQWidgetList &wl );
 
     void execute();
     void unexecute();
@@ -285,9 +285,9 @@ private:
 class LayoutVerticalCommand : public Command
 {
 public:
-    LayoutVerticalCommand( const QString &n, FormWindow *fw,
-			   QWidget *parent, QWidget *layoutBase,
-			   const QWidgetList &wl );
+    LayoutVerticalCommand( const TQString &n, FormWindow *fw,
+			   TQWidget *parent, TQWidget *layoutBase,
+			   const TQWidgetList &wl );
 
     void execute();
     void unexecute();
@@ -301,9 +301,9 @@ private:
 class LayoutVerticalSplitCommand : public Command
 {
 public:
-    LayoutVerticalSplitCommand( const QString &n, FormWindow *fw,
-				QWidget *parent, QWidget *layoutBase,
-				const QWidgetList &wl );
+    LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
+				TQWidget *parent, TQWidget *layoutBase,
+				const TQWidgetList &wl );
 
     void execute();
     void unexecute();
@@ -317,9 +317,9 @@ private:
 class LayoutGridCommand : public Command
 {
 public:
-    LayoutGridCommand( const QString &n, FormWindow *fw,
-		       QWidget *parent, QWidget *layoutBase,
-		       const QWidgetList &wl, int xres, int yres );
+    LayoutGridCommand( const TQString &n, FormWindow *fw,
+		       TQWidget *parent, TQWidget *layoutBase,
+		       const TQWidgetList &wl, int xres, int yres );
 
     void execute();
     void unexecute();
@@ -333,8 +333,8 @@ private:
 class BreakLayoutCommand : public Command
 {
 public:
-    BreakLayoutCommand( const QString &n, FormWindow *fw,
-			QWidget *layoutBase, const QWidgetList &wl );
+    BreakLayoutCommand( const TQString &n, FormWindow *fw,
+			TQWidget *layoutBase, const TQWidgetList &wl );
 
     void execute();
     void unexecute();
@@ -344,183 +344,183 @@ private:
     Layout *layout;
     int spacing;
     int margin;
-    QWidget *lb;
-    QWidgetList widgets;
+    TQWidget *lb;
+    TQWidgetList widgets;
 
 };
 
 class MacroCommand : public Command
 {
 public:
-    MacroCommand( const QString &n, FormWindow *fw,
-		  const QPtrList<Command> &cmds );
+    MacroCommand( const TQString &n, FormWindow *fw,
+		  const TQPtrList<Command> &cmds );
 
     void execute();
     void unexecute();
     Type type() const { return Macro; }
 
 private:
-    QPtrList<Command> commands;
+    TQPtrList<Command> commands;
 
 };
 
 class AddTabPageCommand : public Command
 {
 public:
-    AddTabPageCommand( const QString &n, FormWindow *fw,
-		       QTabWidget *tw, const QString &label );
+    AddTabPageCommand( const TQString &n, FormWindow *fw,
+		       TQTabWidget *tw, const TQString &label );
 
     void execute();
     void unexecute();
     Type type() const { return AddTabPage; }
 
 private:
-    QTabWidget *tabWidget;
+    TQTabWidget *tabWidget;
     int index;
-    QWidget *tabPage;
-    QString tabLabel;
+    TQWidget *tabPage;
+    TQString tabLabel;
 
 };
 
 class DeleteTabPageCommand : public Command
 {
 public:
-    DeleteTabPageCommand( const QString &n, FormWindow *fw,
-			  QTabWidget *tw, QWidget *page );
+    DeleteTabPageCommand( const TQString &n, FormWindow *fw,
+			  TQTabWidget *tw, TQWidget *page );
 
     void execute();
     void unexecute();
     Type type() const { return DeleteTabPage; }
 
 private:
-    QTabWidget *tabWidget;
+    TQTabWidget *tabWidget;
     int index;
-    QWidget *tabPage;
-    QString tabLabel;
+    TQWidget *tabPage;
+    TQString tabLabel;
 
 };
 
 class AddToolBoxPageCommand : public Command
 {
 public:
-    AddToolBoxPageCommand( const QString &n, FormWindow *fw,
-               QToolBox *tw, const QString &label );
+    AddToolBoxPageCommand( const TQString &n, FormWindow *fw,
+               TQToolBox *tw, const TQString &label );
 
     void execute();
     void unexecute();
     Type type() const { return AddToolBoxPage; }
 
 private:
-    QToolBox *toolBox;
+    TQToolBox *toolBox;
     int index;
-    QWidget *page;
-    QString label;
+    TQWidget *page;
+    TQString label;
 
 };
 
 class DeleteToolBoxPageCommand : public Command
 {
 public:
-    DeleteToolBoxPageCommand( const QString &n, FormWindow *fw,
-              QToolBox *tw, QWidget *page );
+    DeleteToolBoxPageCommand( const TQString &n, FormWindow *fw,
+              TQToolBox *tw, TQWidget *page );
 
     void execute();
     void unexecute();
     Type type() const { return DeleteToolBoxPage; }
 
 private:
-    QToolBox *toolBox;
+    TQToolBox *toolBox;
     int index;
-    QWidget *page;
-    QString label;
+    TQWidget *page;
+    TQString label;
 
 };
 class MoveTabPageCommand : public Command
 {
 public:
-    MoveTabPageCommand(const QString &n, FormWindow *fw,
-		       QTabWidget *tw, QWidget *page,  const QString& label, int nIndex, int oIndex );
+    MoveTabPageCommand(const TQString &n, FormWindow *fw,
+		       TQTabWidget *tw, TQWidget *page,  const TQString& label, int nIndex, int oIndex );
 
     void execute();
     void unexecute();
     Type type() const { return MoveTabPage; }
 
 private:
-    QTabWidget *tabWidget;
+    TQTabWidget *tabWidget;
     int newIndex, oldIndex;
-    QWidget *tabPage;
-    QString tabLabel;
+    TQWidget *tabPage;
+    TQString tabLabel;
 
 };
 
 class AddWizardPageCommand : public Command
 {
 public:
-    AddWizardPageCommand( const QString &n, FormWindow *fw,
-			  QWizard *w, const QString &label, int index = -1, bool show = TRUE );
+    AddWizardPageCommand( const TQString &n, FormWindow *fw,
+			  TQWizard *w, const TQString &label, int index = -1, bool show = TRUE );
 
     void execute();
     void unexecute();
     Type type() const { return AddWizardPage; }
 
 private:
-    QWizard *wizard;
+    TQWizard *wizard;
     int index;
     bool show;
-    QWidget *page;
-    QString pageLabel;
+    TQWidget *page;
+    TQString pageLabel;
 
 };
 
 class DeleteWizardPageCommand : public Command
 {
 public:
-    DeleteWizardPageCommand( const QString &n, FormWindow *fw,
-			     QWizard *w, int index, bool show = TRUE );
+    DeleteWizardPageCommand( const TQString &n, FormWindow *fw,
+			     TQWizard *w, int index, bool show = TRUE );
 
     void execute();
     void unexecute();
     Type type() const { return DeleteWizardPage; }
 
 private:
-    QWizard *wizard;
+    TQWizard *wizard;
     int index;
     bool show;
-    QWidget *page;
-    QString pageLabel;
+    TQWidget *page;
+    TQString pageLabel;
 
 };
 
 class RenameWizardPageCommand : public Command
 {
 public:
-    RenameWizardPageCommand( const QString &n, FormWindow *fw,
-			     QWizard *w, int index, const QString& name );
+    RenameWizardPageCommand( const TQString &n, FormWindow *fw,
+			     TQWizard *w, int index, const TQString& name );
 
     void execute();
     void unexecute();
     Type type() const { return RenameWizardPage; }
 
 private:
-    QWizard *wizard;
+    TQWizard *wizard;
     int index;
-    QWidget *page;
-    QString label;
+    TQWidget *page;
+    TQString label;
 
 };
 
 class SwapWizardPagesCommand : public Command
 {
 public:
-    SwapWizardPagesCommand( const QString &n, FormWindow *fw,
-			      QWizard *w, int index1, int index2 );
+    SwapWizardPagesCommand( const TQString &n, FormWindow *fw,
+			      TQWizard *w, int index1, int index2 );
 
     void execute();
     void unexecute();
     Type type() const { return SwapWizardPages; }
 
 private:
-    QWizard *wizard;
+    TQWizard *wizard;
     int index1, index2;
 
 };
@@ -528,7 +528,7 @@ private:
 class AddConnectionCommand : public Command
 {
 public:
-    AddConnectionCommand( const QString &name, FormWindow *fw,
+    AddConnectionCommand( const TQString &name, FormWindow *fw,
 			  MetaDataBase::Connection c );
 
     void execute();
@@ -543,7 +543,7 @@ private:
 class RemoveConnectionCommand : public Command
 {
 public:
-    RemoveConnectionCommand( const QString &name, FormWindow *fw,
+    RemoveConnectionCommand( const TQString &name, FormWindow *fw,
 			     MetaDataBase::Connection c );
 
     void execute();
@@ -558,87 +558,87 @@ private:
 class AddSlotCommand : public Command
 {
 public:
-    AddSlotCommand( const QString &name, FormWindow *fw, const QCString &s, const QString& spec, 
-		    const QString &a, const QString &l, const QString &rt );
+    AddSlotCommand( const TQString &name, FormWindow *fw, const TQCString &s, const TQString& spec, 
+		    const TQString &a, const TQString &l, const TQString &rt );
 
     void execute();
     void unexecute();
     Type type() const { return AddSlot; }
 
 private:
-    QCString slot;
-    QString specifier;
-    QString access;
-    QString language;
-    QString returnType;
+    TQCString slot;
+    TQString specifier;
+    TQString access;
+    TQString language;
+    TQString returnType;
 
 };
 
 class RemoveSlotCommand : public Command
 {
 public:
-    RemoveSlotCommand( const QString &name, FormWindow *fw, const QCString &s, const QString& spec,
-		       const QString &a, const QString &l, const QString &rt );
+    RemoveSlotCommand( const TQString &name, FormWindow *fw, const TQCString &s, const TQString& spec,
+		       const TQString &a, const TQString &l, const TQString &rt );
 
     void execute();
     void unexecute();
     Type type() const { return RemoveSlot; }
 
 private:
-    QCString slot;
-    QString specifier;
-    QString access;
-    QString language;
-    QString returnType;
+    TQCString slot;
+    TQString specifier;
+    TQString access;
+    TQString language;
+    TQString returnType;
 
 };
 
 class LowerCommand : public Command
 {
 public:
-    LowerCommand( const QString &name, FormWindow *fw, const QWidgetList &w );
+    LowerCommand( const TQString &name, FormWindow *fw, const TQWidgetList &w );
 
     void execute();
     void unexecute();
     Type type() const { return Lower; }
 
 private:
-    QWidgetList widgets;
+    TQWidgetList widgets;
 
 };
 
 class RaiseCommand : public Command
 {
 public:
-    RaiseCommand( const QString &name, FormWindow *fw, const QWidgetList &w );
+    RaiseCommand( const TQString &name, FormWindow *fw, const TQWidgetList &w );
 
     void execute();
     void unexecute();
     Type type() const { return Raise; }
 
 private:
-    QWidgetList widgets;
+    TQWidgetList widgets;
 
 };
 
 class PasteCommand : public Command
 {
 public:
-    PasteCommand( const QString &n, FormWindow *fw, const QWidgetList &w );
+    PasteCommand( const TQString &n, FormWindow *fw, const TQWidgetList &w );
 
     void execute();
     void unexecute();
     Type type() const { return Paste; }
 
 private:
-    QWidgetList widgets;
+    TQWidgetList widgets;
 
 };
 
 class TabOrderCommand : public Command
 {
 public:
-    TabOrderCommand( const QString &n, FormWindow *fw, const QWidgetList &ol, const QWidgetList &nl );
+    TabOrderCommand( const TQString &n, FormWindow *fw, const TQWidgetList &ol, const TQWidgetList &nl );
 
     void execute();
     void unexecute();
@@ -647,7 +647,7 @@ public:
     bool canMerge( Command *c );
 
 private:
-    QWidgetList oldOrder, newOrder;
+    TQWidgetList oldOrder, newOrder;
 
 };
 
@@ -656,15 +656,15 @@ class PopulateListBoxCommand : public Command
 public:
     struct Item
     {
-	QString text;
-	QPixmap pix;
+	TQString text;
+	TQPixmap pix;
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Item & ) const { return FALSE; }
 #endif
     };
 
-    PopulateListBoxCommand( const QString &n, FormWindow *fw,
-			    QListBox *lb, const QValueList<Item> &items );
+    PopulateListBoxCommand( const TQString &n, FormWindow *fw,
+			    TQListBox *lb, const TQValueList<Item> &items );
     void execute();
     void unexecute();
     Type type() const { return PopulateListBox; }
@@ -672,8 +672,8 @@ public:
     bool operator==( const PopulateListBoxCommand & ) const;
 
 private:
-    QValueList<Item> oldItems, newItems;
-    QListBox *listbox;
+    TQValueList<Item> oldItems, newItems;
+    TQListBox *listbox;
 
 };
 
@@ -682,15 +682,15 @@ class PopulateIconViewCommand : public Command
 public:
     struct Item
     {
-	QString text;
-	QPixmap pix;
+	TQString text;
+	TQPixmap pix;
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Item & ) const { return FALSE; }
 #endif
     };
 
-    PopulateIconViewCommand( const QString &n, FormWindow *fw,
-			    QIconView *iv, const QValueList<Item> &items );
+    PopulateIconViewCommand( const TQString &n, FormWindow *fw,
+			    TQIconView *iv, const TQValueList<Item> &items );
     void execute();
     void unexecute();
     Type type() const { return PopulateIconView; }
@@ -698,41 +698,41 @@ public:
     bool operator==( const PopulateIconViewCommand & ) const;
 
 private:
-    QValueList<Item> oldItems, newItems;
-    QIconView *iconview;
+    TQValueList<Item> oldItems, newItems;
+    TQIconView *iconview;
 
 };
 
 class PopulateListViewCommand : public Command
 {
 public:
-    PopulateListViewCommand( const QString &n, FormWindow *fw,
-			     QListView *lv, QListView *from );
+    PopulateListViewCommand( const TQString &n, FormWindow *fw,
+			     TQListView *lv, TQListView *from );
     void execute();
     void unexecute();
     Type type() const { return PopulateListView; }
-    static void transferItems( QListView *from, QListView *to );
+    static void transferItems( TQListView *from, TQListView *to );
 
     bool operator==( const PopulateListViewCommand & ) const;
 
 private:
-    QListView *oldItems, *newItems;
-    QListView *listview;
+    TQListView *oldItems, *newItems;
+    TQListView *listview;
 
 };
 
 class PopulateMultiLineEditCommand : public Command
 {
 public:
-    PopulateMultiLineEditCommand( const QString &n, FormWindow *fw,
-				  QMultiLineEdit *mle, const QString &txt );
+    PopulateMultiLineEditCommand( const TQString &n, FormWindow *fw,
+				  TQMultiLineEdit *mle, const TQString &txt );
     void execute();
     void unexecute();
     Type type() const { return PopulateMultiLineEdit; }
 
 private:
-    QString newText, oldText;
-    QMultiLineEdit *mlined;
+    TQString newText, oldText;
+    TQMultiLineEdit *mlined;
     bool wasChanged;
 
 };
@@ -742,8 +742,8 @@ class PopulateTableCommand : public Command
 public:
     struct Row
     {
-	QString text;
-	QPixmap pix;
+	TQString text;
+	TQPixmap pix;
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Row& ) const { return FALSE; }
 #endif
@@ -751,41 +751,41 @@ public:
 
     struct Column
     {
-	QString text;
-	QPixmap pix;
-	QString field;
+	TQString text;
+	TQPixmap pix;
+	TQString field;
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Column& ) const { return FALSE; }
 #endif
     };
 
-    PopulateTableCommand( const QString &n, FormWindow *fw, QTable *t,
-			  const QValueList<Row> &rows,
-			  const QValueList<Column> &columns );
+    PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t,
+			  const TQValueList<Row> &rows,
+			  const TQValueList<Column> &columns );
 
     void execute();
     void unexecute();
     Type type() const { return PopulateTable; }
 
 private:
-    QValueList<Row> oldRows, newRows;
-    QValueList<Column> oldColumns, newColumns;
-    QTable *table;
+    TQValueList<Row> oldRows, newRows;
+    TQValueList<Column> oldColumns, newColumns;
+    TQTable *table;
 
 };
 
 class AddActionToToolBarCommand : public Command
 {
 public:
-    AddActionToToolBarCommand( const QString &n, FormWindow *fw,
-			       QAction *a, QDesignerToolBar *tb, int idx );
+    AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
+			       TQAction *a, QDesignerToolBar *tb, int idx );
 
     void execute();
     void unexecute();
     Type type() const { return AddActionToToolBar; }
 
 private:
-    QAction *action;
+    TQAction *action;
     QDesignerToolBar *toolBar;
     int index;
 
@@ -794,8 +794,8 @@ private:
 class RemoveActionFromToolBarCommand : public AddActionToToolBarCommand
 {
 public:
-    RemoveActionFromToolBarCommand( const QString &n, FormWindow *fw,
-				    QAction *a, QDesignerToolBar *tb, int idx )
+    RemoveActionFromToolBarCommand( const TQString &n, FormWindow *fw,
+				    TQAction *a, QDesignerToolBar *tb, int idx )
 	: AddActionToToolBarCommand( n, fw, a, tb, idx ) {}
 
     void execute() { AddActionToToolBarCommand::unexecute(); }
@@ -807,15 +807,15 @@ public:
 class AddActionToPopupCommand : public Command
 {
 public:
-    AddActionToPopupCommand( const QString &n, FormWindow *fw,
-			       QAction *a, QDesignerPopupMenu *p, int idx );
+    AddActionToPopupCommand( const TQString &n, FormWindow *fw,
+			       TQAction *a, QDesignerPopupMenu *p, int idx );
 
     void execute();
     void unexecute();
     Type type() const { return AddActionToPopup; }
 
 private:
-    QAction *action;
+    TQAction *action;
     QDesignerPopupMenu *popup;
     int index;
 
@@ -824,8 +824,8 @@ private:
 class RemoveActionFromPopupCommand : public AddActionToPopupCommand
 {
 public:
-    RemoveActionFromPopupCommand( const QString &n, FormWindow *fw,
-				    QAction *a, QDesignerPopupMenu *p, int idx )
+    RemoveActionFromPopupCommand( const TQString &n, FormWindow *fw,
+				    TQAction *a, QDesignerPopupMenu *p, int idx )
 	: AddActionToPopupCommand( n, fw, a, p, idx ) {}
 
     void execute() { AddActionToPopupCommand::unexecute(); }
@@ -837,7 +837,7 @@ public:
 class AddMenuCommand : public Command
 {
 public:
-    AddMenuCommand( const QString &n, FormWindow *fw, QMainWindow *mw );
+    AddMenuCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw );
 
     void execute();
     void unexecute();
@@ -846,18 +846,18 @@ public:
 protected:
     QDesignerMenuBar *menuBar;
     QDesignerPopupMenu *popup;
-    QMainWindow *mainWindow;
+    TQMainWindow *mainWindow;
     int id;
     int index;
-    QString name;
+    TQString name;
 
 };
 
 class RemoveMenuCommand : public AddMenuCommand
 {
 public:
-    RemoveMenuCommand( const QString &n, FormWindow *fw, QMainWindow *mw,
-		       QDesignerMenuBar *mb, QDesignerPopupMenu *p, int i, int idx, const QString &mn )
+    RemoveMenuCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw,
+		       QDesignerMenuBar *mb, QDesignerPopupMenu *p, int i, int idx, const TQString &mn )
 	: AddMenuCommand( n, fw, mw ) { menuBar = mb; popup = p; id = i; index = idx, name = mn; }
 
     void execute() { AddMenuCommand::unexecute(); }
@@ -869,8 +869,8 @@ public:
 class RenameMenuCommand : public Command
 {
 public:
-    RenameMenuCommand( const QString &n, FormWindow *fw, QDesignerMenuBar *mb,
-		       int i, const QString &on, const QString &nn );
+    RenameMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
+		       int i, const TQString &on, const TQString &nn );
 
     void execute();
     void unexecute();
@@ -879,15 +879,15 @@ public:
 private:
     QDesignerMenuBar *menuBar;
     int id;
-    QString oldName, newName;
+    TQString oldName, newName;
 
 };
 
 class MoveMenuCommand : public Command
 {
 public:
-    MoveMenuCommand( const QString &n, FormWindow *fw, QDesignerMenuBar *mb,
-		     QDesignerPopupMenu *p, int fidx, int tidx, const QString &txt );
+    MoveMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
+		     QDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt );
 
     void execute();
     void unexecute();
@@ -897,14 +897,14 @@ private:
     QDesignerMenuBar *menuBar;
     QDesignerPopupMenu *popup;
     int fromIdx, toIdx;
-    QString text;
+    TQString text;
 
 };
 
 class AddToolBarCommand : public Command
 {
 public:
-    AddToolBarCommand( const QString &n, FormWindow *fw, QMainWindow *mw );
+    AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw );
 
     void execute();
     void unexecute();
@@ -912,14 +912,14 @@ public:
 
 protected:
     QDesignerToolBar *toolBar;
-    QMainWindow *mainWindow;
+    TQMainWindow *mainWindow;
 
 };
 
 class RemoveToolBarCommand : public AddToolBarCommand
 {
 public:
-    RemoveToolBarCommand( const QString &n, FormWindow *fw, QMainWindow *mw, QDesignerToolBar *tb )
+    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, QDesignerToolBar *tb )
 	: AddToolBarCommand( n, fw, mw ) { toolBar = tb; }
 
     void execute() { AddToolBarCommand::unexecute(); }