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

---
 kio/misc/kfile/fileprops.cpp   | 2 +-
 kio/misc/kmailservice.cpp      | 2 +-
 kio/misc/kntlm/kntlm.cpp       | 4 ++--
 kio/misc/ksendbugmail/main.cpp | 2 +-
 kio/misc/ktelnetservice.cpp    | 2 +-
 kio/misc/kwalletd/kwalletd.cpp | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kio/misc')

diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index ac9954563..cba281cc7 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -423,7 +423,7 @@ int main( int argc, char **argv )
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     bool useGUI = args->isSet( "dialog" );
 
-    KApplication app( useGUI, useGUI );
+    TDEApplication app( useGUI, useGUI );
 
     TQPtrList<FileProps> m_props;
     m_props.setAutoDelete( true );
diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp
index a9f59ca36..3b2eb8cf7 100644
--- a/kio/misc/kmailservice.cpp
+++ b/kio/misc/kmailservice.cpp
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
     TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication a( false, false );
+    TDEApplication a( false, false );
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index 9af382483..dd9cd33ec 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -265,7 +265,7 @@ TQByteArray KNTLM::getLMv2Response( const TQString &target, const TQString &user
   TQByteArray hash = ntlmv2Hash( target, user, password );
   TQByteArray clientChallenge( 8 );
   for ( uint i = 0; i<8; i++ ) {
-    clientChallenge.data()[i] = KApplication::random() % 0xff;
+    clientChallenge.data()[i] = TDEApplication::random() % 0xff;
   }
   return lmv2Response( hash, clientChallenge, challenge );
 }
@@ -304,7 +304,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
   now *= (TQ_UINT64)10000000;
   bl->timestamp = KFromToLittleEndian( now );
   for ( uint i = 0; i<8; i++ ) {
-    bl->challenge[i] = KApplication::random() % 0xff;
+    bl->challenge[i] = TDEApplication::random() % 0xff;
   }
   memcpy( blob.data() + sizeof(Blob), targetinfo.data(), targetinfo.size() );
   return blob;
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 1f900426f..527d8545f 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char **argv) {
     TDECmdLineArgs::addCmdLineOptions(options);
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    KApplication a(false, false);
+    TDEApplication a(false, false);
 
     TQCString recipient = args->getOption("recipient");
     if (recipient.isEmpty())
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index d0f93aaf1..ea8708863 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 			   I18N_NOOP("telnet protocol handler"), "unknown");
 	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication app;
+	TDEApplication app;
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index eca13c463..a88f4e5b1 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -95,7 +95,7 @@ KWalletD::KWalletD(const TQCString &name)
 	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
 	reconfigure();
 	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
-	connect(KApplication::dcopClient(),
+	connect(TDEApplication::dcopClient(),
 		TQT_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
 		TQT_SLOT(slotAppUnregistered(const TQCString&)));
@@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 		}
 		emitDCOPSignal("walletOpened(TQString)", data);
 		if (_wallets.count() == 1 && _launchManager) {
-			KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
+			TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
 		}
 	} else {
 		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
-- 
cgit v1.2.1