diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:37 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:37 -0600 |
commit | 279764bab1514a051db18e14241e9bae62be14d6 (patch) | |
tree | c587a443a0a228897e395535e2791dbde757bb3d /klinkstatus/src | |
parent | ee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff) | |
download | tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'klinkstatus/src')
-rw-r--r-- | klinkstatus/src/actionmanager.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkchecker.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkstatus.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkstatus.h | 2 | ||||
-rw-r--r-- | klinkstatus/src/engine/searchmanager.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/klinkstatus.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/klinkstatus_part.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/main.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/documentrootdialog.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/klshistorycombo.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/resultssearchbar.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/resultview.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/sessionwidget.cpp | 6 | ||||
-rw-r--r-- | klinkstatus/src/ui/settings/configidentificationdialog.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/tablelinkstatus.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/ui/tabwidgetsession.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/treeview.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/utils/utils.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/utils/xsl.cpp | 2 |
19 files changed, 26 insertions, 26 deletions
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index e60f2503..f738b44d 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -21,7 +21,7 @@ #include <tdeactioncollection.h> #include <kxmlguifactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kguiitem.h> diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 9d2a01ee..134b9582 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -34,7 +34,7 @@ #include <tdeio/slave.h> #include <kmimetype.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdehtml_part.h> #include <dom/html_misc.h> #include <dom/dom_node.h> diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp index bf5986f5..adda3b2e 100644 --- a/klinkstatus/src/engine/linkstatus.cpp +++ b/klinkstatus/src/engine/linkstatus.cpp @@ -22,7 +22,7 @@ #include "../parser/node.h" #include "../ui/treeview.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcharsets.h> #include <tqdom.h> diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h index ac49801f..118de371 100644 --- a/klinkstatus/src/engine/linkstatus.h +++ b/klinkstatus/src/engine/linkstatus.h @@ -25,7 +25,7 @@ #include "../utils/mvector.h" #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> class TreeView; class TreeViewItem; diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 737645af..f04d5063 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -20,9 +20,9 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdehtml_part.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <tqstring.h> #include <tqvaluevector.h> diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index cf8abf2b..a1cfe5a7 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -28,9 +28,9 @@ #include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaccel.h> diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index d7732280..cf1b6122 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaction.h> #include <kstdaction.h> @@ -30,7 +30,7 @@ #include <tdeaboutapplication.h> #include <kbugreport.h> #include <tdeconfigdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeshortcut.h> #include <tdeaccel.h> #include <kkeydialog.h> diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp index 89fddd48..98f6d18d 100644 --- a/klinkstatus/src/main.cpp +++ b/klinkstatus/src/main.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <iostream> diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index b1563285..6afb9618 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -20,7 +20,7 @@ #include "documentrootdialog.h" #include <kurlrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tqstring.h> diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index 2733d199..3bfddd0d 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tdestdaccel.h> #include <kurldrag.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> bool KLSHistoryCombo::items_saved_ = false; diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index d99626b4..d5e4293d 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -23,7 +23,7 @@ #include <kcombobox.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp index fdf65099..d79bffdb 100644 --- a/klinkstatus/src/ui/resultview.cpp +++ b/klinkstatus/src/ui/resultview.cpp @@ -15,7 +15,7 @@ #include <tqpainter.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kiconloader.h> diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index a82c5527..53ee3bd5 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -23,14 +23,14 @@ #include <kcombobox.h> #include <ksqueezedtextlabel.h> #include <kprogress.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kpushbutton.h> #include <tdefiledialog.h> #include <tdeactionclasses.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ksavefile.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 3abc7e2f..d9e20145 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -20,7 +20,7 @@ #include "configidentificationdialog.h" -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <kpushbutton.h> #include <klineedit.h> diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 2d2ad497..af78ca0b 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -34,8 +34,8 @@ #include <kstandarddirs.h> #include <krun.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 26a5e131..dead2278 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -34,7 +34,7 @@ #include <tdeapplication.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstringhandler.h> #include <kcharsets.h> #include <kmimetype.h> diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index eb56abe1..7dd4df3c 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -18,13 +18,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <kurl.h> #include <krun.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kcharsets.h> diff --git a/klinkstatus/src/utils/utils.cpp b/klinkstatus/src/utils/utils.cpp index 18abc6b7..081ead99 100644 --- a/klinkstatus/src/utils/utils.cpp +++ b/klinkstatus/src/utils/utils.cpp @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 496719df..33358a14 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -42,7 +42,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> /** |