From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- konqueror/listview/konq_infolistviewitem.cc | 2 +- konqueror/listview/konq_infolistviewwidget.cc | 6 +++--- konqueror/listview/konq_listviewwidget.h | 2 +- konqueror/listview/konq_textviewitem.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'konqueror/listview') diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 2082821a8..42b9222ae 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -19,7 +19,7 @@ #include "konq_listview.h" #include -#include +#include #include #include #include diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index cb942dfe8..9a87baa17 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -22,12 +22,12 @@ #include "konq_listview.h" #include -#include +#include #include #include #include #include -#include +#include #include @@ -349,7 +349,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) #warning ### change this #endif // this will load the plugin which we don't need because we delegate - // the job to the kioslave + // the job to the tdeioslave (*it).hasPlugin = prov->plugin(it.key()); if ( (*it).hasPlugin) diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 9bdc60e3d..cbfcc446b 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index f091781e2..cbeda1730 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "konq_listviewitems.h" #include "konq_textviewwidget.h" -- cgit v1.2.1