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

1 files changed, 11 insertions, 11 deletions

diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index c081d84b..a61e3eec 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -4,7 +4,7 @@
  * This file is hereby licensed under the GNU General Public License version
  * 2 or later at your option.
  *
- * This file is licensed under the Qt Public License version 1 with the
+ * This file is licensed under the TQt Public License version 1 with the
  * condition that the licensed will be governed under the Laws of California
  * (USA) instead of Norway.  Disputes will be settled in Santa Clara county
  * courts.
@@ -63,7 +63,7 @@
 #include <math.h>
 
 #define EQ (napp->vequalizer())
-#define EQBACK (napp->player()->engine()->equalizer())
+#define ETQBACK (napp->player()->engine()->equalizer())
 
 using std::vector;
 
@@ -440,7 +440,7 @@ void VEqualizer::setBands(int num, bool interpolate)
 void VEqualizer::setPreamp(int preamp)
 {
 	d->preamp = preamp;
-	EQBACK->preamp(pow(2,float(preamp)/100.0));
+	ETQBACK->preamp(pow(2,float(preamp)/100.0));
 	emit changed();
 	emit preampChanged();
 	emit preampChanged(preamp);
@@ -483,7 +483,7 @@ int VEqualizer::bands() const
 
 bool VEqualizer::isEnabled() const
 {
-	return bool(EQBACK->enabled());
+	return bool(ETQBACK->enabled());
 }
 
 int VEqualizer::preamp() const
@@ -534,7 +534,7 @@ void VEqualizer::setLevels(const TQValueList<int> &levels)
 void VEqualizer::setEnabled(bool e)
 {
 	update(true); // just in case
-	EQBACK->enabled((long)e);
+	ETQBACK->enabled((long)e);
 	KConfig *config=kapp->config();
 	config->setGroup("Equalizer");
 	config->writeEntry("enabled", e);
@@ -565,9 +565,9 @@ void VEqualizer::update(bool full)
 		}
 	}
 	if (full)
-		EQBACK->set(levels, mids, widths);
+		ETQBACK->set(levels, mids, widths);
 	else
-		EQBACK->levels(levels);
+		ETQBACK->levels(levels);
 }
 
 
@@ -609,7 +609,7 @@ TQString VEqualizer::toString(const TQString &name) const
 	{
 		docElem.setAttribute("level", preamp());
 		docElem.setAttribute("name", name);
-		docElem.setAttribute("version", napp->version());
+		docElem.setAttribute("version", TQString(napp->version()));
 	}
 
 	int bandc = bands();
@@ -764,7 +764,7 @@ VPreset VEqualizer::presetByFile(const TQString &file)
 	KConfig *conf=KGlobal::config();
 	conf->setGroup("Equalizer");
 	TQStringList list=kapp->config()->readListEntry("presets");
-	if (list.contains(file))
+	if (list.tqcontains(file))
 		return VPreset(file);
 	return VPreset();
 }
@@ -920,7 +920,7 @@ void VPreset::remove()
 
 	emit EQ->removed(*this);
 
-	if (file().find(kapp->dirs()->localkdedir())==0)
+	if (file().tqfind(kapp->dirs()->localkdedir())==0)
 	{
 		TQFile f(file());
 		f.remove();
@@ -930,7 +930,7 @@ void VPreset::remove()
 
 
 #undef EQ
-#undef EQBACK
+#undef ETQBACK
 
 #include "vequalizer.moc"