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

4 files changed, 12 insertions, 11 deletions

diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am
index b557d10..4a673cd 100644
--- a/noatun-plugins/tippercanoe/Makefile.am
+++ b/noatun-plugins/tippercanoe/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/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index cf5cbfc..4a617ee 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -52,7 +52,7 @@ SynaeScope::~SynaeScope()
 void SynaeScope::init()
 {
 	connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(read(KProcess *, char *, int)));
-	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void)));
+	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
 
 	process << KStandardDirs::findExe("noatuntippecanoe.bin");
 
@@ -81,8 +81,8 @@ void SynaeScope::scopeEvent(float *left, float *right, int size)
 
 void SynaeScope::read(KProcess *, char *buf, int)
 {
-	TQString num = TQString::fromLatin1(buf);
-	num = num.left(num.find(TQRegExp("\\s")));
+	TQString num = TQString::tqfromLatin1(buf);
+	num = num.left(num.tqfind(TQRegExp("\\s")));
 	id = num.toInt();
 	embed->embed(id);
 }
diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h
index 59daa93..4479c65 100644
--- a/noatun-plugins/tippercanoe/synaescope.h
+++ b/noatun-plugins/tippercanoe/synaescope.h
@@ -19,6 +19,7 @@
 class SynaeScope : public TQWidget, public StereoScope, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	SynaeScope();
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index e260d18..663816c 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -170,14 +170,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,
@@ -195,7 +195,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)
@@ -243,14 +243,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
@@ -259,7 +259,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;