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

7 files changed, 23 insertions, 20 deletions

diff --git a/noatun-plugins/charlatan/Makefile.am b/noatun-plugins/charlatan/Makefile.am
index 0603703..3643ec6 100644
--- a/noatun-plugins/charlatan/Makefile.am
+++ b/noatun-plugins/charlatan/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatuncharlatan.la
 
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 3624e0b..4d8f157 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -29,23 +29,23 @@
 
 #include "configmodule.h"
 #include "configmodule.moc"
-CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
+CharlatanConfigModule::CharlatanConfigModule(TQObject * tqparent)
   :
   CModule
   (
    i18n("Charlatan"),
    i18n("Charlatan Interface Settings"),
    "appearance",
-   parent
+   tqparent
   )
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * layout = new TQVBoxLayout(this);
+  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
 
-  layout->addWidget(scroll_);
+  tqlayout->addWidget(scroll_);
 
-	layout->addStretch(100);
+	tqlayout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/charlatan/configmodule.h b/noatun-plugins/charlatan/configmodule.h
index d0646c2..d41df89 100644
--- a/noatun-plugins/charlatan/configmodule.h
+++ b/noatun-plugins/charlatan/configmodule.h
@@ -30,6 +30,7 @@ class TQCheckBox;
 class CharlatanConfigModule : public CModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp
index c5ca084..fc55f36 100644
--- a/noatun-plugins/charlatan/seeker.cpp
+++ b/noatun-plugins/charlatan/seeker.cpp
@@ -27,8 +27,8 @@
 #include "seeker.h"
 #include "seeker.moc"
 
-Seeker::Seeker(TQWidget * parent)
-	: TQSlider(0, 60, 10, 0, Horizontal, parent),
+Seeker::Seeker(TQWidget * tqparent)
+	: TQSlider(0, 60, 10, 0,Qt::Horizontal, tqparent),
 		adjusting_(false)
 {
 	delayedUpdateTimer_ = new TQTimer(this);
diff --git a/noatun-plugins/charlatan/seeker.h b/noatun-plugins/charlatan/seeker.h
index 922f902..98b071a 100644
--- a/noatun-plugins/charlatan/seeker.h
+++ b/noatun-plugins/charlatan/seeker.h
@@ -27,13 +27,14 @@
 
 class TQTimer;
 
-class Seeker : public QSlider
+class Seeker : public TQSlider
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
-		Seeker(TQWidget * parent);
+		Seeker(TQWidget * tqparent);
 		virtual ~Seeker();
 
 	protected slots:
@@ -51,7 +52,7 @@ class Seeker : public QSlider
 	private:
 
 		bool			adjusting_;
-		QTimer	* delayedUpdateTimer_;
+		TQTimer	* delayedUpdateTimer_;
 };
 
 #endif
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index b9bb4c1..8e67516 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -48,7 +48,7 @@
 #include "seeker.h"
 
 Charlatan::Charlatan()
-	: QWidget									(0, "Charlatan"),
+	: TQWidget									(0, "Charlatan"),
 		UserInterface						(),
 		previousButton_					(0L),
 		stopButton_							(0L),
@@ -189,7 +189,7 @@ Charlatan::Charlatan()
 
 	connect
 		(
-		 new CharlatanConfigModule(this),
+		 new CharlatanConfigModule(TQT_TQOBJECT(this)),
 		 TQT_SIGNAL(saved()),
 		 TQT_SLOT(slotConfigChanged())
 		);
@@ -321,7 +321,7 @@ bool Charlatan::eventFilter(TQObject *o, TQEvent *e)
 	switch (e->type())
 	{
 		case TQEvent::Wheel:
-			wheelEvent(static_cast<TQWheelEvent*>(e));
+			wheelEvent(TQT_TQWHEELEVENT(e));
 			return true;
 			break;
 
@@ -344,7 +344,7 @@ void Charlatan::slotPlayListHidden()
 
 void Charlatan::mousePressEvent(TQMouseEvent * e)
 {
-	if (e->button() == RightButton)
+	if (e->button() == Qt::RightButton)
 	{
 		NoatunStdAction::ContextMenu::showContextMenu();
 		return;
@@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged()
 
 void Charlatan::slotVolumeChanged(int i)
 {
-	TQString message(i18n("Volume: %1").arg(i));
+	TQString message(i18n("Volume: %1").tqarg(i));
 
 	showingVolumeTimer_->start(2000, true);
 	titleLabel_->setText(message);
diff --git a/noatun-plugins/charlatan/userinterface.h b/noatun-plugins/charlatan/userinterface.h
index 7d74e39..3e40487 100644
--- a/noatun-plugins/charlatan/userinterface.h
+++ b/noatun-plugins/charlatan/userinterface.h
@@ -38,6 +38,7 @@ class TQLabel;
 class Charlatan : public TQWidget, public UserInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
@@ -73,7 +74,7 @@ class Charlatan : public TQWidget, public UserInterface
 		virtual void closeEvent				(TQCloseEvent *);
 		virtual bool eventFilter			(TQObject *, TQEvent *);
 		virtual void wheelEvent				(TQWheelEvent *);
-		virtual void setTitleText			(const TQString & = TQString::null);
+		virtual void setTitleText			(const TQString & = TQString());
 
 		void loadConfig();
 
@@ -89,10 +90,10 @@ class Charlatan : public TQWidget, public UserInterface
 		Seeker					* seekSlider_;
 		ScrollingLabel	* titleLabel_;
 
-		QLabel					* positionLabel_;
+		TQLabel					* positionLabel_;
 
-		QTimer					* showingVolumeTimer_;
-		QString						title_;
+		TQTimer					* showingVolumeTimer_;
+		TQString						title_;
 };
 
 #endif