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

5 files changed, 18 insertions, 16 deletions

diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am
index 27c35cc..d49c733 100644
--- a/noatun-plugins/synaescope/Makefile.am
+++ b/noatun-plugins/synaescope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 METASOURCES = AUTO
 
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index 5b881fd..296a541 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -30,14 +30,14 @@
 #include "cmodule.h"
 #include "synaescope.h"
 
-SynaePrefs::SynaePrefs(TQObject *parent)
-	: CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", parent)
+SynaePrefs::SynaePrefs(TQObject *tqparent)
+	: CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", tqparent)
 {
 // 	kdDebug(66666) << k_funcinfo << endl;
 	xRes = new TQSpinBox(320, 1024, 16, this);
 	yRes = new TQSpinBox(240, 768, 12, this);
 
-	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 
@@ -47,9 +47,9 @@ SynaePrefs::SynaePrefs(TQObject *parent)
 	yResLayout->addWidget(new TQLabel(i18n("Display height:"), this));
 	yResLayout->addWidget(yRes);
 
-	layout->addLayout(xResLayout);
-	layout->addLayout(yResLayout);
-	layout->addStretch();
+	tqlayout->addLayout(xResLayout);
+	tqlayout->addLayout(yResLayout);
+	tqlayout->addStretch();
 
 	changed=false;
 	connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges()));
diff --git a/noatun-plugins/synaescope/cmodule.h b/noatun-plugins/synaescope/cmodule.h
index c367ad2..8a39a67 100644
--- a/noatun-plugins/synaescope/cmodule.h
+++ b/noatun-plugins/synaescope/cmodule.h
@@ -27,9 +27,10 @@ class TQSpinBox;
 class SynaePrefs : public CModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		SynaePrefs(TQObject *parent);
+		SynaePrefs(TQObject *tqparent);
 
 		virtual void save();
 		virtual void reopen();
diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h
index af1b6f5..df5417d 100644
--- a/noatun-plugins/synaescope/synaescope.h
+++ b/noatun-plugins/synaescope/synaescope.h
@@ -17,6 +17,7 @@ class KProcess;
 class SynaeScope : public TQObject, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	SynaeScope();
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index 2adc1f7..846a3b7 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -143,7 +143,7 @@ struct NoatunActionButton : public Button
 				action="";
 			}
 
-			if (action)
+			if (!action.isNull())
 			{
 				action+="()";
 				DCOPClient c;
@@ -257,14 +257,14 @@ struct SliderBar : public UIObject
 
 struct PopperUpper : public UIObject
 {
-	int maskAdd;
+	int tqmaskAdd;
 
 	PopperUpper(int _am,int _vm,double _x,double _y,
-			double _width,double _height, int _maskAdd)
+			double _width,double _height, int _tqmaskAdd)
 	{
 		activeMask = _am; visibleMask = _vm;
 		x = _x; y = _y; width = _width; height = _height;
-		maskAdd = _maskAdd;
+		tqmaskAdd = _tqmaskAdd;
 	}
 
 	int go(bool mouseDown,bool mouseClick, bool mouseOver,
@@ -282,7 +282,7 @@ struct PopperUpper : public UIObject
 				0x0200,
 				x*scale,y*scale,width*scale,height*scale);
 
-		return mouseOver ? maskAdd : 0;
+		return mouseOver ? tqmaskAdd : 0;
 	}
 
 	void handleKey(char key, int &action)
@@ -330,14 +330,14 @@ void Interface::setupPalette()
 #undef MAX
 }
 
-//Visible mask
+//Visible tqmask
 #define ALL 1
 #define BUTTONBAR 2
 #define TRACKBAR 4
 #define DIALBAR 8
 #define VOLUMEBAR 16
 
-//Active mask
+//Active tqmask
 //#define ALL 1
 #define PLAYING 2
 #define PAUSED 4
@@ -346,7 +346,7 @@ void Interface::setupPalette()
 #define OPEN 64
 
 
-// TODO Lay things out with parents and a stack, like QT
+// TODO Lay things out with tqparents and a stack, like QT
 Interface::Interface()
 {
 	static const float IconSize=0.2;