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

---
 kioslave/trash/kio_trash.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kioslave/trash')

diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index edd0c372e..8b033abd4 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -52,7 +52,7 @@ static const KCmdLineOptions options[] =
 extern "C" {
     int KDE_EXPORT kdemain( int argc, char **argv )
     {
-        //KInstance instance( "kio_trash" );
+        //TDEInstance instance( "kio_trash" );
         // TDEApplication is necessary to use kio_file
         putenv(strdup("SESSION_MANAGER="));
         TDEApplication::disableAutoDcopRegistration();
-- 
cgit v1.2.1