diff options
71 files changed, 188 insertions, 188 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index 240d3b2a..a49eac60 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -59,7 +59,7 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char TQBoxLayout *warningLayout = new TQHBoxLayout; TQLabel *warningIcon = new TQLabel(mainWidget); - TDEIconLoader *loader = kapp->iconLoader(); + TDEIconLoader *loader = tdeApp->iconLoader(); warningIcon->setPixmap(loader->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true)); diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp index b267bb75..2c4bed62 100644 --- a/cervisia/cervisiashell.cpp +++ b/cervisia/cervisiashell.cpp @@ -52,7 +52,7 @@ CervisiaShell::CervisiaShell( const char *name ) { KMessageBox::detailedError(this, i18n("The Cervisia library could not be loaded."), KLibLoader::self()->lastErrorMessage()); - kapp->quit(); + tdeApp->quit(); return; } @@ -79,7 +79,7 @@ CervisiaShell::CervisiaShell( const char *name ) setAutoSaveSettings("MainWindow", true); // if the session is restoring, we already read the settings - if( !kapp->isRestored() ) + if( !tdeApp->isRestored() ) readSettings(); } @@ -104,7 +104,7 @@ void CervisiaShell::setupActions() action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::quit( kapp, TQ_SLOT( quit() ), actionCollection() ); + action = KStdAction::quit( tdeApp, TQ_SLOT( quit() ), actionCollection() ); hint = i18n("Exits Cervisia"); action->setToolTip( hint ); action->setWhatsThis( hint ); @@ -183,7 +183,7 @@ void CervisiaShell::readProperties(TDEConfig* config) // if the session is restoring, make sure we open the URL // since it's not handled by main() - if( kapp->isRestored() ) + if( tdeApp->isRestored() ) openURL(); } diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp index 9ec94763..21370f83 100644 --- a/cervisia/cvsservice/cvsservice.cpp +++ b/cervisia/cvsservice/cvsservice.cpp @@ -74,7 +74,7 @@ CvsService::CvsService() : DCOPObject("CvsService") , d(new Private) { - d->appId = kapp->dcopClient()->appId(); + d->appId = tdeApp->dcopClient()->appId(); // create non-concurrent cvs job d->singleCvsJob = new CvsJob(SINGLE_JOB_ID); @@ -86,7 +86,7 @@ CvsService::CvsService() d->cvsJobs.setAutoDelete(true); d->loginJobs.setAutoDelete(true); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TDEConfigGroupSaver cs(config, "General"); if( config->readBoolEntry("UseSshAgent", false) ) { @@ -950,7 +950,7 @@ DCOPRef CvsService::watchers(const TQStringList& files) void CvsService::quit() { - kapp->quit(); + tdeApp->quit(); } diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp index cd983230..7a25df38 100644 --- a/cervisia/cvsservice/repository.cpp +++ b/cervisia/cvsservice/repository.cpp @@ -193,7 +193,7 @@ void Repository::slotConfigDirty(const TQString& fileName) if( fileName == d->configFileName ) { // reread the configuration data from disk - kapp->config()->reparseConfiguration(); + tdeApp->config()->reparseConfiguration(); d->readConfig(); } } @@ -201,7 +201,7 @@ void Repository::slotConfigDirty(const TQString& fileName) void Repository::Private::readGeneralConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // get path to cvs client programm config->setGroup("General"); @@ -211,7 +211,7 @@ void Repository::Private::readGeneralConfig() void Repository::Private::readConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // Sometimes the location can be unequal to the entry in the CVS/Root. // diff --git a/cervisia/main.cpp b/cervisia/main.cpp index 0066c39a..3bf8ca41 100644 --- a/cervisia/main.cpp +++ b/cervisia/main.cpp @@ -65,13 +65,13 @@ static int ShowResolveDialog(const TQString& fileName) TDEConfig* config = new TDEConfig("cervisiapartrc"); ResolveDialog* dlg = new ResolveDialog(*config); - kapp->setMainWidget(dlg); + tdeApp->setMainWidget(dlg); if( dlg->parseFile(fileName) ) dlg->show(); else delete dlg; - int result = kapp->exec(); + int result = tdeApp->exec(); delete config; @@ -83,7 +83,7 @@ static int ShowLogDialog(const TQString& fileName) { TDEConfig* config = new TDEConfig("cervisiapartrc"); LogDialog* dlg = new LogDialog(*config); - kapp->setMainWidget(dlg); + tdeApp->setMainWidget(dlg); // get directory for file const TQFileInfo fi(fileName); @@ -97,7 +97,7 @@ static int ShowLogDialog(const TQString& fileName) else delete dlg; - int result = kapp->exec(); + int result = tdeApp->exec(); // stop the cvs DCOP service cvsService->quit(); @@ -113,7 +113,7 @@ static int ShowAnnotateDialog(const TQString& fileName) { TDEConfig* config = new TDEConfig("cervisiapartrc"); AnnotateDialog* dlg = new AnnotateDialog(*config); - kapp->setMainWidget(dlg); + tdeApp->setMainWidget(dlg); // get directory for file const TQFileInfo fi(fileName); @@ -125,7 +125,7 @@ static int ShowAnnotateDialog(const TQString& fileName) AnnotateController ctl(dlg, cvsService); ctl.showDialog(fi.fileName()); - int result = kapp->exec(); + int result = tdeApp->exec(); // stop the cvs DCOP service cvsService->quit(); diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp index 28ebb59d..e29a2017 100644 --- a/cervisia/progressdlg.cpp +++ b/cervisia/progressdlg.cpp @@ -133,7 +133,7 @@ bool ProgressDialog::execute() return false; TQApplication::setOverrideCursor(waitCursor); - kapp->enter_loop(); + tdeApp->enter_loop(); if (TQApplication::overrideCursor()) TQApplication::restoreOverrideCursor(); @@ -197,7 +197,7 @@ void ProgressDialog::slotJobExited(bool normalExit, int status) // error messages or the process has been aborted // 'by hand' (e.g. by clicking the cancel button) if( !d->hasError || !normalExit ) - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -209,7 +209,7 @@ void ProgressDialog::slotCancel() if( isRunning ) d->cvsJob->cancel(); else - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -229,7 +229,7 @@ void ProgressDialog::stopNonGuiPart() disconnectDCOPSignal(d->cvsJob->app(), d->cvsJob->obj(), "receivedStderr(TQString)", "slotReceivedOutputNonGui(TQString)"); - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -245,7 +245,7 @@ void ProgressDialog::startGuiPart() d->gear->start(); TQApplication::restoreOverrideCursor(); - kapp->enter_loop(); + tdeApp->enter_loop(); } diff --git a/doc/kompare/index.docbook b/doc/kompare/index.docbook index 074859e0..9cdad65d 100644 --- a/doc/kompare/index.docbook +++ b/doc/kompare/index.docbook @@ -876,7 +876,7 @@ Documentation Copyright © 2007 Sean Wheller <email>[email protected]</emai <appendix id="installation"> <title>Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &kompare;</title> &install.intro.documentation; diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index c3367c30..fb7a2a97 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -96,7 +96,7 @@ void ${APP_NAME}::setupActions() KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index 62e31dda..e95dfba2 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -56,8 +56,8 @@ ${APP_NAME}::${APP_NAME}() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, "Could not find our Part!"); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -82,7 +82,7 @@ void ${APP_NAME}::setupActions() KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index 3790c5d3..bc383e28 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -229,7 +229,7 @@ void CatalogManager::setupActions() TQ_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window"); action->setEnabled(false); - action = KStdAction::quit(kapp, TQ_SLOT (closeAllWindows()), actionCollection()); + action = KStdAction::quit(tdeApp, TQ_SLOT (closeAllWindows()), actionCollection()); actionMap["open_template"] = NEEDS_POT; @@ -632,7 +632,7 @@ CatalogManagerView *CatalogManager::view() void CatalogManager::openFile(TQString filename, TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { @@ -657,7 +657,7 @@ void CatalogManager::openFile(TQString filename, TQString package) kdDebug(KBABEL_CATMAN) << callfunc << endl; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -667,7 +667,7 @@ void CatalogManager::openFile(TQString filename, TQString package) void CatalogManager::openFile(TQString filename, TQString package, int msgid) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { @@ -690,7 +690,7 @@ void CatalogManager::openFile(TQString filename, TQString package, int msgid) kdDebug(KBABEL_CATMAN) << callfunc << endl; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -700,7 +700,7 @@ void CatalogManager::openFile(TQString filename, TQString package, int msgid) void CatalogManager::openFileInNewWindow(TQString filename, TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { @@ -721,7 +721,7 @@ void CatalogManager::openFileInNewWindow(TQString filename, TQString package) } // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -731,7 +731,7 @@ void CatalogManager::openFileInNewWindow(TQString filename, TQString package) void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { TQByteArray data; @@ -751,7 +751,7 @@ void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQ } // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -761,7 +761,7 @@ void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString saveFilename,TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { TQByteArray data; @@ -781,7 +781,7 @@ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString save } // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -791,7 +791,7 @@ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString save void CatalogManager::spellcheck() { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); TQStringList fileList = _catalogManager->current(); @@ -801,7 +801,7 @@ void CatalogManager::spellcheck() arg << fileList; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -811,7 +811,7 @@ void CatalogManager::spellcheck() void CatalogManager::markedSpellcheck() { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); TQStringList fileList = _catalogManager->marked(); @@ -821,7 +821,7 @@ void CatalogManager::markedSpellcheck() arg << fileList; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -834,7 +834,7 @@ bool CatalogManager::startKBabel() TQCString service; TQString result; - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); // find out, if there is a running kbabel QCStringList apps = client->registeredApplications(); @@ -853,7 +853,7 @@ bool CatalogManager::startKBabel() { TQString app = "kbabel"; TQString url = ""; - if( kapp->startServiceByDesktopName(app,url, &result, &service)) + if( tdeApp->startServiceByDesktopName(app,url, &result, &service)) { KMessageBox::error( this, i18n("Unable to use TDELauncher to start KBabel.\n" "You should check the installation of TDE.\n" @@ -925,7 +925,7 @@ void CatalogManager::decreaseNumberOfFound() void CatalogManager::slotHelp() { - kapp->invokeHelp("CATALOGMANAGER","kbabel"); + tdeApp->invokeHelp("CATALOGMANAGER","kbabel"); } void CatalogManager::find() @@ -959,7 +959,7 @@ void CatalogManager::find() if( startKBabel() ) { TQCString funcCall("findInFile(TQCString,TQCString,TQString,int,int,int,int,int,int,int,int,int,int)"); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << client->appId(); @@ -1044,7 +1044,7 @@ void CatalogManager::replace() if( startKBabel() ) { TQCString funcCall("replaceInFile(TQCString,TQCString,TQString,TQString,int,int,int,int,int,int,int,int,int,int,int)"); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index eb963796..76ab194a 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -1998,7 +1998,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) } else { - TQString tempFile=kapp->tempSaveName(targetURL.path(0)); + TQString tempFile=tdeApp->tempSaveName(targetURL.path(0)); status = writeFile(tempFile,overwrite); @@ -2033,7 +2033,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) TQString Catalog::saveTempFile() { - TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po"); + TQString filename = tdeApp->tempSaveName("/temp/kbabel_temp.po"); if( writeFile(filename) != OK ) { filename = TQString(); @@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le int contextInfoPos = -1; TQString targetStr; - kapp->processEvents(10); + tdeApp->processEvents(10); if( d->_stop || endReached) { @@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le int contextInfoPos = -1; TQString targetStr; - kapp->processEvents(10); + tdeApp->processEvents(10); if( d->_stop || beginReached) { @@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) bestId = (*it); } - kapp->processEvents(10); + tdeApp->processEvents(10); if( d->_stop ) { @@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) { oldPercent = percent; emit signalProgress(percent); - kapp->processEvents(10); + tdeApp->processEvents(10); } TQString id = (*it).msgid; diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index a85fb990..471660f0 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -68,11 +68,11 @@ KBabelMailer::~KBabelMailer() void KBabelMailer::sendOneFile(const TQString& fileName) { if (!singleFileCompression) { - kapp->invokeMailer("", "", "", "", "", "", fileName); + tdeApp->invokeMailer("", "", "", "", "", "", fileName); } else { const TQString archive ( createArchive( TQStringList( fileName ), TQFileInfo( fileName ).baseName() ) ); if ( !archive.isEmpty() ) { - kapp->invokeMailer("", "", "", "", "", "", archive); + tdeApp->invokeMailer("", "", "", "", "", "", archive); } } } @@ -100,7 +100,7 @@ void KBabelMailer::sendOneFile( const KURL& url) TQString tempName( m_tempDir.name() ); tempName += fileName; if ( TDEIO::NetAccess::download( url, tempName, m_parent ) ) - kapp->invokeMailer("", "", "", "", "", "", fileName); + tdeApp->invokeMailer("", "", "", "", "", "", fileName); else { KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) ); @@ -110,7 +110,7 @@ void KBabelMailer::sendOneFile( const KURL& url) { const TQString archive ( createArchive( TQStringList( url.url() ), url.filename() ) ); if ( !archive.isEmpty() ) { - kapp->invokeMailer("", "", "", "", "", "", archive); + tdeApp->invokeMailer("", "", "", "", "", "", archive); } } } @@ -119,7 +119,7 @@ void KBabelMailer::sendFiles(TQStringList fileList, const TQString& initialName) { const TQString archive ( createArchive( fileList, initialName ) ); if ( !archive.isEmpty() ) { - kapp->invokeMailer("", "", "", "", "", "", archive); + tdeApp->invokeMailer("", "", "", "", "", "", archive); } } diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp index 82ac7a90..3ebd2a88 100644 --- a/kbabel/common/msgfmt.cpp +++ b/kbabel/common/msgfmt.cpp @@ -141,7 +141,7 @@ void Msgfmt::addToOutput(TDEProcess*,char *buffer, int buflen) TQString Msgfmt::tempSaveName() { - return kapp->tempSaveName("/tmp/kbabel_msgfmt.po"); + return tdeApp->tempSaveName("/tmp/kbabel_msgfmt.po"); } #include "msgfmt.moc" diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 17d930d9..4df7041f 100644 --- a/kbabel/common/poinfo.cpp +++ b/kbabel/common/poinfo.cpp @@ -399,7 +399,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w while( lexer->lastToken != T_EOF && success==OK) { - if( interactive ) kapp->processEvents(10); + if( interactive ) tdeApp->processEvents(10); if( stopStaticRead ) { @@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) } case T_MSGID: case T_MSGIDPLURAL: { - kapp->processEvents(10); + tdeApp->processEvents(10); // if stopped, return not found if( stopStaticRead ) diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index 8eac4b06..9bb8dcec 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -166,7 +166,7 @@ Project::Ptr ProjectWizard::newProject() void ProjectWizard::slotHelpClicked( void ) { - kapp->invokeHelp( "preferences-project-wizard", "kbabel" ); + tdeApp->invokeHelp( "preferences-project-wizard", "kbabel" ); } #include "projectwizard.moc" diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 507e7988..609dbdcd 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -278,7 +278,7 @@ void RoughTransDlg::translate() for(int i = 0; i < total; i++) { progressbar->setProgress(i+1); - kapp->processEvents(100); + tdeApp->processEvents(100); if(stop || cancel) break; diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp index 9b08bfd2..e0695bea 100644 --- a/kbabel/filters/gettext/gettextexport.cpp +++ b/kbabel/filters/gettext/gettextexport.cpp @@ -164,7 +164,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS stream << "\n"; - kapp->processEvents(10); + tdeApp->processEvents(10); if( isStopped() ) { return STOPPED; @@ -181,7 +181,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS { stream << (*oit) << "\n\n"; - kapp->processEvents(10); + tdeApp->processEvents(10); if( isStopped() ) { return STOPPED; diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index fb59fb4b..1f3ace87 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -171,7 +171,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr while( !stream.eof() ) { - kapp->processEvents(10); + tdeApp->processEvents(10); if( isStopped() ) { return STOPPED; diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 0f1bc0bf..4666ba9a 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -1090,7 +1090,7 @@ void KBabelMW::fileSave_internal() KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1107,7 +1107,7 @@ void KBabelMW::fileSaveAs() m_view->saveFileAs(); KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1121,7 +1121,7 @@ void KBabelMW::fileSaveSpecial() KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1242,7 +1242,7 @@ void KBabelMW::openCatalogManager() TQCString service; TQString result; - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); // find out, if there is a running catalog manager QCStringList apps = client->registeredApplications(); @@ -1261,7 +1261,7 @@ void KBabelMW::openCatalogManager() { TQString prog = "catalogmanager"; TQString url = ""; - if( kapp->startServiceByDesktopName(prog,url, &result,&service)) + if( tdeApp->startServiceByDesktopName(prog,url, &result,&service)) { KMessageBox::error(this, i18n("Unable to use TDELauncher to start " "Catalog Manager. You should check the installation of TDE.\n" diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 25cbb77c..626b5ae7 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -103,7 +103,7 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) void KBabelPreferences::slotHelp() { //TODO - kapp->invokeHelp("Preferences",""); + tdeApp->invokeHelp("Preferences",""); } bool KBabelPreferences::hasChanged() diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index fb38e592..adb07ac7 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -2083,7 +2083,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) } if( isModified() && !opts.askForSave ) saveFile(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data, replyData; TQCString replyType; bool morefiles = false; // more files to lookup in @@ -2615,7 +2615,7 @@ void KBabelView::replaceAll() while(success) { - kapp->processEvents(100); + tdeApp->processEvents(100); _replacesTotal++; @@ -3888,7 +3888,7 @@ void KBabelView::spellcheck() if(emitProgress) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + tdeApp->processEvents(100); } uint total=last-first+1; @@ -3900,7 +3900,7 @@ void KBabelView::spellcheck() lastPercent++; emit signalProgress(lastPercent); - kapp->processEvents(100); + tdeApp->processEvents(100); } TQStringList msgs=_catalog->msgstr(i); @@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *) if(spell.ignoreList.count() > 0) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + tdeApp->processEvents(100); uint total = spell.ignoreList.count(); uint oldPercent=0; @@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *) { oldPercent++; emit signalProgress(oldPercent); - kapp->processEvents(100); + tdeApp->processEvents(100); } spell.tdespell->ignore(*it); diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 5be00141..85daae34 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // wait for KSpell to startup correctly - kapp->processEvents(500); + tdeApp->processEvents(500); } highlight(); diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index cf6b8b4a..37132825 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -126,7 +126,7 @@ int KBabelApp::newInstance() #endif { kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -162,7 +162,7 @@ int KBabelApp::newInstance() TQString m = TQString::fromLocal8Bit(msgid); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); kbInterface->gotoFileEntry(args->url(0).url().local8Bit(),m.utf8()); } else @@ -191,7 +191,7 @@ int KBabelApp::newInstance() } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } @@ -237,7 +237,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int KURL u(TQString::fromLocal8Bit(url)); kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = KBabelMW::winForURL(u,project); if(kb) @@ -259,7 +259,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return ; } @@ -277,7 +277,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u,TQString::fromUtf8(package),false); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return; } @@ -293,7 +293,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return ; } @@ -310,7 +310,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilename, TQCString package, int newWindow) @@ -326,7 +326,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam const KURL t( TQString::fromLocal8Bit( openFilename ) ); kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = KBabelMW::winForURL(u, project); if(kb) @@ -356,7 +356,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } void KBabelInterface::gotoFileEntry(TQCString url, TQCString m) @@ -496,7 +496,7 @@ void KBabelInterface::spellcheck(TQStringList fileList) KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& project, const TQString& package) const { kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = 0; if( !url.isEmpty() ) @@ -527,7 +527,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return kb; } diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index 6d8a35ef..0777a1b9 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -92,7 +92,7 @@ void KBabelDict::readConfig() void KBabelDict::quit() { - kapp->quit(); + tdeApp->quit(); } void KBabelDict::togglePref() diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index f9ea82e7..2347c28f 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -1676,7 +1676,7 @@ void KBabelDictBox::editFile() msgid = result->found.first(); } - DCOPClient *dcop = kapp->dcopClient(); + DCOPClient *dcop = tdeApp->dcopClient(); QCStringList list = dcop->registeredApplications(); int index = list.findIndex("kbabel"); @@ -1691,7 +1691,7 @@ void KBabelDictBox::editFile() argList.append("--gotomsgid"); argList.append(msgid.local8Bit()); argList.append(url.local8Bit()); - kapp->tdeinitExec("kbabel",argList,&error); + tdeApp->tdeinitExec("kbabel",argList,&error); if(!error.isNull()) { KMessageBox::sorry(this diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 7280bbbd..290145d8 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter, if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { @@ -582,7 +582,7 @@ KDBSearchEngine::repeat () if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { @@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode) step = 100; emit progress (0); - kapp->processEvents (100); + tdeApp->processEvents (100); if (stopNow) { stopNow = false; @@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode) { emit progress (100 * count / /*TQMAX( */ totalprogress /*,1) */ ); - kapp->processEvents (100); + tdeApp->processEvents (100); if (stopNow) { @@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, { emit progress (100 * count / totalprogress); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index c8b46db4..8ea17024 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -159,7 +159,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->processEvents(100); + tdeApp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index aa64a4b0..862e7db3 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -172,7 +172,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search //int r= main->get(&k,&d); // kdDebug(0) << "MAINDB->GET returned: " << r << endl; - if(counter%5==0) kapp->processEvents(100); + if(counter%5==0) tdeApp->processEvents(100); // kdDebug(0) << "events processed" << endl; return qMakePair(k,d); @@ -726,7 +726,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu DBItemMainKey k(query); DBItemMainData d; sentence->get(&k,&d); - if(counter%5==0) kapp->processEvents(100); + if(counter%5==0) tdeApp->processEvents(100); return qMakePair(k,d); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index db7ac4ee..9ae67fde 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -243,7 +243,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->processEvents(100); + tdeApp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index aa85f267..bb280768 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi clearResults(); - kapp->processEvents(100); + tdeApp->processEvents(100); text.replace("\n",""); @@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text) clearResults(); - kapp->processEvents(100); + tdeApp->processEvents(100); Entry *entry = msgstrDict[text]; if(entry) @@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary() if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } Entry *e = new Entry; diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index 9c6f96a5..33bd2981 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } // FIXME: shoudl care about plural forms diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 6045612b..48a41efb 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr emit progress( (50*checkCounter+1)/catalogInfo.total); } - kapp->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->catalog()->msgid(*it).first(); origStr = CompendiumData::simplify(origStr); @@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr continue; } - kapp->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->catalog()->msgid(i).first(); origStr = CompendiumData::simplify(origStr); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 2c2f5220..64d3ae84 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea emit progress( (100*(checkCounter+1))/data->numberOfEntries()); } - kapp->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->msgid(*it); origStr = TmxCompendiumData::simplify(origStr); @@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea continue; } - kapp->processEvents(100); + tdeApp->processEvents(100); if(i >= data->numberOfEntries()) { diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 17a9ec15..85902961 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv"); diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 1c248ee7..f5b051c9 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -101,7 +101,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T } else if ( m_client == KMail ) { kdDebug() << "Sending per KMail" << endl; - if (!kapp->dcopClient()->isApplicationRegistered("kmail")) { + if (!tdeApp->dcopClient()->isApplicationRegistered("kmail")) { KMessageBox::error(0,i18n("No running instance of KMail found.")); TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; @@ -195,7 +195,7 @@ int MailSender::kMailOpenComposer(const TQString& arg0,const TQString& arg1, arg << arg4; arg << arg5; arg << arg6; - if (kapp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { + if (tdeApp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { if ( replyType == "int" ) { TQDataStream _reply_stream( replyData, IO_ReadOnly ); _reply_stream >> result; diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 277afbc6..2d0231a7 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -83,7 +83,7 @@ KompareShell::KompareShell() KLibFactory *mainViewFactory = KLibLoader::self()->factory( ptr->library().ascii() ); if (mainViewFactory) { - m_mainViewDock = createDockWidget( "View", kapp->icon() ); + m_mainViewDock = createDockWidget( "View", tdeApp->icon() ); // now that the Part is loaded, we cast it to a KomparePart to get // our hands on it m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(m_mainViewDock, @@ -120,7 +120,7 @@ KompareShell::KompareShell() KLibFactory *navTreeFactory = KLibLoader::self()->factory( ptr->library().ascii() ); if (navTreeFactory) { - m_navTreeDock = createDockWidget( "Navigation", kapp->icon() ); + m_navTreeDock = createDockWidget( "Navigation", tdeApp->icon() ); m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(m_navTreeDock, "komparenavtreepart", "KParts::ReadOnlyPart" )); @@ -181,7 +181,7 @@ KompareShell::KompareShell() KompareShell::~KompareShell() { - kapp->deref(); + tdeApp->deref(); } bool KompareShell::queryClose() @@ -356,7 +356,7 @@ void KompareShell::slotFileOpen() KURL url = KFileDialog::getOpenURL( TQString(), "text/x-diff", this ); if( !url.isEmpty() ) { KompareShell* shell = new KompareShell(); - kapp->ref(); + tdeApp->ref(); shell->show(); shell->openDiff( url ); } @@ -383,7 +383,7 @@ void KompareShell::slotFileBlendURLAndDiff() m_sourceURL = dialog->getFirstURL(); m_destinationURL = dialog->getSecondURL(); KompareShell* shell = new KompareShell(); - kapp->ref(); + tdeApp->ref(); shell->show(); shell->m_viewPart->setEncoding( dialog->encoding() ); shell->blend( m_sourceURL, m_destinationURL ); @@ -412,7 +412,7 @@ void KompareShell::slotFileCompareFiles() m_sourceURL = dialog->getFirstURL(); m_destinationURL = dialog->getSecondURL(); KompareShell* shell = new KompareShell(); - kapp->ref(); + tdeApp->ref(); shell->show(); kdDebug() << "Damn it, i should be called !!! Oh and encoding is: " << dialog->encoding() << endl; shell->m_viewPart->setEncoding( dialog->encoding() ); diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index bffcc72a..386b6afc 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -72,7 +72,7 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, m_diffSettings = new DiffSettings( 0 ); } - readProperties( kapp->config() ); + readProperties( tdeApp->config() ); // This creates the "Model creator" and connects the signals and slots m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" ); diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 64f3d518..7fab0acc 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -82,7 +82,7 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, // we need to receive childEvents now so that d->list is ready for when // slotSetSelection(...) arrives - kapp->sendPostedEvents(this, TQEvent::ChildInserted); + tdeApp->sendPostedEvents(this, TQEvent::ChildInserted); // init stuff slotUpdateScrollBars(); diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp index 8957913b..69db4b2b 100644 --- a/kompare/kompareurldialog.cpp +++ b/kompare/kompareurldialog.cpp @@ -37,7 +37,7 @@ KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name ) { setIconListAllVisible(true); - TDEConfig* cfg = kapp->config(); + TDEConfig* cfg = tdeApp->config(); TQVBox* filesBox = addVBoxPage( i18n( "Files" ), i18n( "Here you can enter the files you want to compare." ) ); m_filesPage = new FilesPage( filesBox ); m_filesSettings = new FilesSettings( this ); @@ -76,7 +76,7 @@ void KompareURLDialog::slotOk() { m_filesPage->setURLsInComboBoxes(); - TDEConfig* cfg = kapp->config(); + TDEConfig* cfg = tdeApp->config(); m_filesPage->apply(); m_diffPage->apply(); @@ -125,7 +125,7 @@ void KompareURLDialog::setSecondGroupBoxTitle( const TQString& title ) void KompareURLDialog::setGroup( const TQString& groupName ) { m_filesSettings->setGroup( groupName ); - m_filesSettings->loadSettings( kapp->config() ); + m_filesSettings->loadSettings( tdeApp->config() ); m_filesPage->setSettings( m_filesSettings ); } diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index 3373cce8..39e7a1c8 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -130,7 +130,7 @@ void DiffPage::apply() m_settings->m_excludeFilesFileURL = m_excludeFileURLComboBox->currentText(); m_settings->m_excludeFilesFileHistoryList = m_excludeFileURLComboBox->urls(); - m_settings->saveSettings( kapp->config() ); + m_settings->saveSettings( tdeApp->config() ); } void DiffPage::setDefaults() diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index 9a410f35..26797268 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -160,7 +160,7 @@ void ViewPage::apply() m_settings->m_font = TQFont( m_fontCombo->currentFont() ); m_settings->m_font.setPointSize( m_fontSizeSpinBox->value() ); - m_settings->saveSettings( kapp->config() ); + m_settings->saveSettings( tdeApp->config() ); } void ViewPage::setDefaults() diff --git a/kompare/main.cpp b/kompare/main.cpp index 8f8a378a..3ea67a81 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -210,5 +210,5 @@ int main(int argc, char *argv[]) args->clear(); } - return kapp->exec(); + return tdeApp->exec(); } diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp index e7f18950..b72599aa 100644 --- a/kuiviewer/kuiviewer.cpp +++ b/kuiviewer/kuiviewer.cpp @@ -78,8 +78,8 @@ KUIViewer::KUIViewer() // itself can't do anything useful //FIXME improve message, which Part is this referring to? KMessageBox::error(this, i18n("Unable to locate Kuiviewer kpart.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -98,7 +98,7 @@ void KUIViewer::load(const KURL& url) void KUIViewer::setupActions() { KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); } void KUIViewer::saveProperties(TDEConfig* /*config*/) diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index c74696cd..eb91657d 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -78,8 +78,8 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, "change_style"); m_style->setEditable(false); - kapp->config()->setGroup("General"); - const TQString currentStyle = kapp->config()->readEntry("currentWidgetStyle", TDEStyle::defaultStyle()); + tdeApp->config()->setGroup("General"); + const TQString currentStyle = tdeApp->config()->readEntry("currentWidgetStyle", TDEStyle::defaultStyle()); const TQStringList styles = TQStyleFactory::keys(); m_style->setItems(styles); @@ -193,9 +193,9 @@ void KUIViewerPart::slotStyle(int) m_widget->show(); TQApplication::restoreOverrideCursor(); - kapp->config()->setGroup("General"); - kapp->config()->writeEntry("currentWidgetStyle", m_style->currentText()); - kapp->config()->sync(); + tdeApp->config()->setGroup("General"); + tdeApp->config()->writeEntry("currentWidgetStyle", m_style->currentText()); + tdeApp->config()->sync(); } void KUIViewerPart::slotGrab() diff --git a/scripts/fixheaders b/scripts/fixheaders index eb9dbeb4..64240c91 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -21,7 +21,7 @@ $lastdir = '.'; 'implicit declaration of function `int i18n\(\.\.\.\)\'' => "klocale", '`i18n\' undeclared \(first use this function\)' => "klocale", 'variable `class QPixmap \S*\' has initializer but incomplete type' => "qpixmap", - '`kapp\' undeclared \(first use this function\)' => "kapplication", + '`tdeApp\' undeclared \(first use this function\)' => "kapplication", 'no matching function for call to `TDELocale::' => "klocale", '`klocale\' undeclared \(first use this function\)' => "klocale", 'no matching function for call to `QPopupMenu::' => "qpopupmenu", diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 7fc301ac..a8c40914 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -240,7 +240,7 @@ function! MapIdentHeader( ident ) return '<tdelistview.h>' elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)' return '<kdebug.h>' - elseif a:ident == 'kapp' + elseif a:ident == 'tdeApp' return '<tdeapplication.h>' elseif a:ident == 'i18n' || \a:ident == 'I18N_NOOP' diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index d93fa0ff..ed475027 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -173,7 +173,7 @@ ; Useful fake entries (qapplication.h tqApp) - (tdeapplication.h kapp) + (tdeapplication.h tdeApp) (tdelocale.h i18n I18N_NOOP) (kstandarddirs.h locate locateLocal) (stdlib.h getenv) diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp index cc3baee7..2b785c9a 100644 --- a/tdecachegrind/tdecachegrind/callgraphview.cpp +++ b/tdecachegrind/tdecachegrind/callgraphview.cpp @@ -1149,7 +1149,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) { TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); TQPixmap p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); setPixmap(0, p); diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp index d40f1feb..737eb39d 100644 --- a/tdecachegrind/tdecachegrind/callitem.cpp +++ b/tdecachegrind/tdecachegrind/callitem.cpp @@ -146,7 +146,7 @@ void CallItem::updateCost() if (sameCycle && !selectedIsCycle && !shownIsCycle) { TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); } diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp index b07c6655..36a07261 100644 --- a/tdecachegrind/tdecachegrind/instritem.cpp +++ b/tdecachegrind/tdecachegrind/instritem.cpp @@ -178,7 +178,7 @@ void InstrItem::updateCost() TQPixmap p; TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); if (p.isNull()) diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp index 85713c14..ab7ef5e9 100644 --- a/tdecachegrind/tdecachegrind/sourceitem.cpp +++ b/tdecachegrind/tdecachegrind/sourceitem.cpp @@ -162,7 +162,7 @@ void SourceItem::updateCost() TQPixmap p; TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); if (p.isNull()) diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp index 9171861c..db7c15b0 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp @@ -257,7 +257,7 @@ void SvnHelper::slotResult( TDEIO::Job* job ) { } void SvnHelper::finished() { - kapp->quit(); + tdeApp->quit(); } static TDECmdLineOptions options[] = { diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 3e565cb6..49d61037 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -2990,7 +2990,7 @@ void AssociationWidget::setSelected(bool _select /* = true */) { m_role[A].m_pChangeWidget-> setSelected( _select ); if( m_role[B].m_pChangeWidget) m_role[B].m_pChangeWidget-> setSelected( _select ); - kapp->processEvents(); + tdeApp->processEvents(); //Update the docwindow for this association. // This is done last because each of the above setSelected calls // overwrites the docwindow, but we want the main association doc @@ -3000,7 +3000,7 @@ void AssociationWidget::setSelected(bool _select /* = true */) { m_pView -> showDocumentation( this, false ); } else m_pView -> updateDocumentation( true ); - kapp->processEvents(); + tdeApp->processEvents(); m_LinePath.setSelected( _select ); if (! _select) { // For now, if _select is true we don't make the assoc class line diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index 9cb96f18..4cd39810 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -140,7 +140,7 @@ void AutolayoutDlg::readConfig( TDEConfig * conf) void AutolayoutDlg::writeConfig( TDEConfig * conf) { - // conf=kapp->config(); + // conf=tdeApp->config(); conf->setGroup("AutolayoutDlg"); conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked()); conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked()); diff --git a/umbrello/umbrello/cmdlineexportallviewsevent.cpp b/umbrello/umbrello/cmdlineexportallviewsevent.cpp index 60cbee23..fc2cf5b4 100644 --- a/umbrello/umbrello/cmdlineexportallviewsevent.cpp +++ b/umbrello/umbrello/cmdlineexportallviewsevent.cpp @@ -44,5 +44,5 @@ void CmdLineExportAllViewsEvent::exportAllViews() { } } - kapp->sendEvent(UMLApp::app(), new TQCloseEvent()); + tdeApp->sendEvent(UMLApp::app(), new TQCloseEvent()); } diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index 2517f805..f4734dc0 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -398,7 +398,7 @@ TQString CodeGenerator::overwritableName(const TQString& name, const TQString &e int suffix; OverwriteDialogue overwriteDialog( name, outputDirectory.absPath(), - m_applyToAllRemaining, kapp -> mainWidget() ); + m_applyToAllRemaining, tdeApp -> mainWidget() ); switch (pol->getOverwritePolicy()) { //if it exists, check the OverwritePolicy we should use case CodeGenerationPolicy::Ok: //ok to overwrite file filename = name + extension; diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index f403c166..ff115735 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -156,7 +156,7 @@ TQString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const TQStri int suffix; OverwriteDialogue overwriteDialogue( filename, outputDir.absPath(), - m_applyToAllRemaining, kapp -> mainWidget() ); + m_applyToAllRemaining, tdeApp -> mainWidget() ); switch(commonPolicy->getOverwritePolicy()) { //if it exists, check the OverwritePolicy we should use case CodeGenerationPolicy::Ok: //ok to overwrite file break; diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index dd2afe6c..952a517a 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -578,7 +578,7 @@ bool ClassifierListPage::takeItem(UMLClassifierListItem* listItem, int wasAtIndex = m_pClassifier->takeItem(listItem); if (wasAtIndex == -1) return false; - kapp->processEvents(); + tdeApp->processEvents(); peerIndex = -1; UMLObject *o; const Uml::Object_Type seekType = listItem->getBaseType(); diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index 5043b8c4..e035a169 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -142,7 +142,7 @@ void UMLEntityAttributeDialog::setupDialog() { // Switch to SQL as the active language if no datatypes are set. UMLApp::app()->setActiveLanguage("SQL"); pDoc->addDefaultDatatypes(); - kapp->processEvents(); + tdeApp->processEvents(); dataTypes = pDoc->getDatatypes(); } UMLClassifier *dat; diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index fb9d5a71..41449ac5 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -328,7 +328,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { } else if (nxt == "value" || nxt.startsWith("\"")) { value.string = extractValue(tokens, stream); } else { - kapp->processEvents(); + tdeApp->processEvents(); value.node = readAttributes(tokens, stream); if (value.node == NULL) return NULL; diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index e09180da..d3b40d76 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -148,10 +148,10 @@ void KPlayerPopupSliderAction::slotActivated (void) } //CHANGED kdDebug() << "Point: " << point.x() << "x" << point.y() << "\n"; m_frame -> move (point); - /*if ( kapp && kapp -> activeWindow() ) + /*if ( tdeApp && tdeApp -> activeWindow() ) { TQMouseEvent me (TQEvent::MouseButtonRelease, TQPoint(0,0), TQPoint(0,0), TQMouseEvent::LeftButton, TQMouseEvent::NoButton); - TQApplication::sendEvent (kapp -> activeWindow(), &me); + TQApplication::sendEvent (tdeApp -> activeWindow(), &me); }*/ m_frame -> show(); m_slider -> setFocus(); @@ -180,7 +180,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //Q_ASSERT (widget -> inherits ("TDEToolBar")); //if ( ! widget -> inherits ("TDEToolBar") ) // return -1; - //if ( kapp && ! kapp -> authorizeTDEAction (name()) ) + //if ( tdeApp && ! tdeApp -> authorizeTDEAction (name()) ) // return -1; int result = KWidgetAction::plug (widget, index); if ( result < 0 ) diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index 24f12f0c..ae015af5 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -85,7 +85,7 @@ void initDocument(TDECmdLineArgs *args, TDEConfig* cfg); void exportAllViews(TDECmdLineArgs *args, const QCStringList &exportOpt); extern "C" int flushEvents() { - kapp->processEvents(); + tdeApp->processEvents(); return 0; } @@ -203,6 +203,6 @@ void exportAllViews(TDECmdLineArgs *args, const QCStringList &exportOpt) { // the event is posted so when the QT loop begins it's processed. UMLApp process this event executing // the method it provides for exporting the views. Once all the views were exported, a quit event // is sent and the app finishes without user interaction - kapp->postEvent(UMLApp::app(), new CmdLineExportAllViewsEvent(extension, directory, useFolders)); + tdeApp->postEvent(UMLApp::app(), new CmdLineExportAllViewsEvent(extension, directory, useFolders)); } diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index 5fc80b1a..260c72d3 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -118,7 +118,7 @@ UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, UMLDoc *doc = UMLApp::app()->getDocument(); parentPkg->addObject(o); doc->signalUMLObjectCreated(o); - kapp->processEvents(); + tdeApp->processEvents(); return o; } diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp index 4dfca79c..7a9fcea3 100644 --- a/umbrello/umbrello/plugin.cpp +++ b/umbrello/umbrello/plugin.cpp @@ -150,7 +150,7 @@ Plugin::configure() loadPlugins(conf, "Load"); // only load GUI plugins if this is not a terminal app - if(TDEApplication::kApplication()->type() != TQApplication::Tty) { + if(tdeApp->type() != TQApplication::Tty) { loadPlugins(conf, "LoadGUI"); } } diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 7f103cb4..23d2d100 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -81,7 +81,7 @@ UMLApp::UMLApp(TQWidget* , const char* name):KDockMainWindow(0, name) { s_instance = this; m_pDocWindow = 0; - m_config = kapp->config(); + m_config = tdeApp->config(); m_listView = 0; m_langSelect = NULL; m_zoomSelect = NULL; @@ -595,7 +595,7 @@ void UMLApp::saveProperties(TDEConfig *_config) { KURL url=m_doc->URL(); _config->writePathEntry("filename", url.url()); _config->writeEntry("modified", m_doc->isModified()); - TQString tempname = kapp->tempSaveName(url.url()); + TQString tempname = tdeApp->tempSaveName(url.url()); TQString tempurl= KURL::encode_string(tempname); KURL _url(tempurl); @@ -609,7 +609,7 @@ void UMLApp::readProperties(TDEConfig* _config) { bool modified = _config->readBoolEntry("modified", false); if(modified) { bool canRecover; - TQString tempname = kapp->checkRecoverFile(filename, canRecover); + TQString tempname = tdeApp->checkRecoverFile(filename, canRecover); KURL _url(tempname); @@ -788,7 +788,7 @@ void UMLApp::slotFileQuit() { if(m_doc->saveModified()) { writeDockConfig(); saveOptions(); - kapp->quit(); + tdeApp->quit(); } slotStatusMsg(i18n("Ready.")); } diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index 6c50e64e..fec8cc85 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -198,7 +198,7 @@ void UMLDoc::removeView(UMLView *view , bool enforceCurrentView ) { if (!firstView && enforceCurrentView) //create a diagram { createDiagram(m_root[mt_Logical], dt_Class, false); - kapp->processEvents(); + tdeApp->processEvents(); m_root[mt_Logical]->appendViews(viewList); firstView = viewList.first(); } @@ -1063,7 +1063,7 @@ void UMLDoc::renameChildUMLObject(UMLObject *o) { KMessageBox::error(0, i18n("That is an invalid name."), i18n("Invalid Name")); else { if (p->findChildObject(name) == NULL - || ((o->getBaseType() == Uml::ot_Operation) && KMessageBox::warningYesNo( kapp -> mainWidget() , + || ((o->getBaseType() == Uml::ot_Operation) && KMessageBox::warningYesNo( tdeApp -> mainWidget() , i18n( "The name you entered was not unique.\nIs this what you wanted?" ), i18n( "Name Not Unique"),i18n("Use Name"),i18n("Enter New Name")) == KMessageBox::Yes) ) { o->setName(name); @@ -1443,7 +1443,7 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) } TQString data = stream.read(); - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance TQString error; int line; TQDomDocument doc; @@ -1451,7 +1451,7 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) kWarning()<<"Can't set content:"<<error<<" Line:"<<line<<endl; return false; } - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance TQDomNode node = doc.firstChild(); //Before Umbrello 1.1-rc1 we didn't add a <?xml heading //so we allow the option of this being missing @@ -1571,7 +1571,7 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) if (UMLApp::app()->getGenerator() == NULL) UMLApp::app()->setGenerator(UMLApp::app()->getDefaultLanguage()); emit sigWriteToStatusBar( i18n("Setting up the document...") ); - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance activateAllViews(); UMLView *viewToBeSet = NULL; @@ -1606,7 +1606,7 @@ void UMLDoc::resolveTypes() { #endif obj->resolveRef(); } - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance } bool UMLDoc::validateXMIHeader(TQDomNode& headerNode) { @@ -1845,7 +1845,7 @@ bool UMLDoc::loadDiagramsFromXMI( TQDomNode & node ) { pView -> hide(); addView( pView ); emit sigSetStatusbarProgress( ++count ); - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance } node = node.nextSibling(); element = node.toElement(); diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index fd40e1a0..b0fd8988 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -1902,7 +1902,7 @@ bool UMLListView::itemRenamed( TQListViewItem * item , int /*col*/ ) { // If the type is empty then delete it. if (newText.isEmpty() || newText.contains(TQRegExp("^\\s+$"))) { KMessageBox::error( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was invalid.\nCreation process has been canceled." ), i18n( "Name Not Valid" ) ); return false; @@ -1912,14 +1912,14 @@ bool UMLListView::itemRenamed( TQListViewItem * item , int /*col*/ ) { //if operation ask if ok not to be unique i.e overloading if( type == Uml::lvt_Operation ) { if( KMessageBox::warningYesNo( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was not unique.\nIs this what you wanted?" ), i18n( "Name Not Unique" ), i18n("Use Name"), i18n("Enter New Name") ) == KMessageBox::No ) { return false; } } else { KMessageBox::error( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was not unique!\nCreation process has been canceled." ), i18n( "Name Not Unique" ) ); return false; @@ -2113,7 +2113,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type Model_Utils::NameAndType nt; Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier); if (st) { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Creation canceled") ); m_bCreatingChildObject = false; @@ -2130,7 +2130,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type Model_Utils::Parse_Status st; st = Model_Utils::parseAttribute(text, nt, owningClass, &vis); if (st) { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Creation canceled") ); m_bCreatingChildObject = false; @@ -2145,7 +2145,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type Model_Utils::OpDescriptor od; Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier); if (st) { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Creation canceled") ); m_bCreatingChildObject = false; @@ -2156,7 +2156,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type if (newObject == NULL || isExistingOp) { if (isExistingOp) KMessageBox::error( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was not unique!\nCreation process has been canceled." ), i18n( "Name Not Unique" ) ); m_bCreatingChildObject = false; @@ -2666,7 +2666,7 @@ bool UMLListView::deleteItem(UMLListViewItem *temp) { UMLObjectList contained = nmSpc->containedObjects(); if (contained.count()) { KMessageBox::error( - kapp->mainWidget(), + tdeApp->mainWidget(), i18n("The folder must be emptied before it can be deleted."), i18n("Folder Not Empty")); return false; diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index f5408e14..45fe7e7c 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -367,7 +367,7 @@ void UMLListViewItem::okRename( int col ) { } m_Label = op->toString(Uml::st_SigNoVis); } else { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Rename canceled") ); } @@ -401,7 +401,7 @@ void UMLListViewItem::okRename( int col ) { pAtt->setInitialValue(nt.m_initialValue); m_Label = pAtt->toString(Uml::st_SigNoVis); } else { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Rename canceled") ); } @@ -429,7 +429,7 @@ void UMLListViewItem::okRename( int col ) { tmpl->setType(nt.m_type); m_Label = tmpl->toString(Uml::st_SigNoVis); } else { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Rename canceled") ); } @@ -464,7 +464,7 @@ void UMLListViewItem::okRename( int col ) { break; } default: - KMessageBox::error( kapp->mainWidget() , + KMessageBox::error( tdeApp->mainWidget() , i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type), i18n("Function Not Implemented") ); TQListViewItem::setText(0, m_Label); @@ -474,7 +474,7 @@ void UMLListViewItem::okRename( int col ) { } void UMLListViewItem::cancelRenameWithMsg() { - KMessageBox::error( kapp->mainWidget() , + KMessageBox::error( tdeApp->mainWidget() , i18n("The name you entered was invalid.\nRenaming process has been canceled."), i18n("Name Not Valid") ); TQListViewItem::setText(0, m_Label); diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp index 9eb12766..da22b3e6 100644 --- a/umbrello/umbrello/umlobject.cpp +++ b/umbrello/umbrello/umlobject.cpp @@ -454,7 +454,7 @@ bool UMLObject::resolveRef() { if (m_pSecondary) { if (Import_Utils::newUMLObjectWasCreated()) { maybeSignalObjectCreated(); - kapp->processEvents(); + tdeApp->processEvents(); kDebug() << "UMLObject::resolveRef: Import_Utils::createUMLObject() " << "created a new type for " << m_SecondaryId << endl; } else { @@ -486,7 +486,7 @@ bool UMLObject::resolveRef() { return false; m_SecondaryId = ""; maybeSignalObjectCreated(); - //kapp->processEvents(); + //tdeApp->processEvents(); return true; } diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index 2c45bb04..ada8f91c 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -170,7 +170,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt return name; } - kapp->processEvents(); + tdeApp->processEvents(); UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem* listViewItem = listView->findItem(view->getID()); // skip the name of the first item because it's the View diff --git a/umbrello/umbrello/uniqueid.cpp b/umbrello/umbrello/uniqueid.cpp index 98685229..334bfdfc 100644 --- a/umbrello/umbrello/uniqueid.cpp +++ b/umbrello/umbrello/uniqueid.cpp @@ -28,7 +28,7 @@ Uml::IDType gen() { int i = 0; // Source: KDE4 tdelibs/tdecore/krandom.cpp KRandom::randomString() while (length--) { - int r = kapp->random() % 62; + int r = tdeApp->random() % 62; r += 48; if (r > 57) r += 7; |