diff options
author | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
---|---|---|
committer | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /khelpcenter/htmlsearch | |
parent | b2502b94cf23298f676853d91188b2cacc6ab0bd (diff) | |
parent | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff) | |
download | tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
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> |