Rename KApplication to TDEApplication to avoid conflicts with KDE4

remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 12 years ago
parent f7e4bdd856
commit 1ad423d43b

@ -30,7 +30,7 @@ int main(int argc, char* argv[])
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication app; TDEApplication app;
if (app.isRestored()) if (app.isRestored())
{ {

@ -299,7 +299,7 @@ void IndexDlg::timerEvent( TQTimerEvent* )
if ( elapsed > oldElapsed ) if ( elapsed > oldElapsed )
{ {
updateStats(); updateStats();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
if ( _aborted ) { if ( _aborted ) {
break; break;
} }

@ -961,7 +961,7 @@ void KDatMainWindow::fileDeleteBackupProfile()
void KDatMainWindow::fileQuit() void KDatMainWindow::fileQuit()
{ {
KApplication::kApplication()->quit(); TDEApplication::kApplication()->quit();
} }
void KDatMainWindow::editPreferences() void KDatMainWindow::editPreferences()
@ -972,7 +972,7 @@ void KDatMainWindow::editPreferences()
void KDatMainWindow::help() void KDatMainWindow::help()
{ {
KApplication::kApplication()->invokeHelp( ); TDEApplication::kApplication()->invokeHelp( );
} }
void KDatMainWindow::setTapePresent( bool tapePresent, bool eject ) void KDatMainWindow::setTapePresent( bool tapePresent, bool eject )
@ -1023,7 +1023,7 @@ void KDatMainWindow::setTapePresent( bool tapePresent, bool eject )
void KDatMainWindow::status( const TQString & msg ) void KDatMainWindow::status( const TQString & msg )
{ {
_statusBar->changeItem( msg, 0 ); _statusBar->changeItem( msg, 0 );
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
void KDatMainWindow::show() void KDatMainWindow::show()
@ -1106,7 +1106,7 @@ int KDatMainWindow::calcBackupSize( const TQString& workingDir, bool local, cons
.arg(Util::kbytesToString( size / 2 )) .arg(Util::kbytesToString( size / 2 ))
.arg(KStringHandler::csqueeze(*path, 60)); .arg(KStringHandler::csqueeze(*path, 60));
status( msg ); status( msg );
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
dir.setPath( *path ); dir.setPath( *path );
infoList = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, 0 ); infoList = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, 0 );
if ( infoList ) { if ( infoList ) {

@ -27,7 +27,7 @@ Options* Options::_instance = 0;
Options::Options() Options::Options()
{ {
_config = KApplication::kApplication()->config(); _config = TDEApplication::kApplication()->config();
_defaultTapeSize = _config->readNumEntry( "defaultTapeSize", 2*1024*1024 ); _defaultTapeSize = _config->readNumEntry( "defaultTapeSize", 2*1024*1024 );
_tapeBlockSize = _config->readNumEntry( "tapeBlockSize", 20*512 ); // Use tar default. _tapeBlockSize = _config->readNumEntry( "tapeBlockSize", 20*512 ); // Use tar default.

@ -348,7 +348,7 @@ void VerifyDlg::timerEvent( TQTimerEvent* )
} }
while ( ( !_done ) && ( !_aborted ) && ( !_wroteStdin ) ) while ( ( !_done ) && ( !_aborted ) && ( !_wroteStdin ) )
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
if ( _done || _aborted ) { if ( _done || _aborted ) {
/* 2002-01-30 LEW */ /* 2002-01-30 LEW */
#ifdef DEBUG #ifdef DEBUG
@ -367,7 +367,7 @@ void VerifyDlg::timerEvent( TQTimerEvent* )
if ( elapsed > oldElapsed ) if ( elapsed > oldElapsed )
{ {
updateStats(); updateStats();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
if ( _done || _aborted ) { if ( _done || _aborted ) {
break; break;
} }

@ -75,7 +75,7 @@ int main( int argc, char** argv )
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
aboutData.addAuthor( "Lawrence Widman", 0, "kdat@cardiothink.com"); aboutData.addAuthor( "Lawrence Widman", 0, "kdat@cardiothink.com");
// TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. // TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
app.setMainWidget( KDatMainWindow::getInstance() ); app.setMainWidget( KDatMainWindow::getInstance() );

@ -50,7 +50,7 @@
#include <klocale.h> #include <klocale.h>
extern KApplication *app; extern TDEApplication *app;
extern Opts *params; extern Opts *params;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

@ -49,7 +49,7 @@
#include "cache.h" #include "cache.h"
#include <klocale.h> #include <klocale.h>
extern KApplication *app; extern TDEApplication *app;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

@ -52,7 +52,7 @@
#include <klocale.h> #include <klocale.h>
extern KApplication *app; extern TDEApplication *app;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

@ -401,7 +401,7 @@ void KPACKAGE::fileQuit() // file->quit selected from menu
{ {
cleanUp(); cleanUp();
KApplication::exit(0); // exit the application TDEApplication::exit(0); // exit the application
} }
void KPACKAGE::cleanUp() // file->quit selected from menu void KPACKAGE::cleanUp() // file->quit selected from menu

@ -87,7 +87,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
aboutData.addAuthor( "Toivo Pedaste",0, "toivo@ucs.uwa.edu.au"); aboutData.addAuthor( "Toivo Pedaste",0, "toivo@ucs.uwa.edu.au");
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app; TDEApplication app;
kpkg = 0; kpkg = 0;
int j = 0; int j = 0;

@ -250,7 +250,7 @@ void packagePropertiesWidget::setSource(const TQString &name) {
if (s.startsWith("http:") || s.startsWith("ftp:")) if (s.startsWith("http:") || s.startsWith("ftp:"))
{ {
KApplication::kApplication()->invokeBrowser( s ); TDEApplication::kApplication()->invokeBrowser( s );
return; return;
} }

@ -50,7 +50,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
mainWidget *mw = 0; mainWidget *mw = 0;
KApplication a; TDEApplication a;
kapp->sharedConfig()->setGroup( "general" ); kapp->sharedConfig()->setGroup( "general" );
kug = new KUserGlobals(); kug = new KUserGlobals();

Loading…
Cancel
Save