diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol/konqhtml | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml')
| -rw-r--r-- | kcontrol/konqhtml/appearance.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konqhtml/domainlistview.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konqhtml/javaopts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konqhtml/jsopts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konqhtml/nsconfigwidget.ui | 4 | ||||
| -rw-r--r-- | kcontrol/konqhtml/pluginopts.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index cd54cd003..bb9db714a 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -12,7 +12,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kfontcombo.h> +#include <tdefontcombo.h> #include <kglobal.h> #include <tdehtmldefaults.h> #include <klocale.h> diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 3c8086abf..87daeea69 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -24,7 +24,7 @@ #include <tqwhatsthis.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index d08e0cdfc..f5cc93f12 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -12,7 +12,7 @@ // (c) Leo Savernik 2002-2003 #include <config.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index f27cd4153..adb00bd94 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -15,7 +15,7 @@ #include <tqwhatsthis.h> #include <tqvgroupbox.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <kurlrequester.h> diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index a20a0f02f..b784048e5 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -258,7 +258,7 @@ <includes> <include location="global" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> - <include location="global" impldecl="in declaration">klistbox.h</include> + <include location="global" impldecl="in declaration">tdelistbox.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> @@ -268,6 +268,6 @@ <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 6be5c1972..c02eb1679 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kprocio.h> |