Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 17 insertions, 17 deletions

diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 89ec960b..e2e2f0c1 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -42,7 +42,7 @@ PresetList::PresetList(TQWidget *parent, const char *name)
 	header()->hide();
 	// a try to set a sne minimum width. unfortuately the custom item
 	// still doesn't draw all text with that minimum width
-	setMinimumWidth(kapp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin());
+	setMinimumWidth(tdeApp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin());
 }
 
 void PresetList::rename(TQListViewItem *item, int c)
@@ -77,8 +77,8 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
 	layout->addWidget(mLabel);
 
 	setMinimumHeight(200);
-//	setMinimumWidth(kapp->fontMetrics().width("158kHz"));
-//	setMinimumWidth(kapp->fontMetrics().width("549kHz"));
+//	setMinimumWidth(tdeApp->fontMetrics().width("158kHz"));
+//	setMinimumWidth(tdeApp->fontMetrics().width("549kHz"));
 
 	setBand(band);
 
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index 3b934232..ba6108fb 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -258,7 +258,7 @@ private:
 	bool showingInterfaces;
 };
 
-#define napp (static_cast<NoatunApp*>(kapp))
+#define napp (static_cast<NoatunApp*>(tdeApp))
 
 // version info for the plugins
 // this is MAJOR.MINOR.PATCHLEVEL
diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h
index c6341a75..d6059021 100644
--- a/noatun/library/noatun/pluginloader.h
+++ b/noatun/library/noatun/pluginloader.h
@@ -64,7 +64,7 @@ public:
 	 **/
 	bool remove(const TQString &spec);
 	/**
-	 * Same as the above, but does not call kapp->exit() even
+	 * Same as the above, but does not call tdeApp->exit() even
 	 * when the last userinterface plugin is removed. Necessary
 	 * during session management (see marquis plugin).
 	 * ### BIC: merge with above with terminateOnLastUI = true
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 5fa6b0fc..f9e6f49f 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -330,7 +330,7 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
 {
 	TDEPopupMenu *contextMenu = new TDEPopupMenu(p, "NoatunContextMenu");
 
-	KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
+	KHelpMenu *helpmenu = new KHelpMenu(contextMenu, tdeApp->aboutData(), false);
 	TDEActionCollection* actions = new TDEActionCollection(helpmenu);
 
 	KStdAction::open(napp, TQ_SLOT(fileOpen()), actions)->plug(contextMenu);
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index 2fecb898..7f8bb1be 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -262,7 +262,7 @@ bool LibraryLoader::remove(const TQString& spec, bool terminateOnLastUI)
 		else
 		{
 			// No other UIs, terminate
-			kapp->exit();
+			tdeApp->exit();
 		}
 	}
 	else if (info.type=="playlist")
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index b8f46fa5..2e777a43 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -315,7 +315,7 @@ VEqualizer::VEqualizer()
 void VEqualizer::init()
 {
 	KURL url;
-	url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer");
+	url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer");
 	if(!load(url))
 	{
 		setPreamp(0);
@@ -323,7 +323,7 @@ void VEqualizer::init()
 	}
 	else
 	{
-		TDEConfig *config=kapp->config();
+		TDEConfig *config=tdeApp->config();
 		config->setGroup("Equalizer");
 		setEnabled(config->readBoolEntry("enabled", false));
 	}
@@ -333,7 +333,7 @@ void VEqualizer::init()
 VEqualizer::~VEqualizer()
 {
 	KURL url;
-	url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer");
+	url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer");
 	save(url, "auto");
 
 	delete d;
@@ -535,7 +535,7 @@ void VEqualizer::setEnabled(bool e)
 {
 	update(true); // just in case
 	EQBACK->enabled((long)e);
-	TDEConfig *config=kapp->config();
+	TDEConfig *config=tdeApp->config();
 	config->setGroup("Equalizer");
 	config->writeEntry("enabled", e);
 	config->sync();
@@ -664,7 +664,7 @@ bool VEqualizer::fromString(const TQString &str)
 
 static TQString makePresetFile()
 {
-	TQString basedir=kapp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/";
+	TQString basedir=tdeApp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/";
 	// now append a filename that doesn't exist
 	TDEStandardDirs::makeDir(basedir);
 	TQString fullpath;
@@ -698,7 +698,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart)
 	preset.setName(nameReal);
 
 	save(preset.file(), nameReal);
-	TDEConfig *config=kapp->config();
+	TDEConfig *config=tdeApp->config();
 	config->setGroup("Equalizer");
 	TQStringList list = config->readListEntry("presets");
 	list += preset.file();
@@ -722,7 +722,7 @@ TQValueList<VPreset> VEqualizer::presets() const
 	}
 	else
 	{
-		list=kapp->dirs()->findAllResources("data", "noatun/eq.preset/*");
+		list=tdeApp->dirs()->findAllResources("data", "noatun/eq.preset/*");
 		conf->writeEntry("presets", list);
 		conf->sync();
 	}
@@ -763,7 +763,7 @@ VPreset VEqualizer::presetByFile(const TQString &file)
 {
 	TDEConfig *conf=TDEGlobal::config();
 	conf->setGroup("Equalizer");
-	TQStringList list=kapp->config()->readListEntry("presets");
+	TQStringList list=tdeApp->config()->readListEntry("presets");
 	if (list.contains(file))
 		return VPreset(file);
 	return VPreset();
@@ -911,7 +911,7 @@ TQString VPreset::file() const
 
 void VPreset::remove()
 {
-	TDEConfig *config=kapp->config();
+	TDEConfig *config=tdeApp->config();
 	config->setGroup("Equalizer");
 	TQStringList items=config->readListEntry("presets");
 	items.remove(file());
@@ -920,7 +920,7 @@ void VPreset::remove()
 
 	emit EQ->removed(*this);
 
-	if (file().find(kapp->dirs()->localtdedir())==0)
+	if (file().find(tdeApp->dirs()->localtdedir())==0)
 	{
 		TQFile f(file());
 		f.remove();