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

---
 kcontrol/kfontinst/kcmfontinst/KCmFontInst.h     | 2 +-
 kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kcontrol/kfontinst/kcmfontinst')

diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 14cb8ee58..c3d64c7b0 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -39,7 +39,7 @@
 #include <kconfig.h>
 #include <kio/job.h>
 #ifdef HAVE_XFT
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #endif
 
 class KDirOperator;
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 03158eff7..0d05799d9 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject()
         urls.append( (*it)->url() );
 
     if(urls.count()> 1)
-        pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall);
+        pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
     if(pixmap.isNull())
         pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);
 
-- 
cgit v1.2.1