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

---
 tdm/kfrontend/krootimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdm/kfrontend/krootimage.cpp')

diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 69faf2d7c..baf3b3699 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -48,7 +48,7 @@ static Atom prop_root;
 static bool properties_inited = false;
 
 MyApplication::MyApplication( const char *conf )
-	: KApplication(),
+	: TDEApplication(),
 	  renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
 {
 	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
@@ -115,7 +115,7 @@ MyApplication::slotTimeout()
 int
 main( int argc, char *argv[] )
 {
-	KApplication::disableAutoDcopRegistration();
+	TDEApplication::disableAutoDcopRegistration();
 
 	KLocale::setMainCatalogue( "kdesktop" );
 	TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version );
-- 
cgit v1.2.1