summaryrefslogtreecommitdiffstats
path: root/arts
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 /arts
parent04f764aaf273340e1d5811d4216dd8127cacc5db (diff)
downloadtdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz
tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'arts')
-rw-r--r--arts/builder/execdlg.cpp2
-rw-r--r--arts/builder/main.cpp2
-rw-r--r--arts/builder/main.h2
-rw-r--r--arts/tools/artscontrolapplet.cpp2
-rw-r--r--arts/tools/artscontrolapplet.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 2aa4f608..9e4819e2 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -27,7 +27,7 @@
#include <tqlineedit.h>
#include <kbuttonbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kseparator.h>
#include <klocale.h>
#include <kapplication.h>
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index c83a5091..87783267 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -48,7 +48,7 @@
#include <klocale.h>
#include <kinputdialog.h>
#include <kstdaccel.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <ksavefile.h>
#include <kmessagebox.h>
#include <kaboutdata.h>
diff --git a/arts/builder/main.h b/arts/builder/main.h
index f5a09457..5098ff60 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -26,7 +26,7 @@
#include <kdockwidget.h>
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <ksimpleconfig.h>
#include <list>
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index dc495322..41b55c71 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -17,7 +17,7 @@
#include <kglobal.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index 06090c80..515e4fb4 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -24,7 +24,7 @@
#include <kpanelapplet.h>
#include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
class ArtsControlAppletPrivate;