summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:14:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:14:52 -0600
commit1ad423d43bfed127171bdfe8685e1d957eecf957 (patch)
tree25727a855108dcdcaa0b9d37732beb5ec7ed6a08
parentf7e4bdd856bc418cebaaa7ad09010ab389fc4fbc (diff)
downloadtdeadmin-1ad423d43bfed127171bdfe8685e1d957eecf957.tar.gz
tdeadmin-1ad423d43bfed127171bdfe8685e1d957eecf957.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--kcron/main.cpp2
-rw-r--r--kdat/IndexDlg.cpp2
-rw-r--r--kdat/KDatMainWindow.cpp8
-rw-r--r--kdat/Options.cpp2
-rw-r--r--kdat/VerifyDlg.cpp4
-rw-r--r--kdat/main.cpp2
-rw-r--r--kpackage/debDpkgInterface.cpp2
-rw-r--r--kpackage/debInterface.cpp2
-rw-r--r--kpackage/kissInterface.cpp2
-rw-r--r--kpackage/kpackage.cpp2
-rw-r--r--kpackage/main.cpp2
-rw-r--r--kpackage/packageProperties.cpp2
-rw-r--r--kuser/main.cpp2
13 files changed, 17 insertions, 17 deletions
diff --git a/kcron/main.cpp b/kcron/main.cpp
index ba299c7..627271c 100644
--- a/kcron/main.cpp
+++ b/kcron/main.cpp
@@ -30,7 +30,7 @@ int main(int argc, char* argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
- KApplication app;
+ TDEApplication app;
if (app.isRestored())
{
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() );
diff --git a/kpackage/debDpkgInterface.cpp b/kpackage/debDpkgInterface.cpp
index a1c4504..62f199a 100644
--- a/kpackage/debDpkgInterface.cpp
+++ b/kpackage/debDpkgInterface.cpp
@@ -50,7 +50,7 @@
#include <klocale.h>
-extern KApplication *app;
+extern TDEApplication *app;
extern Opts *params;
//////////////////////////////////////////////////////////////////////////////
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index 41146fe..74ef515 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -49,7 +49,7 @@
#include "cache.h"
#include <klocale.h>
-extern KApplication *app;
+extern TDEApplication *app;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 34b3b4b..e98d385 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -52,7 +52,7 @@
#include <klocale.h>
-extern KApplication *app;
+extern TDEApplication *app;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 2c90b9f..75aeabb 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -401,7 +401,7 @@ void KPACKAGE::fileQuit() // file->quit selected from menu
{
cleanUp();
- KApplication::exit(0); // exit the application
+ TDEApplication::exit(0); // exit the application
}
void KPACKAGE::cleanUp() // file->quit selected from menu
diff --git a/kpackage/main.cpp b/kpackage/main.cpp
index 52731d2..b5a63ec 100644
--- a/kpackage/main.cpp
+++ b/kpackage/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &aboutData );
aboutData.addAuthor( "Toivo Pedaste",0, "toivo@ucs.uwa.edu.au");
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KApplication app;
+ TDEApplication app;
kpkg = 0;
int j = 0;
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 2e1aca7..490bc50 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -250,7 +250,7 @@ void packagePropertiesWidget::setSource(const TQString &name) {
if (s.startsWith("http:") || s.startsWith("ftp:"))
{
- KApplication::kApplication()->invokeBrowser( s );
+ TDEApplication::kApplication()->invokeBrowser( s );
return;
}
diff --git a/kuser/main.cpp b/kuser/main.cpp
index 7f00a7c..316967a 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
mainWidget *mw = 0;
- KApplication a;
+ TDEApplication a;
kapp->sharedConfig()->setGroup( "general" );
kug = new KUserGlobals();