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 /arts/gui | |
| parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
| download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'arts/gui')
| -rw-r--r-- | arts/gui/kde/dbtest.cpp | 2 | ||||
| -rw-r--r-- | arts/gui/kde/kpoti.cpp | 2 | ||||
| -rw-r--r-- | arts/gui/kde/kvolumefader_impl.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index 0cd781b1..e1933b17 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -2,7 +2,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <tdeactioncollection.h> #include <kdebug.h> diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index c0a3b5d2..ae9c6728 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -34,7 +34,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 15fc8c8a..da6a5d39 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -25,8 +25,8 @@ #include <tqstyle.h> #include <tqfont.h> #include <tqfontmetrics.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeaction.h> #include <kinputdialog.h> |