From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 11 Jun 2011 06:00:15 +0000
Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and
 Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 noatun/modules/marquis/marquis.cpp | 14 +++++++-------
 noatun/modules/marquis/marquis.h   |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'noatun/modules/marquis')

diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 15a298c3..0a55e8c8 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -37,7 +37,7 @@
 #include <noatun/engine.h>
 #include <kaction.h>
 
-static int getPlayStatus( Player *player )
+static int getPlaytqStatus( Player *player )
 {
 	if ( player->isPlaying() )
 		return 1;
@@ -46,7 +46,7 @@ static int getPlayStatus( Player *player )
 	return 0;
 }
 
-static void setPlayStatus( Player *player, int status )
+static void setPlaytqStatus( Player *player, int status )
 {
 	switch( status )
 	{
@@ -107,14 +107,14 @@ void Marquis::saveSessionConfig(KConfig *c)
 	if ( !player->current().isNull() )
 	{
 		KURL songURL = player->current().url();
-		songURL.setPass( TQString::null ); // don't save passwords
+		songURL.setPass( TQString() ); // don't save passwords
 		c->writePathEntry("Current Song", songURL.url());
 	}
 	else
-		c->writePathEntry("Current Song", TQString::null);
+		c->writePathEntry("Current Song", TQString());
 
 	c->writeEntry("Current Position", player->getTime());
-	c->writeEntry("PlayStatus", getPlayStatus( player ));
+	c->writeEntry("PlaytqStatus", getPlaytqStatus( player ));
 
 	// borrowed from Plugin config dialog
 	TQStringList specList;
@@ -122,7 +122,7 @@ void Marquis::saveSessionConfig(KConfig *c)
 	TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded();
 	for( TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i)
 	{
-		if(!specList.contains((*i).specfile)
+		if(!specList.tqcontains((*i).specfile)
 		   && napp->libraryLoader()->isLoaded((*i).specfile)
 		   && (*i).specfile != "marquis.plugin")
 		{
@@ -139,7 +139,7 @@ void Marquis::readSessionConfig(KConfig *c)
 {
 	Player *player = napp->player();
 
-	c->setGroup(TQString::null);
+	c->setGroup(TQString());
 
 	// First set volume, then load modules, some module could start
 	// playback and that would be with 100% volume!
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index 5b166d57..e1d91f7d 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -23,8 +23,8 @@
 // used in advertising or otherwise to promote the sale, use or other dealings
 // in this Software without prior written authorization from the author(s).
 
-#ifndef MARQUIS_H
-#define MARQUIS_H
+#ifndef MARTQUIS_H
+#define MARTQUIS_H
 
 #include <noatun/plugin.h>
 #include <noatun/app.h>
@@ -35,6 +35,7 @@ class Player;
 class Marquis : public KMainWindow, public SessionManagement
 {
 Q_OBJECT
+  TQ_OBJECT
 NOATUNPLUGIND
 public:
 	Marquis();
-- 
cgit v1.2.1