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

---
 kioslave/file/file.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kioslave/file/file.cc')

diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 2deeb3535..4e3865837 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -113,7 +113,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 int kdemain( int argc, char **argv )
 {
   KLocale::setMainCatalogue("tdelibs");
-  KInstance instance( "kio_file" );
+  TDEInstance instance( "kio_file" );
   ( void ) KGlobal::locale();
 
   kdDebug(7101) << "Starting " << getpid() << endl;
-- 
cgit v1.2.1