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/simple | |
| 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/simple')
| -rw-r--r-- | noatun/modules/simple/propertiesdialog.ui.h | 2 | ||||
| -rw-r--r-- | noatun/modules/simple/userinterface.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index 5a3953c8..bae647f6 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -8,7 +8,7 @@ version 2.1 of the License, or (at your option) any later version. */ -#include <klocale.h> +#include <tdelocale.h> void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) { diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index ebac7ce7..c600338d 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -18,12 +18,12 @@ #include <noatun/stdaction.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurldrag.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdepopupmenu.h> #include <kstatusbar.h> #include <kstdaction.h> |