TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1 files changed, 15 insertions, 12 deletions

diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
index 575c3c65..39f701af 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
@@ -51,22 +51,23 @@ class KMultiTabBarInternal;
  * should be raisable is left to the "user".
  *@author Joseph Wenninger
  */
-class KUTILS_EXPORT KMultiTabBar: public QWidget
+class KUTILS_EXPORT KMultiTabBar: public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	enum KMultiTabBarMode{Horizontal, Vertical};
+	enum KMultiTabBarMode{Horizontal,Vertical};
 	enum KMultiTabBarPosition{Left, Right, Top, Bottom};
 
 	/**
 	 * VSNET == Visual Studio .Net like (only show the text of active tabs
 	 * KDEV3 == Kdevelop 3 like (always show the text)
-	 * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled
+	 * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled
 	 * 	at the moment, but will be renabled soon too
 	 */
-	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
+	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
 
-	KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0);
+	KMultiTabBar(KMultiTabBarMode bm,TQWidget *tqparent=0,const char *name=0);
 	virtual ~KMultiTabBar();
 
 	/**
@@ -78,7 +79,7 @@ public:
 	 * @param popup A popup menu which should be displayed if the button is clicked
 	 * @param not_used_yet will be used for a popup text in the future
 	 */
- 	int appendButton(const TQPixmap &pic,int id=-1,TQPopupMenu* popup=0,const TQString& not_used_yet=TQString::null);
+ 	int appendButton(const TQPixmap &pic,int id=-1,TQPopupMenu* popup=0,const TQString& not_used_yet=TQString());
 	/** 
          * remove a button with the given ID
 	 */
@@ -89,7 +90,7 @@ public:
 	 * @param id an arbitrary ID which can be used later on to identify the tab
 	 * @param text if a mode with text is used it will be the tab text, otherwise a mouse over hint
 	 */
-	int appendTab(const TQPixmap &pic,int id=-1,const TQString& text=TQString::null);
+	int appendTab(const TQPixmap &pic,int id=-1,const TQString& text=TQString());
 	/**
 	 * remove a tab with a given ID
 	 */
@@ -151,14 +152,15 @@ private:
 /**
  * This class should never be created except with the appendButton call of KMultiTabBar
  */
-class KUTILS_EXPORT KMultiTabBarButton: public QPushButton
+class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	KMultiTabBarButton(const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	virtual  ~KMultiTabBarButton();
 	int id() const;
 
@@ -179,7 +181,7 @@ public slots:
          */
 	void setText(const TQString &);
 
-	TQSize sizeHint() const;
+	TQSize tqsizeHint() const;
 
 protected:
 	KMultiTabBar::KMultiTabBarPosition m_position;
@@ -206,8 +208,9 @@ protected slots:
 class KUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
+	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *tqparent,
 		KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style);
 	virtual ~KMultiTabBarTab();
 	/**