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 /khelpcenter/htmlsearch | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter/htmlsearch')
| -rw-r--r-- | khelpcenter/htmlsearch/htmlsearch.cpp | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/index.cpp | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/progressdialog.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index 70ba4960a..5fd0f4640 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -6,7 +6,7 @@ #include <kdebug.h> #include <kstandarddirs.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index b4dc93801..680f9f4ab 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -1,7 +1,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include "htmlsearch.h" diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index a011a2bc2..3db9c9895 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <tdeapplication.h> #include <tqcheckbox.h> diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp index e7eafedb1..33a783127 100644 --- a/khelpcenter/htmlsearch/progressdialog.cpp +++ b/khelpcenter/htmlsearch/progressdialog.cpp @@ -2,7 +2,7 @@ #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <kstandarddirs.h> |