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 /noatun/modules/excellent | |
| 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 'noatun/modules/excellent')
| -rw-r--r-- | noatun/modules/excellent/userinterface.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/excellent/userinterface.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 7d6c4bfd..612807ab 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -45,7 +45,7 @@ #include <kmenubar.h> #include <kmessagebox.h> #include <kpixmapeffect.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> #include <kstdaction.h> #include <twin.h> diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h index c47f05f1..a5aca1a1 100644 --- a/noatun/modules/excellent/userinterface.h +++ b/noatun/modules/excellent/userinterface.h @@ -30,7 +30,7 @@ #include <noatun/plugin.h> #include <noatun/app.h> #include <noatun/stdaction.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEAction; class TDEPopupMenu; |