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 /juk/systemtray.cpp | |
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 'juk/systemtray.cpp')
-rw-r--r-- | juk/systemtray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 045b00f0..e71fc37d 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -19,8 +19,8 @@ #include <kiconloader.h> #include <kpassivepopup.h> #include <kiconeffect.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalsettings.h> #include <kdebug.h> |