diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:11:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:11:38 -0600 |
| commit | e0f85b11f69e4c88f789ee47c9e5fd1df579b54d (patch) | |
| tree | b1ebff6969d2fbc11624efc77d9caa67c5ba8bdf /src/kmplayer_part.cpp | |
| parent | 0308f7944757919f45f8217c4dd92ad751292c85 (diff) | |
| download | kmplayer-e0f85b11f69e4c88f789ee47c9e5fd1df579b54d.tar.gz kmplayer-e0f85b11f69e4c88f789ee47c9e5fd1df579b54d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayer_part.cpp')
| -rw-r--r-- | src/kmplayer_part.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp index 67f40b3..c71aebd 100644 --- a/src/kmplayer_part.cpp +++ b/src/kmplayer_part.cpp @@ -28,12 +28,12 @@ #include <tqpushbutton.h> #include <tqslider.h> -class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient +class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, tdeactioncollection.h does not forward declare KXMLGUIClient #include <klibloader.h> #include <kdebug.h> #include <tdeconfig.h> #include <ksimpleconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <klocale.h> #include <kinstance.h> |