From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:15:55 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kcontrol/kfontinst/kio/KioFonts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kcontrol/kfontinst/kio')

diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index a27bebf70..7421d1681 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -110,7 +110,7 @@ int kdemain(int argc, char **argv)
 
     KLocale::setMainCatalogue(KFI_CATALOGUE);
 
-    KInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
+    TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
     KFI::CKioFonts slave(argv[2], argv[3]);
 
     slave.dispatchLoop();
-- 
cgit v1.2.1