Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp
index 4f92417..e23405b 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -160,7 +160,7 @@ KFeedbackForm::sendMail()
     if ( aboutData )
 	subject = aboutData->programName() + "-" + aboutData->version();
     else
-	subject = kapp->name();
+	subject = tdeApp->name();
 
     subject = "[kde-feedback] " + subject + " user feedback";
 
@@ -195,7 +195,7 @@ KFeedbackForm::sendMail()
     // Actually send mail
     //
 
-    kapp->invokeMailer( mail );
+    tdeApp->invokeMailer( mail );
 
     emit mailSent();
 }
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 6ba7a52..53ccf6c 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -118,7 +118,7 @@ KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : TDEMainWi
 
 	GlobalConfig = new KVpncConfig ( this, statusBar() );
 	GlobalConfig->appPointer = parent;
-	GlobalConfig->config = kapp->config();
+	GlobalConfig->config = tdeApp->config();
 
 	this->initStatusbar();
 	this->initAction();
@@ -698,7 +698,7 @@ void KVpnc:: quitCalled()
 				tmpPath = locateLocal ( "data", "kvpnc/" );
 				TQFile file ( tmpPath + "kvpnc_running" );
 				file.remove();
-				kapp->quit();
+				tdeApp->quit();
 			}
 		}
 		else
@@ -725,7 +725,7 @@ void KVpnc:: quitCalled()
 			tmpPath = locateLocal ( "data", "kvpnc/" );
 			TQFile file ( tmpPath + "kvpnc_running" );
 			file.remove();
-			kapp->quit();
+			tdeApp->quit();
 		}
 	}
 	if ( GlobalConfig->status == GlobalConfig->connecting )
@@ -752,7 +752,7 @@ void KVpnc:: quitCalled()
 		tmpPath = locateLocal ( "data", "kvpnc/" );
 		TQFile file ( tmpPath + "kvpnc_running" );
 		file.remove();
-		kapp->quit();
+		tdeApp->quit();
 
 	}
 	else
@@ -781,7 +781,7 @@ void KVpnc:: quitCalled()
 			tmpPath = locateLocal ( "data", "kvpnc/" );
 			TQFile file ( tmpPath + "kvpnc_running" );
 			file.remove();
-			kapp->quit();
+			tdeApp->quit();
 		}
 	}
 }
@@ -832,13 +832,13 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
 			TypeString = i18n ( "other" );
 	}
 
-	if ( GlobalConfig->dontQuitOnCloseEvent == false || quitFromKicker == true || kapp->sessionSaving() )
+	if ( GlobalConfig->dontQuitOnCloseEvent == false || quitFromKicker == true || tdeApp->sessionSaving() )
 	{
 		bool reallyQuit = false;
 		if ( GlobalConfig->status == GlobalConfig->connected )
 		{
 			int res;
-			if ( kapp->sessionSaving() )                //KDE is going down, skip tdewallet, disconnect and quit
+			if ( tdeApp->sessionSaving() )                //KDE is going down, skip tdewallet, disconnect and quit
 			{
 				if ( GlobalConfig->KvpncDebugLevel > 0 )
 					GlobalConfig->appendLogEntry ( i18n ( "Shutdown was called...exiting.\n" ), GlobalConfig->debug );
@@ -925,7 +925,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
 				}
 			}
 			e->accept();
-			kapp->quit();
+			tdeApp->quit();
 		}
 	}
 	else
@@ -947,7 +947,7 @@ bool KVpnc::queryExit()
 		disconnectClicked();
 	}
 
-	if ( !kapp->sessionSaving() )
+	if ( !tdeApp->sessionSaving() )
 	{
 		if ( GlobalConfig->KvpncDebugLevel > 1 )
 			GlobalConfig->appendLogEntry ( i18n ( "KVpnc::queryExit(): dont saving session" ), GlobalConfig->debug );
@@ -967,7 +967,7 @@ bool KVpnc::queryExit()
 
 bool KVpnc::queryClose()
 {
-	if ( kapp->sessionSaving() )
+	if ( tdeApp->sessionSaving() )
 	{
 		if ( GlobalConfig->KvpncDebugLevel > 1 )
 			GlobalConfig->appendLogEntry ( i18n ( "KVpnc::queryClose()" ), GlobalConfig->debug );