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 /konqueror/sidebar/web_module | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/web_module')
| -rw-r--r-- | konqueror/sidebar/web_module/web_module.cpp | 4 | ||||
| -rw-r--r-- | konqueror/sidebar/web_module/web_module.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index da5a5c9bb..44a94f02c 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -25,8 +25,8 @@ #include <dom/html_inline.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <konq_pixmapprovider.h> #include <tdeparts/browserextension.h> #include <kstandarddirs.h> diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 494f1050a..938677d8d 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -22,7 +22,7 @@ #include <assert.h> #include <tdehtml_part.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <konqsidebarplugin.h> #include <tdepopupmenu.h> #include <tqobject.h> |