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

---
 kdat/IndexDlg.cpp       | 2 +-
 kdat/KDatMainWindow.cpp | 8 ++++----
 kdat/Options.cpp        | 2 +-
 kdat/VerifyDlg.cpp      | 4 ++--
 kdat/main.cpp           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kdat')

diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 1d19d0a..20f2140 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -299,7 +299,7 @@ void IndexDlg::timerEvent( TQTimerEvent* )
             if ( elapsed > oldElapsed )
             {
                 updateStats();
-                KApplication::kApplication()->processEvents();
+                TDEApplication::kApplication()->processEvents();
                 if ( _aborted ) {
                     break;
                 }
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 110296b..d43b91b 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -961,7 +961,7 @@ void KDatMainWindow::fileDeleteBackupProfile()
 
 void KDatMainWindow::fileQuit()
 {
-    KApplication::kApplication()->quit();
+    TDEApplication::kApplication()->quit();
 }
 
 void KDatMainWindow::editPreferences()
@@ -972,7 +972,7 @@ void KDatMainWindow::editPreferences()
 
 void KDatMainWindow::help()
 {
-    KApplication::kApplication()->invokeHelp( );
+    TDEApplication::kApplication()->invokeHelp( );
 }
 
 void KDatMainWindow::setTapePresent( bool tapePresent, bool eject )
@@ -1023,7 +1023,7 @@ void KDatMainWindow::setTapePresent( bool tapePresent, bool eject )
 void KDatMainWindow::status( const TQString & msg )
 {
     _statusBar->changeItem( msg, 0 );
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 void KDatMainWindow::show()
@@ -1106,7 +1106,7 @@ int KDatMainWindow::calcBackupSize( const TQString& workingDir, bool local, cons
              .arg(Util::kbytesToString( size / 2 ))
              .arg(KStringHandler::csqueeze(*path, 60));
             status( msg );
-            KApplication::kApplication()->processEvents();
+            TDEApplication::kApplication()->processEvents();
             dir.setPath( *path );
             infoList = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, 0 );
             if ( infoList ) {
diff --git a/kdat/Options.cpp b/kdat/Options.cpp
index 234d802..e3475f9 100644
--- a/kdat/Options.cpp
+++ b/kdat/Options.cpp
@@ -27,7 +27,7 @@ Options* Options::_instance = 0;
 
 Options::Options()
 {
-    _config = KApplication::kApplication()->config();
+    _config = TDEApplication::kApplication()->config();
 
     _defaultTapeSize   = _config->readNumEntry( "defaultTapeSize", 2*1024*1024 );
     _tapeBlockSize     = _config->readNumEntry( "tapeBlockSize", 20*512 );  // Use tar default.
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 19477c9..3b1c9b1 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -348,7 +348,7 @@ void VerifyDlg::timerEvent( TQTimerEvent* )
             }
 
             while ( ( !_done ) && ( !_aborted ) && ( !_wroteStdin ) )
-	         KApplication::kApplication()->processEvents();
+	         TDEApplication::kApplication()->processEvents();
             if ( _done || _aborted ) {
 	      /* 2002-01-30 LEW */
 #ifdef DEBUG
@@ -367,7 +367,7 @@ void VerifyDlg::timerEvent( TQTimerEvent* )
             if ( elapsed > oldElapsed )
             {
                 updateStats();
-                KApplication::kApplication()->processEvents();
+                TDEApplication::kApplication()->processEvents();
                 if ( _done || _aborted ) {
                     break;
                 }
diff --git a/kdat/main.cpp b/kdat/main.cpp
index 7a70f8d..9d4c27a 100644
--- a/kdat/main.cpp
+++ b/kdat/main.cpp
@@ -75,7 +75,7 @@ int main( int argc, char** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   aboutData.addAuthor( "Lawrence Widman", 0, "kdat@cardiothink.com");
 //  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-  KApplication app;
+  TDEApplication app;
   
   app.setMainWidget( KDatMainWindow::getInstance() );
 
-- 
cgit v1.2.3