TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 24 insertions, 16 deletions

diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h
index ebc768d..4abc9ce 100644
--- a/atlantikdesigner/designer/editor.h
+++ b/atlantikdesigner/designer/editor.h
@@ -84,12 +84,13 @@ class CardStack : public TQValueList<Card>
 	TQString m_name;
 };
 
-class EstateDlg : public QWidget
+class EstateDlg : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	EstateDlg(TQWidget *parent = 0, char *name = 0) : TQWidget(parent, name) { estate = 0; }
+	EstateDlg(TQWidget *tqparent = 0, char *name = 0) : TQWidget(tqparent, name) { estate = 0; }
 
 	signals:
 	void updateBackground();
@@ -106,12 +107,13 @@ class EstateDlg : public QWidget
 	ConfigEstate *estate;
 };
 
-class EstateEdit : public QWidget
+class EstateEdit : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, const char *name = 0);
+	EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *tqparent = 0, const char *name = 0);
 	ConfigEstate *theEstate() { return estate; }
 	bool upArrow()const;
 	bool downArrow()const;
@@ -145,7 +147,7 @@ class EstateEdit : public QWidget
 	TQCheckBox *goCheck;
 	TQSpinBox *passMoney;
 	TQWidget *centerWidget;
-	TQGridLayout *layout;
+	TQGridLayout *tqlayout;
 
 	EstateList *estates;
 	TQValueList<CardStack> *cards;
@@ -161,12 +163,13 @@ class EstateEdit : public QWidget
 	bool locked;
 };
 
-class ChooseWidget : public QWidget
+class ChooseWidget : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = 0, char *name = 0);
+	ChooseWidget(EstateList *, int id, Card *, TQWidget *tqparent = 0, char *name = 0);
 
 	public slots:
 	void typeChanged(int);
@@ -181,19 +184,20 @@ class ChooseWidget : public QWidget
 	bool number;
 	bool prevNumber;
 	bool init;
-	TQHBoxLayout *hlayout;
+	TQHBoxLayout *htqlayout;
 
 	EstateList *estates;
 
 	int id;
 };
 
-class CardView : public QWidget
+class CardView : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	CardView(EstateList *, CardStack *, TQWidget *parent = 0, char *name = 0);
+	CardView(EstateList *, CardStack *, TQWidget *tqparent = 0, char *name = 0);
 
 	private slots:
 	void selected(int);
@@ -214,7 +218,7 @@ class CardView : public QWidget
 
 	EstateList *estates;
 
-	TQVBoxLayout *layout;
+	TQVBoxLayout *tqlayout;
 
 	Card *card;
 
@@ -225,9 +229,10 @@ class CardView : public QWidget
 class TaxDlg : public EstateDlg
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	TaxDlg(TQWidget *parent = 0, char *name = 0);
+	TaxDlg(TQWidget *tqparent = 0, char *name = 0);
 
 	protected:
 	virtual void save();
@@ -241,9 +246,10 @@ class TaxDlg : public EstateDlg
 class GenericDlg : public EstateDlg
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	GenericDlg(TQWidget *parent = 0, char *name = 0);
+	GenericDlg(TQWidget *tqparent = 0, char *name = 0);
 
 	protected:
 	virtual void save();
@@ -256,9 +262,10 @@ class GenericDlg : public EstateDlg
 class CardsDlg : public EstateDlg
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, char *name = 0);
+	CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *tqparent = 0, char *name = 0);
 
 	protected:
 	virtual void save();
@@ -274,15 +281,16 @@ class CardsDlg : public EstateDlg
 
 	TQComboBox *cards;
 	CardView *view;
-	TQVBoxLayout *vlayout;
+	TQVBoxLayout *vtqlayout;
 };
 
 class StreetDlg : public EstateDlg
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	StreetDlg(ConfigEstateGroupList *, TQWidget *parent = 0, char *name = 0);
+	StreetDlg(ConfigEstateGroupList *, TQWidget *tqparent = 0, char *name = 0);
 
 	protected:
 	virtual void save();