diff options
author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/konqhtml | |
parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml')
-rw-r--r-- | kcontrol/konqhtml/advancedTabDialog.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/appearance.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/domainlistview.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/filteropts.cpp | 4 | ||||
-rw-r--r-- | kcontrol/konqhtml/htmlopts.h | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/jsopts.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/jspolicies.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/khttpoptdlg.h | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/pluginopts.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/policies.cpp | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/tdehtml_behavior.desktop | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/tdehtml_filter.desktop | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/tdehtml_fonts.desktop | 2 | ||||
-rw-r--r-- | kcontrol/konqhtml/tdehtml_java_js.desktop | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index 0464f39bd..e76e6b9b2 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -28,7 +28,7 @@ #include <dcopclient.h> #include <kcolorbutton.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "advancedTabDialog.h" #include "advancedTabOptions.h" diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 163bdd4f4..617197eba 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -9,7 +9,7 @@ #include <kapplication.h> #include <kcharsets.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <kfontcombo.h> diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index b61abd99b..8bc8a3e50 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -23,7 +23,7 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 1bb71d4db..06eb9bee1 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -16,11 +16,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <kaboutdata.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <dcopclient.h> #include <tqlayout.h> diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 5a582e68c..4e719d181 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -25,7 +25,7 @@ #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdecmodule.h> class TQRadioButton; class KIntNumInput; diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index e36743783..18baf833f 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -14,7 +14,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> #include <tqvgroupbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kdebug.h> #include <kurlrequester.h> diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index c035c1857..84ce7dda0 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -25,7 +25,7 @@ #include <tqradiobutton.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h index 3342f434b..d4e17af56 100644 --- a/kcontrol/konqhtml/khttpoptdlg.h +++ b/kcontrol/konqhtml/khttpoptdlg.h @@ -8,7 +8,7 @@ #include <tqstring.h> #include <tdecmodule.h> -#include <kconfig.h> +#include <tdeconfig.h> /** diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index c8f9f760d..6be5c1972 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -17,7 +17,7 @@ #include <dcopclient.h> #include <kapplication.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klistview.h> #include <klocale.h> diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp index 0c1cd3bc5..1e1de227e 100644 --- a/kcontrol/konqhtml/policies.cpp +++ b/kcontrol/konqhtml/policies.cpp @@ -19,7 +19,7 @@ */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "policies.h" diff --git a/kcontrol/konqhtml/tdehtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop index 01488fad4..8179247e4 100644 --- a/kcontrol/konqhtml/tdehtml_behavior.desktop +++ b/kcontrol/konqhtml/tdehtml_behavior.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#kbrowse-html Icon=konqueror -Exec=kcmshell tdehtml_behavior +Exec=tdecmshell tdehtml_behavior X-TDE-Library=konqhtml diff --git a/kcontrol/konqhtml/tdehtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop index e23404714..b657c2e1f 100644 --- a/kcontrol/konqhtml/tdehtml_filter.desktop +++ b/kcontrol/konqhtml/tdehtml_filter.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock Icon=filter -Exec=kcmshell tdehtml_filter +Exec=tdecmshell tdehtml_filter X-TDE-Library=konqhtml X-TDE-FactoryName=tdehtml_filter diff --git a/kcontrol/konqhtml/tdehtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop index 341508848..e6fbfa342 100644 --- a/kcontrol/konqhtml/tdehtml_fonts.desktop +++ b/kcontrol/konqhtml/tdehtml_fonts.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance Icon=fonts -Exec=kcmshell tdehtml_fonts +Exec=tdecmshell tdehtml_fonts X-TDE-Library=konqhtml diff --git a/kcontrol/konqhtml/tdehtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop index e0477c0e6..409f7f313 100644 --- a/kcontrol/konqhtml/tdehtml_java_js.desktop +++ b/kcontrol/konqhtml/tdehtml_java_js.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#kbrowse-java Icon=konqueror -Exec=kcmshell tdehtml_java_js +Exec=tdecmshell tdehtml_java_js X-TDE-Library=konqhtml |