summaryrefslogtreecommitdiffstats
path: root/noatun/modules/systray
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:32 -0600
commit793cf2dff35dffe3ec4c7b24252947dde758a1b2 (patch)
tree7d9972d99ed281a36418ae9f5fc128e3c951532c /noatun/modules/systray
parent04f764aaf273340e1d5811d4216dd8127cacc5db (diff)
downloadtdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz
tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/systray')
-rw-r--r--noatun/modules/systray/systray.cpp4
-rw-r--r--noatun/modules/systray/yhconfig.kcfgc2
2 files changed, 3 insertions, 3 deletions
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 0788ceb3..27976429 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -39,7 +39,7 @@
#include <noatun/stdaction.h>
#include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqfile.h>
#include <kglobal.h>
#include <kiconloader.h>
@@ -56,7 +56,7 @@
#include <tqimage.h>
#include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/noatun/modules/systray/yhconfig.kcfgc b/noatun/modules/systray/yhconfig.kcfgc
index 5b4f99e4..8b35e4f7 100644
--- a/noatun/modules/systray/yhconfig.kcfgc
+++ b/noatun/modules/systray/yhconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=yhconfig.kcfg
ClassName=YHConfig
Singleton=true