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/infrared | |
| 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/infrared')
| -rw-r--r-- | noatun/modules/infrared/infrared.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/infrared/irprefs.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/infrared/lirc.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp index 1bfe0aae..bd8a65bd 100644 --- a/noatun/modules/infrared/infrared.cpp +++ b/noatun/modules/infrared/infrared.cpp @@ -5,7 +5,7 @@ #include <noatun/player.h> #include <noatun/app.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> #include "infrared.h" diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index c3c2c89d..06a1ade4 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -5,7 +5,7 @@ #include <noatun/app.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdelistview.h> #include <kcombobox.h> diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 7278b0ec..2487278b 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -7,8 +7,8 @@ #include <tqsocket.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "lirc.h" |