diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:33 -0600 |
| commit | 5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch) | |
| tree | aaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /arts/tools | |
| parent | 120dff5f18d13aab7d2731de84e64c898728dc60 (diff) | |
| download | tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'arts/tools')
| -rw-r--r-- | arts/tools/artsactions.cpp | 6 | ||||
| -rw-r--r-- | arts/tools/artscontrolapplet_private.h | 4 | ||||
| -rw-r--r-- | arts/tools/audiomanager.cpp | 2 | ||||
| -rw-r--r-- | arts/tools/environmentview.cpp | 2 | ||||
| -rw-r--r-- | arts/tools/fftscopeview.cpp | 4 | ||||
| -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/midimanagerview.cpp | 2 | ||||
| -rw-r--r-- | arts/tools/midimanagerview.h | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 4dd331b8..f0dee6fd 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -20,9 +20,9 @@ #include "artsactions.h" -#include <kaction.h> -#include <kactioncollection.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kglobal.h> //#include <kdebug.h> diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 08959f16..0cb5e140 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqslider.h> #include <tqpushbutton.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <tqfont.h> #include <kartsserver.h> diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index 25acaf5a..9bca14b1 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kiconloader.h> using namespace std; diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index d8c21224..8c84e8d2 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqpushbutton.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kartswidget.h> #include <klocale.h> #include <kiconloader.h> diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index 9eb1c019..c8124c0b 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -25,8 +25,8 @@ #include <tqlayout.h> #include <tqcursor.h> #include <tqtimer.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kartswidget.h> #include <kdebug.h> #include <klocale.h> diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 4f508d98..3f22e53a 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqslider.h> #include <tqpushbutton.h> -#include <kaction.h> +#include <tdeaction.h> #include <kled.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/arts/tools/main.h b/arts/tools/main.h index a92c4061..ae2819b7 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -27,7 +27,7 @@ #include <tqmessagebox.h> #include <kapplication.h> #include <tqframe.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kcmdlineargs.h> #include <kaboutdata.h> #include <klocale.h> diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 683e8152..6091461d 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -22,7 +22,7 @@ */ #include <tqlayout.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kartsserver.h> #include <map> diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index ae729347..62d54da0 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -32,7 +32,7 @@ #include <tqlayout.h> #include <tqpainter.h> #include <stdio.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kiconloader.h> #include <soundserver.h> diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h index 5b05936d..e5cd1467 100644 --- a/arts/tools/midimanagerview.h +++ b/arts/tools/midimanagerview.h @@ -26,7 +26,7 @@ #ifndef ARTS_TOOLS_MIDIMANAGERVIEW_H #define ARTS_TOOLS_MIDIMANAGERVIEW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "artsmidi.h" #include <map> |