diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:58:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:58:20 -0600 |
| commit | 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch) | |
| tree | 027fb6e879e17c2d65cbea9eab5c9da028618972 /noatun/modules/kaiman | |
| 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/kaiman')
| -rw-r--r-- | noatun/modules/kaiman/pref.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/kaiman/style.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/kaiman/userinterface.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 08af1b28..5e2193c7 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -16,13 +16,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> #include <tdelistbox.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kstandarddirs.h> #include <tdeconfig.h> diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 903660dd..2c318154 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -20,13 +20,13 @@ #include <tdeapplication.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> #include <tqpainter.h> #include <tqdropsite.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurldrag.h> #include <tqtimer.h> diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 36a41281..9f502178 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -42,12 +42,12 @@ #include <kdebug.h> #include <tdeapplication.h> #include <twin.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <kurldrag.h> |