diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:23 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:23 -0600 |
commit | e7f6c396cd6f903a118447cd894ef63299d8a218 (patch) | |
tree | 10991c53e84fc9d69880cc0769e60e499c73939e /katapult/plugins/catalogs/amarokcatalog | |
parent | 4dfec23a61d2218750724212722e8b850f79e83e (diff) | |
download | katapult-e7f6c396cd6f903a118447cd894ef63299d8a218.tar.gz katapult-e7f6c396cd6f903a118447cd894ef63299d8a218.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'katapult/plugins/catalogs/amarokcatalog')
-rw-r--r-- | katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp | 4 | ||||
-rw-r--r-- | katapult/plugins/catalogs/amarokcatalog/song.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp index d01352c..95fffd7 100644 --- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqpixmap.h> #include <tqstring.h> @@ -26,7 +26,7 @@ #include <tqdatastream.h> #include <kapp.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <katapultitem.h> diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp index 5c3d304..cd461ab 100644 --- a/katapult/plugins/catalogs/amarokcatalog/song.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kurl.h> #include <tqpixmap.h> |