From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:16:20 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 konqueror/listview/konq_listview.h        | 4 ++--
 konqueror/listview/konq_listviewwidget.cc | 2 +-
 konqueror/listview/konq_listviewwidget.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'konqueror/listview')

diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 40f8b2269..127ecc3b2 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -20,10 +20,10 @@
 #ifndef __konq_listview_h__
 #define __konq_listview_h__
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kglobalsettings.h>
 #include <konq_operations.h>
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 #include <konq_dirpart.h>
 #include <kmimetyperesolver.h>
 
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 1dd7a25ad..bd26db191 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -840,7 +840,7 @@ void KonqBaseListViewWidget::startDrag()
    {
       int iconSize = m_pBrowserView->m_pProps->iconSize();
       iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
-      pixmap2 = DesktopIcon( "kmultiple", iconSize );
+      pixmap2 = DesktopIcon( "tdemultiple", iconSize );
       if ( pixmap2.isNull() )
           kdWarning(1202) << "Could not find multiple pixmap" << endl;
    }
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 5dd6aca11..9bdc60e3d 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <kfileitem.h>
 #include <klistview.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <konq_propsview.h>
 #include "konq_listviewitems.h"
 
-- 
cgit v1.2.1