diff options
Diffstat (limited to 'parts')
29 files changed, 69 insertions, 105 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 8787ea45..481b3575 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -116,7 +116,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch m_appsInfo.setAutoDelete(true); m_tempFiles.setAutoDelete(true); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); //config->setGroup("AppWizard"); //templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0)); @@ -913,7 +913,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) if(!dir.isEmpty()) { // set new location as default project dir? - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) ); TQDir newDir (dir); @@ -1158,7 +1158,7 @@ void AppWizardDialog::removeFavourite() void AppWizardDialog::populateFavourites() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("AppWizard"); //favourites are stored in config as a list of templates and a seperate @@ -1204,7 +1204,7 @@ void AppWizardDialog::done(int r) } } - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("AppWizard"); config->writePathEntry("FavTemplates", templatesList); config->writeEntry("FavNames", iconNamesList); diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject 12bb2cad8e2982bd842d168158e391d6c12fb6a +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/parts/appwizard/common/incadmin/config.sub b/parts/appwizard/common/incadmin/config.sub index 25c5a994..ea4e12bf 100755 --- a/parts/appwizard/common/incadmin/config.sub +++ b/parts/appwizard/common/incadmin/config.sub @@ -184,34 +184,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index e1cedea2..7de1caf8 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -4532,10 +4532,6 @@ func_mode_link () deplibs="$deplibs System.ltframework" continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work test "X$arg" = "X-lc" && continue @@ -5659,7 +5655,6 @@ func_mode_link () if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ *-*-unixware7*) add_dir="-L$dir" ;; @@ -6461,9 +6456,6 @@ func_mode_link () *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work ;; diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index af16f84f..df911cc1 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -88,7 +88,7 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) void AStylePart::loadGlobal() { // kdDebug(9009) << "Load global"<<endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,"); m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions)); @@ -123,7 +123,7 @@ void AStylePart::saveGlobal() // kdDebug(9009) << "project before: " <<iter.key() << "="<< iter.data() << endl; // } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); config->writeEntry("Options",options); config->writeEntry("Extensions",m_globalExtensions.join(",")); diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index 36cc05a5..f49b76c8 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig() */ void BookmarksConfig::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); config->writeEntry("Context", _context ); @@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig() */ void BookmarksConfig::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); _context = config->readPropertyEntry( "Context", 5 ).toInt(); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index f42bd8db..5556446c 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -198,7 +198,7 @@ void Navigator::slotCursorPositionChanged() //FIXME: we assume that background parser delay is set globally in tdeveloprc file //for all available language supports //this is reasonable assumption because problem reporter should be the same for all languages - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); int m_delay = config->readNumEntry( "BgParserDelay", 500 ); diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 05ade367..80cee6e5 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -147,7 +147,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir) */ // get name of the ctags binary - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); if ( ctagsBinary.isEmpty() ) @@ -180,7 +180,7 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) if (ident.isEmpty()) return; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); bool showDeclaration = config->readBoolEntry( "ShowDeclaration", true ); bool showDefinition = config->readBoolEntry( "ShowDefinition", true ); @@ -223,7 +223,7 @@ void CTags2Part::gotoTagForTypes( TQStringList const & types ) if ( list.count() < 1 ) return; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("CTAGS"); bool jumpToFirst = config->readBoolEntry( "JumpToFirst", false ); diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index 96837e98..3d33b6a7 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -73,7 +73,7 @@ void CTags2SettingsWidget::loadSettings() TQStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); showDeclarationBox->setChecked( config->readBoolEntry( "ShowDeclaration", true ) ); showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) ); @@ -102,7 +102,7 @@ void CTags2SettingsWidget::storeSettings() DomUtil::writeEntry( dom, "/ctagspart/customArguments", tagfileCustomEdit->text() ); DomUtil::writeEntry( dom, "/ctagspart/customTagfilePath", tagfilePath->url() ); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); config->writeEntry( "ShowDeclaration", showDeclarationBox->isChecked() ); config->writeEntry( "ShowDefinition", showDefinitionBox->isChecked() ); diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 59dcf3de..2b7e5fc7 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -44,7 +44,7 @@ TQStringList KDiffTextEdit::extPartsTranslated; KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -53,7 +53,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 9822829b..c15cb185 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -70,12 +70,12 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, TDEConfig *config = m_part->config(); //read full text search settings config->setGroup("htdig"); - TQString databaseDir = kapp->dirs()->saveLocation("data", + TQString databaseDir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir)); - htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"))); - htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"))); - htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"))); + htdigbinEdit->setURL(config->readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig"))); + htmergebinEdit->setURL(config->readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge"))); + htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch"))); if (config->readBoolEntry("IsSetup", false) == false) { TQFileInfo fi(htsearchbinEdit->url()); @@ -104,7 +104,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 09aaa042..0bac7045 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -676,7 +676,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) { return false; } @@ -688,7 +688,7 @@ void DocumentationPart::setAssistantUsed(bool b) { m_assistantUsed = b; //use global config to store different settings for kdevassistant and tdevelop - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("UseAssistant", isAssistantUsed()); } @@ -736,7 +736,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin void DocumentationPart::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 7d533753..3430c440 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -69,7 +69,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) DocumentationWidget::~DocumentationWidget() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("LastPage", m_tab->currentIndex()); } diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index ef0deaca..ee8fd976 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -108,7 +108,7 @@ void FindDocumentationOptions::sourceMoveUp() void FindDocumentationOptions::writeOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); config->writeEntry("goto_first_match", goto_first_match->isChecked()); @@ -151,7 +151,7 @@ void FindDocumentationOptions::writeOptions() void FindDocumentationOptions::readOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); source_list->clear(); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index b0496f03..287b36f9 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -152,7 +152,7 @@ void SearchView::search() updateIndex(); return; } - TQString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")); + TQString exe = config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { KMessageBox::error(this, i18n("Cannot find the htsearch executable.\nIt is part of the ht://Dig package that is used by TDevelop to perform full text search. Please install ht://Dig and use Documentation page in Configure TDevelop dialog to set the htsearch location.")); @@ -160,7 +160,7 @@ void SearchView::search() return; } - TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf")) { @@ -177,7 +177,7 @@ void SearchView::search() } } - TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString savedir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); if (!d.exists(savedir)) d.mkdir(savedir); @@ -191,7 +191,7 @@ void SearchView::search() kdDebug(9002) << "starting tdeprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; TDEProcess *proc = new TDEProcess; - TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); + TQString picdir = tdeApp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; @@ -213,12 +213,12 @@ void SearchView::search() // While receiving data from the subprocess, we want // to block the user interface, but still get repaint // events. Hack taken from NetAccess... - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); tqt_enter_modal(&blocker); - kapp->enter_loop(); + tdeApp->enter_loop(); tqt_leave_modal(&blocker); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (!proc->normalExit() || proc->exitStatus() != 0) { @@ -254,7 +254,7 @@ void SearchView::htsearchStdout(TDEProcess *, char *buffer, int len) void SearchView::htsearchExited(TDEProcess *) { - kapp->exit_loop(); + tdeApp->exit_loop(); } void SearchView::analyseSearchResults() diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index ce02d6bc..bbde09fa 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -45,7 +45,7 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) { proc = 0; - indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; d.mkdir(indexdir); TDEConfig config("kdevdocumentation", true); @@ -170,14 +170,14 @@ void ProgressDialog::addDir(const TQString &dir) if (*it != "." && *it != "..") { addDir(dir + "/" + *it); - kapp->processEvents(); + tdeApp->processEvents(); } if (procdone) { return; } } - kapp->processEvents(); + tdeApp->processEvents(); } void ProgressDialog::scanDirectories() @@ -302,7 +302,7 @@ bool ProgressDialog::generateIndex() // run htdig TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); - exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")); + exe = config.readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig")); if (exe.isEmpty()) { done(1); @@ -368,7 +368,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc) TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); // run htmerge ----------------------------------------------------- - exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")); + exe = config.readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge")); if (exe.isEmpty()) { done(1); diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index c982350e..4cb2338c 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -28,7 +28,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) : ProjectviewConfigBase(parent, name) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); inToolview->setChecked(config->readBoolEntry("ToolbarInToolview", true)); onlyProject->setChecked(config->readBoolEntry("OnlyProjectFiles", false)); @@ -37,7 +37,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) void ProjectviewConfig::accept() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); config->writeEntry("ToolbarInToolview", inToolview->isChecked()); config->writeEntry("OnlyProjectFiles", onlyProject->isChecked()); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 99b45623..39d309ef 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -88,7 +88,7 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); if (config->readBoolEntry("ToolbarInToolview", true)) { @@ -382,7 +382,7 @@ void ProjectviewPart::projectClosed() void ProjectviewPart::slotOpenProjectView(const TQString &view) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); bool onlyProject = config->readBoolEntry("OnlyProjectFiles", false); bool closeOpenFiles = config->readBoolEntry("CloseOpenFiles", true); @@ -535,7 +535,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) void ProjectviewPart::writeConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->deleteGroup("ProjectViews", true); config->setGroup("ProjectViews"); @@ -559,7 +559,7 @@ void ProjectviewPart::writeConfig() void ProjectviewPart::readConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); TQMap<TQString, TQString> entries = config->entryMap("ProjectViews"); m_projectViews.clear(); diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 83ff0fb6..3a57dc96 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -250,7 +250,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) ); cmbPath->setURLs( config->readPathListEntry("dir history") ); // if we restore history - if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) { TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) @@ -266,7 +266,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) filter->setHistoryItems( config->readListEntry("filter history"), true ); lastFilter = config->readEntry( "last filter" ); TQString flt(""); - if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() ) flt = config->readEntry("current filter"); filter->lineEdit()->setText( flt ); slotFilterChange( flt ); diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 5a62b7a6..76dfb6c3 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -104,7 +104,7 @@ void KonsoleViewWidget::setDirectory(const KURL &dirUrl) { kdDebug(9035) << k_funcinfo << "Changing dirUrl.path() == " << dirUrl.path() << endl; kdDebug(9035) << k_funcinfo << "Changing part->url.path() == " << part->url().path() << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); kdDebug(9035) << k_funcinfo << "SyncTerminalEmulator: " << config->readBoolEntry("SyncTerminalEmulator") << endl; diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 5a961419..b2771a8a 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -97,7 +97,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin TQString cmd; if (inTerminal) { - cmd = Settings::terminalEmulatorName( *kapp->config() ); + cmd = Settings::terminalEmulatorName( *tdeApp->config() ); if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? // If a directory was specified, use it cmd += TQString(" --workdir '%1'").arg(directory); diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index a8931f86..fbc4bb4c 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -43,7 +43,7 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) connect(this, TQ_SIGNAL(executed(TQListBoxItem*)), TQ_SLOT(slotRowSelected(TQListBoxItem*))); connect(this, TQ_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), TQ_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); setSelectionMode(TQListBox::Extended); @@ -339,7 +339,7 @@ void AppOutputWidget::copySelected() if (isSelected(i)) buffer += item(i)->text() + "\n"; } - kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(buffer, TQClipboard::Clipboard); } void AppOutputWidget::addPartialStderrLine(const TQCString & line) diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index c1527a76..6222c956 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -342,7 +342,7 @@ void MakeWidget::copy() selection.replace(""","\""); selection.replace("&","&"); - kapp->clipboard()->setText(selection, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(selection, TQClipboard::Clipboard); } void MakeWidget::nextError() @@ -527,7 +527,7 @@ void MakeWidget::searchItem(int parag) void MakeWidget::insertStdoutLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) sline = TQString::fromAscii( stdoutbuf+line ); @@ -542,7 +542,7 @@ void MakeWidget::insertStdoutLine( const TQCString& line ) void MakeWidget::insertStderrLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) { sline = TQString( stderrbuf+line ); @@ -724,7 +724,7 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) void MakeWidget::toggleLineWrapping() { m_bLineWrapping = !m_bLineWrapping; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("LineWrapping", m_bLineWrapping); pConfig->sync(); @@ -759,7 +759,7 @@ void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setC void MakeWidget::setCompilerOutputLevel(EOutputLevel level) { m_compilerOutputLevel = level; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("CompilerOutputLevel", (int) level); pConfig->sync(); @@ -769,7 +769,7 @@ void MakeWidget::setCompilerOutputLevel(EOutputLevel level) void MakeWidget::toggleShowDirNavigMessages() { DirectoryItem::setShowDirectoryMessages( !DirectoryItem::getShowDirectoryMessages() ); - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("ShowDirNavigMsg", DirectoryItem::getShowDirectoryMessages()); pConfig->sync(); @@ -778,7 +778,7 @@ void MakeWidget::toggleShowDirNavigMessages() void MakeWidget::updateSettingsFromConfig() { - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("General Options"); TQFont outputFont = pConfig->readFontEntry("OutputViewFont"); setFont(outputFont); diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 22a256ae..210a1c19 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements() } ++it; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } m_part->core()->running( m_part, false ); @@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements() } fileitem = fileitem->nextSibling(); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } // Telling the project about the edited files diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 6a3376f2..ca008029 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -28,7 +28,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare : scriptingGlobalConfigBase(parent, name), m_part(part) { // read tdeconfig and post list to the m_dirs - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); TQStringList searchDirs = cfg->readListEntry("SearchDirs"); m_dirs->clear(); m_dirs->insertStringList(searchDirs); @@ -37,7 +37,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare void scriptingGlobalConfig::accept() { // read mdirs and save to tdeconfig - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); if( !m_dirs->isEnabled() ) cfg->writeEntry("SearchDirs", TQStringList() ); else diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index eba3d6cb..17aa5b51 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -83,7 +83,7 @@ void scriptingPart::setupActions() TQStringList searchDirs; searchDirs += "kate/scripts"; - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); searchDirs += cfg->readListEntry("SearchDirs"); unplugActionList(TQString::fromLatin1( "script_actions" )); diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 6d276e88..bf56d0a4 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -46,7 +46,7 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis TQString TipOfDayPart::getFilename() { - TDEConfig * config = TDEApplication::kApplication()->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("Tip of day plugin"); return config->readEntry("TipsFile", "kdevtipofday/tips"); } diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 9781f1b1..8dabccbd 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -114,7 +114,7 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { TQString df = sender()->name(); - kapp->startServiceByDesktopPath(df); + tdeApp->startServiceByDesktopPath(df); } void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) @@ -234,7 +234,7 @@ void ToolsPart::toolsMenuActivated() << "with cmdline " << cmdline << "and desktopfile " << isdesktopfile << endl; if (isdesktopfile) - kapp->startServiceByDesktopPath(cmdline); + tdeApp->startServiceByDesktopPath(cmdline); else startCommand(cmdline, captured, TQString()); } diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index cb75ec02..481670c1 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -36,7 +36,7 @@ UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const void UIChooserWidget::load() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mdistyle = config->readNumEntry( "MDIStyle", 1 ); @@ -86,7 +86,7 @@ void UIChooserWidget::load() void UIChooserWidget::save() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); if ( AlwaysShowTabs->isChecked() ) |