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 /konqueror/listview | |
| 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 'konqueror/listview')
| -rw-r--r-- | konqueror/listview/konq_infolistviewitem.cc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_infolistviewwidget.cc | 6 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewwidget.h | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_textviewitem.h | 2 |
4 files changed, 6 insertions, 6 deletions
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 <konq_settings.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <kdebug.h> #include <klocale.h> #include <assert.h> 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 <klocale.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <kdebug.h> #include <kaction.h> #include <kservicetype.h> #include <kuserprofile.h> -#include <kio/metainfojob.h> +#include <tdeio/metainfojob.h> #include <tqstringlist.h> @@ -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 <tqvaluevector.h> #include <kurl.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <klistview.h> #include <tdeparts/browserextension.h> #include <konq_propsview.h> 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 <tqlistview.h> #include <tqstring.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klocale.h> #include "konq_listviewitems.h" #include "konq_textviewwidget.h" |