summaryrefslogtreecommitdiffstats
path: root/kscd
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 /kscd
parent04f764aaf273340e1d5811d4216dd8127cacc5db (diff)
downloadtdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz
tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kscd')
-rw-r--r--kscd/kscd.cpp4
-rw-r--r--kscd/kscd.h2
-rw-r--r--kscd/prefs.kcfgc2
3 files changed, 4 insertions, 4 deletions
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index a0cc59c6..7781601f 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -39,7 +39,7 @@
#include <dcopref.h>
#include <kcharsets.h>
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <kemailsettings.h>
@@ -61,7 +61,7 @@
#include <kuniqueapplication.h>
#include <kglobalsettings.h>
#include <tdecmoduleloader.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include "docking.h"
#include "kscd.h"
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 01c6e163..fc1ab6ef 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -53,7 +53,7 @@ class KCompactDisc;
#include "prefs.h"
#include "configWidget.h"
#include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kprocess.h>
#include <krandomsequence.h>
#include <dcopobject.h>
diff --git a/kscd/prefs.kcfgc b/kscd/prefs.kcfgc
index 89d94319..7cc1efb9 100644
--- a/kscd/prefs.kcfgc
+++ b/kscd/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=kscd.kcfg
ClassName=Prefs
Singleton=true