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/systray | |
| 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/systray')
| -rw-r--r-- | noatun/modules/systray/kitsystemtray.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/systray/systray.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/systray/systray.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 63a467b6..963a9c69 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -36,8 +36,8 @@ #include <tqdragobject.h> #include "kitsystemtray.h" -#include <kmainwindow.h> -#include <kpopupmenu.h> +#include <tdemainwindow.h> +#include <tdepopupmenu.h> #include <kxmlguifactory.h> #include <kiconloader.h> #include <kurldrag.h> diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 0cfde28e..3ef8841c 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -38,7 +38,7 @@ #include <noatun/player.h> #include <noatun/stdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <tqfile.h> #include <kglobal.h> diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index b1dd7aad..80592b07 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -32,7 +32,7 @@ #include <tqtimer.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class KitSystemTray; class TQTimer; |