1 files changed, 42 insertions, 42 deletions

diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index c8dc2b63..699420c3 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -27,8 +27,8 @@
 #ifndef MENUBAREDITOR_H
 #define MENUBAREDITOR_H
 
-#include <qmenubar.h>
-#include <qptrlist.h>
+#include <tqmenubar.h>
+#include <tqptrlist.h>
 
 class PopupMenuEditor;
 class MenuBarEditor;
@@ -40,21 +40,21 @@ class MenuBarEditorItem : public QObject
 
     friend class MenuBarEditor;
 
-    MenuBarEditorItem( MenuBarEditor * bar = 0, QObject * parent = 0, const char * name = 0 );
+    MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 );
     
 public:
     MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
-		       QObject * parent = 0, const char * name = 0);
-    MenuBarEditorItem( QActionGroup * actionGroup, MenuBarEditor * bar,
-		       QObject * parent = 0, const char * name = 0);
+		       TQObject * parent = 0, const char * name = 0);
+    MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
+		       TQObject * parent = 0, const char * name = 0);
     MenuBarEditorItem( MenuBarEditorItem * item,
-		       QObject * parent = 0, const char * name = 0);
+		       TQObject * parent = 0, const char * name = 0);
     ~MenuBarEditorItem() { };
 
     PopupMenuEditor * menu() { return popupMenu; }
 
-    void setMenuText( const QString t ) { text = t; };
-    QString menuText() { return text; }
+    void setMenuText( const TQString t ) { text = t; };
+    TQString menuText() { return text; }
 
     void setVisible( bool enable ) { visible = enable; }
     bool isVisible() { return visible; }
@@ -69,7 +69,7 @@ protected:
 private:
     MenuBarEditor * menuBar;
     PopupMenuEditor * popupMenu;
-    QString text;
+    TQString text;
     uint visible : 1;
     uint separator : 1;
     uint removable : 1;
@@ -83,15 +83,15 @@ class MenuBarEditor : public QMenuBar
     Q_OBJECT
     
 public:
-    MenuBarEditor( FormWindow * fw, QWidget * parent = 0, const char * name = 0 );
+    MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
     ~MenuBarEditor();
 
     FormWindow * formWindow();
 
     MenuBarEditorItem * createItem( int index = -1, bool addToCmdStack = TRUE );
     void insertItem( MenuBarEditorItem * item, int index = -1 );
-    void insertItem( QString text, PopupMenuEditor * menu, int index = -1 );
-    void insertItem( QString text, QActionGroup * group, int index = -1 );
+    void insertItem( TQString text, PopupMenuEditor * menu, int index = -1 );
+    void insertItem( TQString text, TQActionGroup * group, int index = -1 );
 
     void insertSeparator( int index = -1 );
     
@@ -100,7 +100,7 @@ public:
     
     int findItem( MenuBarEditorItem * item );
     int findItem( PopupMenuEditor * menu );
-    int findItem( QPoint & pos );
+    int findItem( TQPoint & pos );
     
     MenuBarEditorItem * item( int index = -1 );
 
@@ -118,14 +118,14 @@ public:
     void focusItem( int index = -1 );
     void deleteItem( int index = -1 );
 
-    QSize sizeHint() const;
-    QSize minimumSize() const { return sizeHint(); }
-    QSize minimumSizeHint() const { return sizeHint(); }
+    TQSize sizeHint() const;
+    TQSize minimumSize() const { return sizeHint(); }
+    TQSize minimumSizeHint() const { return sizeHint(); }
     int heightForWidth( int max_width ) const;
 
     void show();
 
-    void checkAccels( QMap<QChar, QWidgetList > &accels );
+    void checkAccels( TQMap<TQChar, TQWidgetList > &accels );
 
 public slots:
     void cut();
@@ -133,31 +133,31 @@ public slots:
     void paste();
     
 protected:
-    bool eventFilter( QObject * o, QEvent * e );
-    void paintEvent( QPaintEvent * e );
-    void mousePressEvent( QMouseEvent * e );
-    void mouseDoubleClickEvent( QMouseEvent * e );
-    void mouseMoveEvent( QMouseEvent * e );
-    void dragEnterEvent( QDragEnterEvent * e );
-    void dragLeaveEvent( QDragLeaveEvent * e );
-    void dragMoveEvent( QDragMoveEvent * e );
-    void dropEvent( QDropEvent * e );
-    void keyPressEvent( QKeyEvent * e );
-    void focusOutEvent( QFocusEvent * e );
-    void resizeEvent( QResizeEvent * e ) { QFrame::resizeEvent( e ); }
+    bool eventFilter( TQObject * o, TQEvent * e );
+    void paintEvent( TQPaintEvent * e );
+    void mousePressEvent( TQMouseEvent * e );
+    void mouseDoubleClickEvent( TQMouseEvent * e );
+    void mouseMoveEvent( TQMouseEvent * e );
+    void dragEnterEvent( TQDragEnterEvent * e );
+    void dragLeaveEvent( TQDragLeaveEvent * e );
+    void dragMoveEvent( TQDragMoveEvent * e );
+    void dropEvent( TQDropEvent * e );
+    void keyPressEvent( TQKeyEvent * e );
+    void focusOutEvent( TQFocusEvent * e );
+    void resizeEvent( TQResizeEvent * e ) { TQFrame::resizeEvent( e ); }
 
     void resizeInternals();
     
-    void drawItems( QPainter & p );
-    void drawItem( QPainter & p, MenuBarEditorItem * i, int idx, QPoint & pos );
-    void drawSeparator( QPainter & p, QPoint & pos );
+    void drawItems( TQPainter & p );
+    void drawItem( TQPainter & p, MenuBarEditorItem * i, int idx, TQPoint & pos );
+    void drawSeparator( TQPainter & p, TQPoint & pos );
     
-    QSize itemSize( MenuBarEditorItem * i );
+    TQSize itemSize( MenuBarEditorItem * i );
     void addItemSizeToCoords( MenuBarEditorItem * i, int & x, int & y, int w );
 
-    QPoint itemPos( int index );
-    QPoint snapToItem( const QPoint & pos );
-    void dropInPlace( MenuBarEditorItem * i, const QPoint & pos );
+    TQPoint itemPos( int index );
+    TQPoint snapToItem( const TQPoint & pos );
+    void dropInPlace( MenuBarEditorItem * i, const TQPoint & pos );
 
     void safeDec();
     void safeInc();
@@ -167,18 +167,18 @@ protected:
     void enterEditMode();
     void leaveEditMode();
 
-    QPixmap createTextPixmap( const QString &text );
+    TQPixmap createTextPixmap( const TQString &text );
     int borderSize() const { return margin() + 4; } // add 4 pixels to the margin
     
 private:
     FormWindow * formWnd;
-    QLineEdit * lineEdit;
-    QWidget * dropLine;
-    QPtrList<MenuBarEditorItem> itemList;
+    TQLineEdit * lineEdit;
+    TQWidget * dropLine;
+    TQPtrList<MenuBarEditorItem> itemList;
     MenuBarEditorItem addItem;
     MenuBarEditorItem addSeparator;
     MenuBarEditorItem * draggedItem;
-    QPoint mousePressPos;
+    TQPoint mousePressPos;
     int currentIndex;
     int itemHeight;
     int separatorWidth;