diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
commit | 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch) | |
tree | 027fb6e879e17c2d65cbea9eab5c9da028618972 /arts/tools | |
parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'arts/tools')
-rw-r--r-- | arts/tools/artsactions.cpp | 4 | ||||
-rw-r--r-- | arts/tools/artscontrolapplet.cpp | 6 | ||||
-rw-r--r-- | arts/tools/audiomanager.cpp | 2 | ||||
-rw-r--r-- | arts/tools/choosebusdlg.cpp | 2 | ||||
-rw-r--r-- | arts/tools/environmentview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/fftscopeview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/main.cpp | 2 | ||||
-rw-r--r-- | arts/tools/main.h | 2 | ||||
-rw-r--r-- | arts/tools/mediatypesview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/midiinstdlg.cpp | 2 | ||||
-rw-r--r-- | arts/tools/midimanagerview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/midiportdlg.cpp | 2 | ||||
-rw-r--r-- | arts/tools/statusview.cpp | 2 |
13 files changed, 16 insertions, 16 deletions
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> |