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/marquis | |
| 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/marquis')
| -rw-r--r-- | noatun/modules/marquis/marquis.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/marquis/marquis.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 71612174..f1f46ae8 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -35,7 +35,7 @@ #include "marquis.h" #include <noatun/player.h> #include <noatun/engine.h> -#include <kaction.h> +#include <tdeaction.h> static int getPlayStatus( Player *player ) { diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h index 276ebc9a..00789b43 100644 --- a/noatun/modules/marquis/marquis.h +++ b/noatun/modules/marquis/marquis.h @@ -28,7 +28,7 @@ #include <noatun/plugin.h> #include <noatun/app.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class Player; |