summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
commit6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch)
tree027fb6e879e17c2d65cbea9eab5c9da028618972 /arts
parent9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff)
downloadtdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz
tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'arts')
-rw-r--r--arts/builder/createtool.cpp4
-rw-r--r--arts/builder/dirmanager.cpp4
-rw-r--r--arts/builder/execdlg.cpp2
-rw-r--r--arts/builder/interfacedlg.cpp2
-rw-r--r--arts/builder/main.cpp4
-rw-r--r--arts/builder/mwidget.cpp4
-rw-r--r--arts/builder/portposdlg.cpp2
-rw-r--r--arts/builder/propertypanel.cpp2
-rw-r--r--arts/builder/retrievedlg.cpp2
-rw-r--r--arts/gui/kde/dbtest.cpp2
-rw-r--r--arts/gui/kde/kpoti.cpp2
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp4
-rw-r--r--arts/modules/common/env_mixeritem_impl.cc4
-rw-r--r--arts/modules/effects/fivebandmonocomplexeq_impl.cc4
-rw-r--r--arts/modules/effects/freeverbguifactory_impl.cc4
-rw-r--r--arts/modules/effects/monostereoconversion_impl.cc4
-rw-r--r--arts/modules/effects/stereocompressorguifactory_impl.cc4
-rw-r--r--arts/modules/effects/synth_stereo_fir_equalizer_impl.cc4
-rw-r--r--arts/modules/mixers/littlestereomixerchannel_impl.cc2
-rw-r--r--arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc4
-rw-r--r--arts/modules/mixers/simplemixerchannelguifactory_impl.cc4
-rw-r--r--arts/tools/artsactions.cpp4
-rw-r--r--arts/tools/artscontrolapplet.cpp6
-rw-r--r--arts/tools/audiomanager.cpp2
-rw-r--r--arts/tools/choosebusdlg.cpp2
-rw-r--r--arts/tools/environmentview.cpp2
-rw-r--r--arts/tools/fftscopeview.cpp2
-rw-r--r--arts/tools/main.cpp2
-rw-r--r--arts/tools/main.h2
-rw-r--r--arts/tools/mediatypesview.cpp2
-rw-r--r--arts/tools/midiinstdlg.cpp2
-rw-r--r--arts/tools/midimanagerview.cpp2
-rw-r--r--arts/tools/midiportdlg.cpp2
-rw-r--r--arts/tools/statusview.cpp2
34 files changed, 50 insertions, 50 deletions
diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index f52573a4..2913fdd3 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -27,8 +27,8 @@
//#include <arts/debug.h>
#include <tqpalette.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
MWidgetTool::MWidgetTool(ModuleWidget *mwidget)
{
diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index 9c8ed639..f3907142 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -26,9 +26,9 @@
#include <tqfile.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "dirmanager.h"
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index fc14f6b0..fcdce6b8 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -29,7 +29,7 @@
#include <kbuttonbox.h>
#include <tdefiledialog.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstdguiitem.h>
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index b4d0ae6d..99b8072e 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -30,7 +30,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <stdio.h>
#include <arts/debug.h>
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 0a60801a..b163f4a1 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -45,12 +45,12 @@
#include <kstdaction.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <tdestdaccel.h>
#include <tdefiledialog.h>
#include <ksavefile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <kstandarddirs.h>
#include <kartsserver.h>
diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 8b2aeed8..38a362e7 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -4,8 +4,8 @@
#include <arts/debug.h>
//#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
#include <tqpainter.h>
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index e4ea94a2..922a9f16 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlistbox.h>
#include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 702a088e..25809100 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -22,7 +22,7 @@
#include "module.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index ca4b255b..c95d40ad 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -29,7 +29,7 @@
#include <tqlineedit.h>
#include <tdeapplication.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <stdio.h>
#include <set>
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index 0cd781b1..e1933b17 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -2,7 +2,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <tdeactioncollection.h>
#include <kdebug.h>
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index c0a3b5d2..ae9c6728 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -34,7 +34,7 @@
#include <kpixmap.h>
#include <kpixmapeffect.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index 15fc8c8a..da6a5d39 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -25,8 +25,8 @@
#include <tqstyle.h>
#include <tqfont.h>
#include <tqfontmetrics.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kinputdialog.h>
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 6f4e0e48..6fee8b44 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -4,8 +4,8 @@
#include "connect.h"
#include "../runtime/sequenceutils.h"
#include <stdio.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <vector>
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 148f1a0d..59d0ef44 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -26,8 +26,8 @@
#include <artsmoduleseffects.h>
#include <connect.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc
index c15a5bfd..4b5d4d34 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cc
@@ -24,8 +24,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace std;
using namespace Arts;
diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cc
index deee99fd..9bf1bbee 100644
--- a/arts/modules/effects/monostereoconversion_impl.cc
+++ b/arts/modules/effects/monostereoconversion_impl.cc
@@ -26,8 +26,8 @@
#include <artsmoduleseffects.h>
#include <connect.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index 3c05ab9f..0dd523e8 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -17,8 +17,8 @@
*/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "artsmoduleseffects.h"
#include "connect.h"
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
index 364375c2..8f15a4dc 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
@@ -31,8 +31,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace std;
using namespace Arts;
diff --git a/arts/modules/mixers/littlestereomixerchannel_impl.cc b/arts/modules/mixers/littlestereomixerchannel_impl.cc
index 84aaef5f..3b14fa39 100644
--- a/arts/modules/mixers/littlestereomixerchannel_impl.cc
+++ b/arts/modules/mixers/littlestereomixerchannel_impl.cc
@@ -28,7 +28,7 @@
#include <debug.h>
#include "artsgui.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Arts;
diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
index 64b48ad7..ab35e4fc 100644
--- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
@@ -2,8 +2,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
index 370865bf..0a36470d 100644
--- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
@@ -2,8 +2,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
class SimpleMixerChannelGuiFactory_impl : virtual public SimpleMixerChannelGuiFactory_skel {
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index f0dee6fd..d970ed6e 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -23,8 +23,8 @@
#include <tdeaction.h>
#include <tdeactioncollection.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
//#include <kdebug.h>
#include <kartsserver.h>
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index 285e08b0..2697ff69 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -15,11 +15,11 @@
* *
***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqcursor.h>
#include <tqtimer.h>
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 9bca14b1..542abec1 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -27,7 +27,7 @@
#include <tqtimer.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kiconloader.h>
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 0a4c5b89..24e233e4 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -31,7 +31,7 @@
#include <kbuttonbox.h>
#include <kseparator.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kstdguiitem.h>
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index 8c84e8d2..aca373e9 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -28,7 +28,7 @@
#include <tdelistbox.h>
#include <kartswidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <stdio.h>
#include <fstream>
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index c8124c0b..d998c41a 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -29,7 +29,7 @@
#include <tdepopupmenu.h>
#include <kartswidget.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "artsactions.h"
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 3f22e53a..b651c625 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -40,7 +40,7 @@
#include <tqpushbutton.h>
#include <tdeaction.h>
#include <kled.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kartsserver.h>
diff --git a/arts/tools/main.h b/arts/tools/main.h
index a967e512..ef349216 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -30,7 +30,7 @@
#include <tdemainwindow.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index 6091461d..493c36d1 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kartsserver.h>
#include <map>
#include <kiconloader.h>
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 04859733..6d155b06 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -20,7 +20,7 @@
*/
#include "midiinstdlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index 62d54da0..b32c09f2 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -33,7 +33,7 @@
#include <tqpainter.h>
#include <stdio.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <soundserver.h>
#include "artsmidi.h"
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index b8b70bda..1273bf58 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -20,7 +20,7 @@
*/
#include "midiportdlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tqlayout.h>
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index c29cf4ed..197d620d 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -22,7 +22,7 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqwidget.h>
#include <tqtimer.h>