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/konq | |
| 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/konq')
| -rw-r--r-- | kcontrol/konq/desktopbehavior.ui | 4 | ||||
| -rw-r--r-- | kcontrol/konq/desktopbehavior_impl.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/fontopts.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/konq/previews.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/rootopts.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index e2593e205..e6acb6ed6 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -412,7 +412,7 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 1134dd8ed..c7242de26 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -30,7 +30,7 @@ #include <tqbuttongroup.h> #include <tqtabwidget.h> #include <tqwhatsthis.h> -#include <klistview.h> +#include <tdelistview.h> #include <kservice.h> #include <klocale.h> #include <kglobalsettings.h> diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 1f795c6a8..c002c5197 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -30,8 +30,8 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kfontcombo.h> -#include <kfontdialog.h> +#include <tdefontcombo.h> +#include <tdefontdialog.h> #include <klocale.h> #include <konq_defaults.h> // include default values directly from konqueror diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index b0528b5dc..ea1d637a4 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <knuminput.h> #include <kprotocolinfo.h> diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 52e8a07cb..4fa7620a8 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -29,7 +29,7 @@ #include <tdefileitem.h> #include <kglobalsettings.h> #include <kipc.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> |