diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/konq | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konq')
| -rw-r--r-- | kcontrol/konq/behaviour.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/browser.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/desktop.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/konq/desktopbehavior_impl.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/konq/fontopts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/previews.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/konq/rootopts.cpp | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 23f0748a9..a8f1e28c8 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeio/uiserver_stub.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_defaults.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index 96f370d77..dc6c20b73 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -20,7 +20,7 @@ #include <tqtabwidget.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <fixx11h.h> #include <tdecmoduleloader.h> diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 5c41bacec..973d94047 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -25,9 +25,9 @@ #include <tqslider.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <klineedit.h> #include <knuminput.h> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 2825de22f..d9920e8ad 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -32,8 +32,8 @@ #include <tqwhatsthis.h> #include <tdelistview.h> #include <kservice.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kmimetype.h> #include <ktrader.h> #include <tdeapplication.h> diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index edba20dc6..9a325966e 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdefontcombo.h> #include <tdefontdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_defaults.h> // include default values directly from konqueror #include "fontopts.h" diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 90ac4bef8..107270eca 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -29,9 +29,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kprotocolinfo.h> diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index c1bfa5a48..216c7518f 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -27,12 +27,12 @@ #include <kcustommenueditor.h> #include <kdebug.h> #include <tdefileitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kipc.h> #include <tdelistview.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <ktrader.h> |