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 /kaboodle | |
| parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
| download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaboodle')
| -rw-r--r-- | kaboodle/conf.cpp | 2 | ||||
| -rw-r--r-- | kaboodle/engine.cpp | 4 | ||||
| -rw-r--r-- | kaboodle/kaboodle_factory.cpp | 2 | ||||
| -rw-r--r-- | kaboodle/main.cpp | 2 | ||||
| -rw-r--r-- | kaboodle/player.cpp | 2 | ||||
| -rw-r--r-- | kaboodle/userinterface.cpp | 6 | ||||
| -rw-r--r-- | kaboodle/view.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp index 2c66f5a8..db4aa5e5 100644 --- a/kaboodle/conf.cpp +++ b/kaboodle/conf.cpp @@ -24,7 +24,7 @@ // in this Software without prior written authorization from the author(s). #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqvbox.h> diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp index 0b3c42f4..a53989d2 100644 --- a/kaboodle/engine.cpp +++ b/kaboodle/engine.cpp @@ -28,8 +28,8 @@ extern "C" #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <kurl.h> diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp index 818145d6..1517fa27 100644 --- a/kaboodle/kaboodle_factory.cpp +++ b/kaboodle/kaboodle_factory.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include "kaboodle_factory.h" #include "player.h" diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp index 0a206cfc..d83fb8cf 100644 --- a/kaboodle/main.cpp +++ b/kaboodle/main.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> #include "kaboodle_factory.h" diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp index cebab8cd..af53a91b 100644 --- a/kaboodle/player.cpp +++ b/kaboodle/player.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include "engine.h" diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 49303b66..08531166 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -26,10 +26,10 @@ #include <tdeconfig.h> #include <kdialog.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemenubar.h> #include <kpropertiesdialog.h> #include <kstatusbar.h> #include <kstdaction.h> diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 9a5823b5..2fe044d4 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kvideowidget.h> #include <tqdragobject.h> #include <tqlabel.h> |