diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
| commit | 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch) | |
| tree | 027fb6e879e17c2d65cbea9eab5c9da028618972 /noatun/modules/systray | |
| parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
| download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/systray')
| -rw-r--r-- | noatun/modules/systray/cmodule.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/systray/systray.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp index c0e04fd3..0ed5e232 100644 --- a/noatun/modules/systray/cmodule.cpp +++ b/noatun/modules/systray/cmodule.cpp @@ -28,8 +28,8 @@ #include "yhconfigwidget.h" #include <kdebug.h> -//#include <kglobal.h> -#include <klocale.h> +//#include <tdeglobal.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqcombobox.h> diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 3ef8841c..7f7cf7dc 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -41,9 +41,9 @@ #include <tdeaction.h> #include <tdeconfig.h> #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassivepopup.h> #include <kpixmapeffect.h> #include <kstdaction.h> @@ -61,7 +61,7 @@ #include <kstandarddirs.h> #include <netwm.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // TODO: Maybe make this value configurable? const int COVER_MAXW = 128; |