From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:17:06 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kioslave/trash/ktrash.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kioslave/trash/ktrash.cpp')

diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp
index 41980b060..630b8e314 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/kioslave/trash/ktrash.cpp
@@ -37,14 +37,14 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init( argc, argv, "ktrash",
                         I18N_NOOP( "ktrash" ),
                         I18N_NOOP( "Helper program to handle the TDE trash can\n"
 				   "Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ),
                         TDE_VERSION_STRING );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if ( args->isSet( "empty" ) ) {
-- 
cgit v1.2.1