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 /kaudiocreator | |
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 'kaudiocreator')
-rw-r--r-- | kaudiocreator/kaudiocreator.cpp | 4 | ||||
-rw-r--r-- | kaudiocreator/kaudiocreator.h | 2 | ||||
-rw-r--r-- | kaudiocreator/tracksimp.cpp | 2 | ||||
-rw-r--r-- | kaudiocreator/tracksimp.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index bb25cf4e..b05af4b2 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -24,8 +24,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <kstatusbar.h> #include <knotifydialog.h> #include <kcombobox.h> diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 02693150..e85ec4ab 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -21,7 +21,7 @@ #ifndef KAUDIOCREATOR_H #define KAUDIOCREATOR_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeconfigdialog.h> class KJanusWidget; diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 73656e07..fd247499 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -27,7 +27,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <kprocess.h> #include <kmessagebox.h> #include <kurl.h> diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index 3e4134a1..111f474a 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -23,7 +23,7 @@ #include "tracks.h" #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> // CDDB support via libkcddb |