Rename KApplication to TDEApplication to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

diff --git a/kppp/ChangeLog b/kppp/ChangeLog
index e3657e16..8aea4f64 100644
--- a/kppp/ChangeLog
+++ b/kppp/ChangeLog
@@ -124,7 +124,7 @@
 
 	* don't ignore SIGHUP anymore. Forbidding Ctrl-Z is crazy.
 	* a bit more respect for Session Managment by adding handlers
-	  for KApplication::saveYourSelf() and shutDown(). A user
+	  for TDEApplication::saveYourSelf() and shutDown(). A user
           had reported corrupted config data.
 	* made 'Log' a toggle button to represent debug window state
 
@@ -1182,7 +1182,7 @@
 	* replaced klocale->translate() with i18n() and every reference to
 	XPPP with KPPP
 	* utilize �kapp� (defined in kapp.h) instead of the global �extern
-	KApplication *app�
+	TDEApplication *app�
 	(Sorry about the large amount of changes, but I couldn�t resist to 
         clean up the code)
 
@@ -1344,7 +1344,7 @@ Wed Mar 18 01:13:50 1998  Harri Porten  <[email protected]>
 
 Mon Mar 16 03:37:04 1998  Bernd Johannes Wuebben  <[email protected]>
 
-	* command line options need to be parse after creating a KApplications
+	* command line options need to be parse after creating a TDEApplications
 	due to some changes by Matthias in kapp I think.
 
 1998-03-15  Mario Weilguni  <[email protected]>
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 3d1515f7..89058d94 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -274,9 +274,9 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 	  this, TQT_SLOT(startAccounting()));
   connect(con, TQT_SIGNAL(stopAccounting()),
 	  this, TQT_SLOT(stopAccounting()));
-  connect(KApplication::kApplication(), TQT_SIGNAL(saveYourself()),
+  connect(TDEApplication::kApplication(), TQT_SIGNAL(saveYourself()),
 	  this, TQT_SLOT(saveMyself()));
-  connect(KApplication::kApplication(), TQT_SIGNAL(shutDown()),
+  connect(TDEApplication::kApplication(), TQT_SIGNAL(shutDown()),
 	  this, TQT_SLOT(shutDown()));
 
   debugwindow->setGeometry(desk.center().x()+190, desk.center().y()-55,
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index bd56c7fe..4d0bba30 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
 
   TDECmdLineArgs::addCmdLineOptions( option );
 
-  KApplication a;
+  TDEApplication a;
 
   loadLogs();
 
diff --git a/kppp/main.cpp b/kppp/main.cpp
index d922c4c5..93f31f6d 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -212,7 +212,7 @@ int main( int argc, char **argv ) {
 
 
 
-  KApplication a;
+  TDEApplication a;
 
   // set portable locale for decimal point
   setlocale(LC_NUMERIC ,"C");
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 5417a1a2..990a1088 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -191,7 +191,7 @@ void MiniTerm::cancelbutton() {
 
   statusbar->setText(i18n("Hanging up..."));
   kapp->processEvents();
-  KApplication::flushX();
+  TDEApplication::flushX();
 
   Modem::modem->hangup();
 
@@ -206,7 +206,7 @@ void MiniTerm::resetModem() {
   statusbar->setText(i18n("Resetting Modem"));
   terminal->newLine();
   kapp->processEvents();
-  KApplication::flushX();
+  TDEApplication::flushX();
 
   Modem::modem->hangup();