diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:54:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:54:06 -0600 |
| commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
| tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /konq-plugins/sidebar/metabar/src | |
| parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
| download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/metabar/src')
9 files changed, 10 insertions, 10 deletions
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 66d6827..1508c30 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -31,7 +31,7 @@ #include <tqdatastream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kicondialog.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 2b2147a..3677663 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -25,7 +25,7 @@ #include <kstandarddirs.h> #include <kicontheme.h> #include <tdehtmlview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdesktopfile.h> #include <ktrader.h> diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index 1595d4e..5930589 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -27,7 +27,7 @@ #include <kicontheme.h> #include <tdehtmlview.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopref.h> #include <dcopclient.h> diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 08e38a0..d479417 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -1,7 +1,7 @@ #include <kinstance.h> #include <tqstring.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include "metabarwidget.h" #include "metabar.h" diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 18417cf..89e6e52 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -40,11 +40,11 @@ #include <kstandarddirs.h> #include <kurl.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kicontheme.h> #include <ktrader.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <kdesktopfile.h> #include <kpropertiesdialog.h> diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index a08a01c..877133b 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -25,7 +25,7 @@ #include <kimageio.h> #include <kmdcodec.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <html_document.h> #include <html_image.h> diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp index 395c2cb..9256731 100644 --- a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp @@ -21,7 +21,7 @@ #include "remoteplugin.h" #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> RemotePlugin::RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name) diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 7bf310c..167009e 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -33,7 +33,7 @@ #include <tdeaction.h> #include <tdeshortcut.h> #include <ksimpleconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 4a053dd..48b4afc 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -23,7 +23,7 @@ #include <tdecmoduleinfo.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <html_document.h> #include <html_element.h> |