TQt4 port piklab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 14 insertions, 12 deletions

diff --git a/src/common/gui/container.h b/src/common/gui/container.h
index d718c6f..e64d143 100644
--- a/src/common/gui/container.h
+++ b/src/common/gui/container.h
@@ -9,24 +9,25 @@
 #ifndef CONTAINER_H
 #define CONTAINER_H
 
-#include <qframe.h>
-#include <qwidgetstack.h>
-#include <qtabwidget.h>
-#include <qlayout.h>
+#include <tqframe.h>
+#include <tqwidgetstack.h>
+#include <tqtabwidget.h>
+#include <tqlayout.h>
 
 class PopupButton;
 
 //----------------------------------------------------------------------------
-class Container : public QFrame
+class Container : public TQFrame
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   enum Type { Flat, Sunken };
-  Container(QWidget *parent = 0, Type type = Flat);
-  Container(QWidgetStack *stack, uint index, Type type = Flat);
-  Container(QTabWidget *tabw, const QString &title, Type type = Flat);
-  void addWidget(QWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0);
-  void addLayout(QLayout *layout, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0);
+  Container(TQWidget *tqparent = 0, Type type = Flat);
+  Container(TQWidgetStack *stack, uint index, Type type = Flat);
+  Container(TQTabWidget *tabw, const TQString &title, Type type = Flat);
+  void addWidget(TQWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment = 0);
+  void addLayout(TQLayout *tqlayout, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment = 0);
   uint numRows() const { return _gridLayout->numRows(); }
   uint numCols() const { return _gridLayout->numCols(); }
   void setFrame(Type type);
@@ -38,7 +39,7 @@ public:
 
 private:
   Type         _type;
-  QGridLayout *_topLayout, *_gridLayout;
+  TQGridLayout *_topLayout, *_gridLayout;
 
   void initLayout();
 };
@@ -47,8 +48,9 @@ private:
 class ButtonContainer : public Container
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  ButtonContainer(const QString &title, QWidget *parent);
+  ButtonContainer(const TQString &title, TQWidget *tqparent);
   PopupButton &button() { return *_button; }
 
 private: