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 /kscd | |
| parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
| download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/cddbdlg.cpp | 6 | ||||
| -rw-r--r-- | kscd/docking.cpp | 4 | ||||
| -rw-r--r-- | kscd/kcompactdisc.cpp | 4 | ||||
| -rw-r--r-- | kscd/kscd.cpp | 12 | ||||
| -rw-r--r-- | kscd/kscdmagic/main.cpp | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index eec94a70..40a17cbf 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -12,13 +12,13 @@ #include <klineedit.h> #include <knuminput.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <stdio.h> #include <math.h> diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 830e92ca..8d6cb859 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -30,8 +30,8 @@ #include <tdeaboutdata.h> #include <tdeactioncollection.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kpassivepopup.h> diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp index 4e477055..debfc6e3 100644 --- a/kscd/kcompactdisc.cpp +++ b/kscd/kcompactdisc.cpp @@ -22,8 +22,8 @@ #include <dcopref.h> #include <tqfile.h> #include <kdebug.h> -#include <klocale.h> -#include <kprotocolmanager.h> +#include <tdelocale.h> +#include <tdeprotocolmanager.h> #include <krun.h> #include "kcompactdisc.h" #include <netwm.h> diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index ee0be3b5..dd3c0967 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -42,24 +42,24 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kemailsettings.h> -#include <kglobal.h> +#include <tdeemailsettings.h> +#include <tdeglobal.h> #include <khelpmenu.h> #include <kkeydialog.h> #include <kiconloader.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <krun.h> #include <kstandarddirs.h> #include <kstdaction.h> #include <kstringhandler.h> #include <kurl.h> #include <kuniqueapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdecmoduleloader.h> #include <tdeconfigdialog.h> diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp index 9472ddf9..312b4b14 100644 --- a/kscd/kscdmagic/main.cpp +++ b/kscd/kscdmagic/main.cpp @@ -50,8 +50,8 @@ #include <getopt.h> #endif -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <tdeaboutdata.h> #include <dcopclient.h> |