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/simple | |
| 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/simple')
| -rw-r--r-- | noatun/modules/simple/userinterface.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/simple/userinterface.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 52552be8..ebac7ce7 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kurldrag.h> #include <kmenubar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> #include <kstdaction.h> #include <kstdguiitem.h> diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h index 7265fa4e..a218f574 100644 --- a/noatun/modules/simple/userinterface.h +++ b/noatun/modules/simple/userinterface.h @@ -14,8 +14,8 @@ #include <noatun/controls.h> #include <noatun/plugin.h> #include <noatun/video.h> -#include <kaction.h> -#include <kmainwindow.h> +#include <tdeaction.h> +#include <tdemainwindow.h> #include <kmedia2.h> #include <tqevent.h> #include <tqlabel.h> |