From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- parts/abbrev/abbrevpart.cpp | 8 ++--- parts/appwizard/appwizarddlg.cpp | 34 +++++++++++----------- parts/appwizard/importdlg.cpp | 2 +- parts/appwizard/profilesupport.cpp | 2 +- parts/astyle/astyle_part.cpp | 4 +-- parts/bookmarks/bookmarks_config.cpp | 4 +-- parts/classview/classviewwidget.cpp | 4 +-- parts/classview/navigator.cpp | 2 +- parts/ctags2/ctags2_part.cpp | 6 ++-- parts/ctags2/ctags2_settingswidget.cpp | 4 +-- parts/diff/diffwidget.cpp | 14 ++++----- parts/diff/diffwidget.h | 6 ++-- parts/distpart/distpart_widget.cpp | 2 +- parts/documentation/docglobalconfigwidget.cpp | 10 +++---- parts/documentation/documentation_part.cpp | 10 +++---- parts/documentation/documentation_part.h | 4 +-- parts/documentation/documentation_widget.cpp | 2 +- parts/documentation/find_documentation_options.h | 4 +-- .../interfaces/kdevdocumentationplugin.cpp | 2 +- .../interfaces/kdevdocumentationplugin.h | 8 ++--- parts/documentation/plugins/chm/docchmplugin.cpp | 4 +-- parts/documentation/plugins/qt/docqtplugin.h | 2 +- parts/documentation/protocols/chm/chm.cpp | 6 ++-- parts/documentation/protocols/chm/chm.h | 2 +- parts/documentation/protocols/chm/kchmpart.cpp | 10 +++---- parts/documentation/protocols/chm/kchmpart.h | 6 ++-- parts/documentation/searchview.cpp | 4 +-- parts/documentation/tools/htdig/htdigindex.cpp | 6 ++-- parts/filecreate/fcconfigwidget.cpp | 8 ++--- parts/filelist/projectviewconfig.cpp | 4 +-- parts/filelist/projectviewpart.cpp | 8 ++--- parts/fileselector/fileselector_widget.cpp | 10 +++---- parts/fileselector/fileselector_widget.h | 6 ++-- parts/fileview/fileviewpart.cpp | 8 ++--- parts/filter/shellfilterdlg.cpp | 4 +-- parts/filter/shellinsertdlg.cpp | 4 +-- parts/grepview/grepdlg.h | 4 +-- parts/konsole/konsoleviewwidget.cpp | 2 +- parts/outputviews/appoutputwidget.cpp | 2 +- parts/outputviews/makewidget.cpp | 12 ++++---- parts/scripting/scriptingglobalconfig.cpp | 4 +-- parts/scripting/scriptingpart.cpp | 4 +-- parts/snippet/snippet_widget.cpp | 4 +-- parts/snippet/snippet_widget.h | 6 ++-- parts/tipofday/tipofday_part.cpp | 2 +- parts/tools/tools_part.cpp | 14 ++++----- parts/tools/toolsconfig.cpp | 4 +-- parts/tools/toolsconfigwidget.cpp | 4 +-- parts/uimode/uichooser_widget.cpp | 4 +-- 49 files changed, 145 insertions(+), 145 deletions(-) (limited to 'parts') diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 11f3a4d3..5aeeb62c 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -101,8 +101,8 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) m_prevColumn = -1; m_sequenceLength = 0; - KConfig* config = AbbrevFactory::instance()->config(); - KConfigGroupSaver group( config, "General" ); + TDEConfig* config = AbbrevFactory::instance()->config(); + TDEConfigGroupSaver group( config, "General" ); m_autoWordCompletionEnabled = config->readBoolEntry( "AutoWordCompletion", false ); updateActions(); @@ -126,8 +126,8 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled ) if( enabled == m_autoWordCompletionEnabled ) return; - KConfig* config = AbbrevFactory::instance()->config(); - KConfigGroupSaver group( config, "General" ); + TDEConfig* config = AbbrevFactory::instance()->config(); + TDEConfigGroupSaver group( config, "General" ); m_autoWordCompletionEnabled = enabled; config->writeEntry( "AutoWordCompletion", m_autoWordCompletionEnabled ); diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 67e97361..d9725ba4 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); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); //config->setGroup("AppWizard"); //templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0)); @@ -139,7 +139,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch info->templateFile = TDEGlobal::dirs()->findResource("apptemplates", *it); info->templateName = (*it); - KConfig templateConfig(info->templateFile); + TDEConfig templateConfig(info->templateFile); templateConfig.setGroup("General"); info->name = templateConfig.readEntry("Name"); @@ -186,7 +186,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch if( !(*include).isEmpty() ) { TQString file = KMacroExpander::expandMacros( ( *include ), info->subMap); - KConfig tmpCfg( file ); + TDEConfig tmpCfg( file ); tmpCfg.copyTo( "", &templateConfig); kdDebug(9010) << "Merging: " << tmpCfg.name() << endl; } @@ -643,7 +643,7 @@ void AppWizardDialog::accept() kdDebug( 9010 ) << "Process dir " << (*dirIt).dir << endl; if( m_pCurrentAppInfo->subMap[(*dirIt).option] != "false" ) { - if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) ) + if( ! TDEIO::NetAccess::mkdir( (*dirIt).dir, this ) ) { KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) ); return; @@ -786,14 +786,14 @@ bool AppWizardDialog::copyFile( const TQString &source, const TQString &dest, bo else { // Copy the source file to the destFile. - return KIO::NetAccess::copy( source, dest, this ); + return TDEIO::NetAccess::copy( source, dest, this ); } return true; } void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process ) { - KIO::NetAccess::mkdir( dest , this ); + TDEIO::NetAccess::mkdir( dest , this ); kdDebug(9010) << "Dir : " << dir->name() << " at " << dest << endl; TQStringList entries = dir->entries(); kdDebug(9010) << "Entries : " << entries.join(",") << endl; @@ -913,7 +913,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) if(!dir.isEmpty()) { // set new location as default project dir? - KConfig *config = kapp->config(); + TDEConfig *config = kapp->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() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->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) } } - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("AppWizard"); config->writePathEntry("FavTemplates", templatesList); config->writeEntry("FavNames", iconNamesList); @@ -1234,14 +1234,14 @@ void AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest) if (source->permissions() & 00100) { kdDebug(9010) << "source is executable" << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; KURL kurl = KURL::fromPathOrURL(dest); - if (KIO::NetAccess::stat(kurl, entry, 0)) + if (TDEIO::NetAccess::stat(kurl, entry, 0)) { KFileItem it(entry, kurl); int mode = it.permissions(); kdDebug(9010) << "stat shows permissions: " << mode << endl; - KIO::chmod(KURL::fromPathOrURL(dest), mode | 00100 ); + TDEIO::chmod(KURL::fromPathOrURL(dest), mode | 00100 ); } } } @@ -1251,23 +1251,23 @@ void AppWizardDialog::setPermissions(const installFile &file) kdDebug(9010) << "AppWizardDialog::setPermissions(const installFile &file)" << endl; kdDebug(9010) << " dest: " << file.dest << endl; - KIO::UDSEntry sourceentry; + TDEIO::UDSEntry sourceentry; KURL sourceurl = KURL::fromPathOrURL(file.source); - if (KIO::NetAccess::stat(sourceurl, sourceentry, 0)) + if (TDEIO::NetAccess::stat(sourceurl, sourceentry, 0)) { KFileItem sourceit(sourceentry, sourceurl); int sourcemode = sourceit.permissions(); if (sourcemode & 00100) { kdDebug(9010) << "source is executable" << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; KURL kurl = KURL::fromPathOrURL(file.dest); - if (KIO::NetAccess::stat(kurl, entry, 0)) + if (TDEIO::NetAccess::stat(kurl, entry, 0)) { KFileItem it(entry, kurl); int mode = it.permissions(); kdDebug(9010) << "stat shows permissions: " << mode << endl; - KIO::chmod(KURL::fromPathOrURL(file.dest), mode | 00100 ); + TDEIO::chmod(KURL::fromPathOrURL(file.dest), mode | 00100 ); } } } diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 75a4487f..c0d05a77 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -67,7 +67,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na TQStringList::ConstIterator it; for (it = importNames.begin(); it != importNames.end(); ++it) { - KConfig config(TDEGlobal::dirs()->findResource("appimports", *it)); + TDEConfig config(TDEGlobal::dirs()->findResource("appimports", *it)); config.setGroup("General"); TQString type = config.readEntry("Comment"); project_combo->insertItem(type); diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 40f3ba3b..3d5fcff2 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -32,7 +32,7 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent) for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it) { - KConfig config((*it).path()); + TDEConfig config((*it).path()); config.setGroup("General"); m_templateList += config.readListEntry("List"); } diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index eef40e98..620315d3 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"<config(); + TDEConfig *config = kapp->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: " <writeEntry("Options",options); config->writeEntry("Extensions",m_globalExtensions.join(",")); diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index 939dc6c2..f2164fd8 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig() */ void BookmarksConfig::writeConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Bookmarks"); config->writeEntry("Context", _context ); @@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig() */ void BookmarksConfig::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Bookmarks"); _context = config->readPropertyEntry( "Context", 5 ).toInt(); diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 95c2ae2c..1f047168 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -94,7 +94,7 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); - KConfig* config = m_part->instance()->config(); + TDEConfig* config = m_part->instance()->config(); config->setGroup( "General" ); setViewMode( config->readNumEntry( "ViewMode", KDevelop3ViewMode ) ); m_doFollowEditor = config->readBoolEntry( "FollowEditor", false ); @@ -102,7 +102,7 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) ClassViewWidget::~ClassViewWidget( ) { - KConfig* config = m_part->instance()->config(); + TDEConfig* config = m_part->instance()->config(); config->setGroup( "General" ); config->writeEntry( "ViewMode", viewMode() ); config->writeEntry( "FollowEditor", m_doFollowEditor ); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 0d9d6a7a..5379119c 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 - KConfig* config = kapp->config(); + TDEConfig* config = kapp->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 dc0c834d..3b9d2768 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 - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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; - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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; - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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 d7458a85..1cdbc187 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"); - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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() ); - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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 88a716c8..681c09d1 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 ) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -53,7 +53,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); @@ -256,7 +256,7 @@ void DiffWidget::slotAppend( const TQString& str ) } // internally for the TextEdit only! -void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba ) +void DiffWidget::slotAppend( TDEIO::Job*, const TQByteArray& ba ) { slotAppend( TQString( ba ) ); } @@ -305,13 +305,13 @@ void DiffWidget::openURL( const KURL& url ) if ( job ) job->kill(); - KIO::TransferJob* job = KIO::get( url ); + TDEIO::TransferJob* job = TDEIO::get( url ); if ( !job ) return; - connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( KIO::Job * )), + connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFinished()) ); } diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index 2b159e3f..b948fae1 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -21,7 +21,7 @@ class KTempFile; class DiffPart; -namespace KIO { +namespace TDEIO { class Job; } @@ -80,7 +80,7 @@ private slots: /** appends a piece of "diff" */ void slotAppend( const TQString& str ); /** overloaded for convenience */ - void slotAppend( KIO::Job*, const TQByteArray& ba ); + void slotAppend( TDEIO::Job*, const TQByteArray& ba ); /** call this when the whole "diff" has been sent. * Don't call slotAppend afterwards! */ @@ -100,7 +100,7 @@ private: private: DiffPart * m_part; KDiffTextEdit* te; - KIO::Job* job; + TDEIO::Job* job; KParts::ReadOnlyPart* extPart; KTempFile* tempFile; TQString rawDiff; diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 24e37cdb..90f66120 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -191,7 +191,7 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() { kdDebug() << "Implement ftp.kde.org & apps.kde.com ftp transfer" << endl; else { for(unsigned int i=0; i< uploadFileListBox->count(); i++) - KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ), + TDEIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ), KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") )); } } diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 712a57fa..0b04548d 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -63,7 +63,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, (*it)->loadCatalogConfiguration( m_View ); } - KConfig *config = m_part->config(); + TDEConfig *config = m_part->config(); //read full text search settings config->setGroup("htdig"); TQString databaseDir = kapp->dirs()->saveLocation("data", @@ -105,7 +105,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, //font sizes and zoom levels KHTMLPart htmlpart; - KConfig *appConfig = TDEGlobal::config(); + TDEConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); standardFont_combo->setCurrentText(appConfig->readEntry("StandardFont", htmlpart.settings()->stdFontName())); @@ -173,7 +173,7 @@ void DocGlobalConfigWidget::accept() (*it)->reinit(m_widget->contents(), m_widget->index(), TQStringList()); } - KConfig *config = m_part->config(); + TDEConfig *config = m_part->config(); //write full text search settings config->setGroup("htdig"); config->writePathEntry("databaseDir", DocUtils::envURL(databaseDirEdit)); @@ -214,7 +214,7 @@ void DocGlobalConfigWidget::accept() m_part->setAssistantUsed(useAssistant_box->isChecked()); //font sizes and zoom levels - KConfig *appConfig = TDEGlobal::config(); + TDEConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); appConfig->writeEntry("StandardFont", standardFont_combo->currentText()); appConfig->writeEntry("FixedFont", fixedFont_combo->currentText()); @@ -241,7 +241,7 @@ void DocGlobalConfigWidget::updateConfigForHTMLParts() KHTMLPart *htmlPart = dynamic_cast(m_part->partController()->partForURL(*it)); if (htmlPart) { - KConfig *appConfig = TDEGlobal::config(); + TDEConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); htmlPart->setStandardFont(appConfig->readEntry("StandardFont")); htmlPart->setFixedFont(appConfig->readEntry("FixedFont")); diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 23fd0e14..32b08323 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -183,7 +183,7 @@ void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *pag } } -KConfig *DocumentationPart::config() +TDEConfig *DocumentationPart::config() { return DocumentationFactory::instance()->config(); } @@ -508,7 +508,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) bool DocumentationPart::hasContextFeature(ContextFeature feature) { - KConfig *config = DocumentationFactory::instance()->config(); + TDEConfig *config = DocumentationFactory::instance()->config(); TQString group = config->group(); config->setGroup("Context Features"); switch (feature) @@ -535,7 +535,7 @@ bool DocumentationPart::hasContextFeature(ContextFeature feature) void DocumentationPart::setContextFeature(ContextFeature feature, bool b) { - KConfig *config = DocumentationFactory::instance()->config(); + TDEConfig *config = DocumentationFactory::instance()->config(); TQString group = config->group(); config->setGroup("Context Features"); TQString key; @@ -687,7 +687,7 @@ void DocumentationPart::setAssistantUsed(bool b) { m_assistantUsed = b; //use global config to store different settings for kdevassistant and tdevelop - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Documentation"); config->writeEntry("UseAssistant", isAssistantUsed()); } @@ -735,7 +735,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin void DocumentationPart::loadSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index d6bdacd2..722ad4bd 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -27,7 +27,7 @@ class FindDocumentation; class DocumentationWidget; class IndexBox; -class KConfig; +class TDEConfig; class KDialogBase; class ConfigWidgetProxy; class DocumentationPlugin; @@ -84,7 +84,7 @@ signals: protected: void loadDocumentationPlugins(); - KConfig *config(); + TDEConfig *config(); void setupActions(); void loadSettings(); void saveProjectDocumentationInfo(); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 90cd6234..84d8eada 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -69,7 +69,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) DocumentationWidget::~DocumentationWidget() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Documentation"); config->writeEntry("LastPage", m_tab->currentIndex()); } diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index 65f852ba..ab1a3cc9 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -24,7 +24,7 @@ #include "find_documentation_optionsbase.h" class TQCheckListItem; -class KConfig; +class TDEConfig; class FindDocumentationOptions : public FindDocumentationOptionsBase { @@ -60,7 +60,7 @@ private: TQCheckListItem *m_google_item; TQCheckListItem *m_contents_item; - KConfig* config; + TDEConfig* config; }; #endif diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 15d0d0a9..5c261c4c 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -253,7 +253,7 @@ int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int //class DocumentationPlugin -DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name) +DocumentationPlugin::DocumentationPlugin(TDEConfig *pluginConfig, TQObject *parent, const char *name) :TQObject(parent, name), config(pluginConfig), m_indexCreated(false) { } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index 545b101a..aa329ac5 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -234,7 +234,7 @@ public: setCapabilities(Index | FullTextSearch); @endcode */ - DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0); + DocumentationPlugin(TDEConfig *pluginConfig, TQObject *parent =0, const char *name =0); virtual ~DocumentationPlugin(); /**Returns the i18n name of the plugin.*/ @@ -298,8 +298,8 @@ public: /**Loads catalog configuration and fills configurationView with ConfigurationItem objects.*/ virtual void loadCatalogConfiguration(KListView *configurationView); /**Saves catalog configuration basing on configurationView and - deletedConfigurationItems contents. If you use KConfig to store configuration, - it is important that you call KConfig::sync() method after saving.*/ + deletedConfigurationItems contents. If you use TDEConfig to store configuration, + it is important that you call TDEConfig::sync() method after saving.*/ virtual void saveCatalogConfiguration(KListView *configurationView); /**Adds new catalog to a configuration.*/ virtual void addCatalogConfiguration(KListView *configurationView, @@ -366,7 +366,7 @@ protected: TQStringList deletedConfigurationItems; /**Configuration object used by a plugin.*/ - KConfig *config; + TDEConfig *config; private: /**Adds catalog item to catalogs, namedCatalogs and indexes lists and maps.*/ diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index 09b81d72..7293d985 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -82,7 +82,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) { url.addPath("/:" + name); TQString tmpFile; - if( KIO::NetAccess::download( url, tmpFile, 0 ) ) + if( TDEIO::NetAccess::download( url, tmpFile, 0 ) ) { std::filebuf fb; fb.open (tmpFile.ascii(), std::ios::in); @@ -93,7 +93,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) { ret += buf; ret += "\n"; } fb.close(); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } else { kdDebug(9002) << "DocCHMPlugin::getSpecialData could not download data from " << url.url() << endl; } diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 4712dc14..53dd6740 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -23,7 +23,7 @@ #include #include -class KConfig; +class TDEConfig; class DocQtPlugin : public DocumentationPlugin { diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 3f0fbc54..7c8421a8 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -35,7 +35,7 @@ #include "chm.h" -using namespace KIO; +using namespace TDEIO; extern "C" { @@ -100,13 +100,13 @@ void ChmProtocol::get( const KURL& url ) TQString path; if ( !checkNewFile( bigpath, path ) ) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } if (m_dirMap.find(path) == m_dirMap.end()) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h index feb075dc..333b5ca3 100644 --- a/parts/documentation/protocols/chm/chm.h +++ b/parts/documentation/protocols/chm/chm.h @@ -26,7 +26,7 @@ class TQCString; -class ChmProtocol : public KIO::SlaveBase +class ChmProtocol : public TDEIO::SlaveBase { public: ChmProtocol( const TQCString&, const TQCString& ); diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index c9c5f58e..11e5e93e 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -100,18 +100,18 @@ bool KChmPart::openFile() m_htmlData.truncate(0); - m_job = KIO::get( TQString("chm:")+m_file+"/", true, false ); - connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) ); + m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } -void KChmPart::readData(KIO::Job * , const TQByteArray & data) +void KChmPart::readData(TDEIO::Job * , const TQByteArray & data) { m_htmlData += data; } -void KChmPart::jobDone( KIO::Job *) +void KChmPart::jobDone( TDEIO::Job *) { m_job=0; begin(); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 3ed054fe..1ec2eaf8 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -64,14 +64,14 @@ class KChmPart : public KDevHTMLPart virtual bool openURL( const KURL & ); /* protected slots: - void readData(KIO::Job * , const TQByteArray & data); - void jobDone( KIO::Job *); + void readData(TDEIO::Job * , const TQByteArray & data); + void jobDone( TDEIO::Job *); */ protected: //virtual bool openFile(); TDEInstance *m_instance; KParts::BrowserExtension *m_extension; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; TQCString m_htmlData; protected slots: diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 69a91a6e..16f71171 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -123,7 +123,7 @@ void SearchView::updateConfig() void SearchView::updateIndex() { runHtdig("-i"); - KConfig *config = m_part->config(); + TDEConfig *config = m_part->config(); config->setGroup("htdig"); config->writeEntry("IsSetup", true); config->sync(); @@ -141,7 +141,7 @@ void tqt_leave_modal(TQWidget *widget); void SearchView::search() { - KConfig *config = m_part->config(); + TDEConfig *config = m_part->config(); config->setGroup("htdig"); if (config->readBoolEntry("IsSetup", false) == false) { diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index 4c0dfa99..b7b56304 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -48,7 +48,7 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; d.mkdir(indexdir); - KConfig config("kdevdocumentation", true); + TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); databaseDir = config.readPathEntry("databaseDir", indexdir); @@ -300,7 +300,7 @@ bool ProgressDialog::generateIndex() setState(1); procdone = false; // run htdig - KConfig config("kdevdocumentation", true); + TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")); if (exe.isEmpty()) @@ -365,7 +365,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc) setFilesDigged(filesToDig); setState(2); - KConfig config("kdevdocumentation", true); + TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); // run htmerge ----------------------------------------------------- exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")); diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index d703197c..45721e17 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -352,13 +352,13 @@ void FCConfigWidget::copyTemplate(TQString templateUrl, TQString dest, TQString { KURL destDir; destDir.setPath(dest); - if (!KIO::NetAccess::exists(destDir, false, 0 )) - KIO::NetAccess::mkdir(destDir); + if (!TDEIO::NetAccess::exists(destDir, false, 0 )) + TDEIO::NetAccess::mkdir(destDir); KURL destination; destination.setPath(dest + destName); - KIO::NetAccess::upload(templateUrl, destination); + TDEIO::NetAccess::upload(templateUrl, destination); } } @@ -411,7 +411,7 @@ void FCConfigWidget::removetemplate_button_clicked( ) { KURL removedTemplate; removedTemplate.setPath(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0)); - KIO::NetAccess::del(removedTemplate); + TDEIO::NetAccess::del(removedTemplate); TQListViewItem *it = fctemplates_view->currentItem(); if (it->itemBelow()) { diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index 31149b91..0aeac511 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) { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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() { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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 b0b6815c..45d186ae 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(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->setGroup("File List Plugin"); if (config->readBoolEntry("ToolbarInToolview", true)) { @@ -382,7 +382,7 @@ void ProjectviewPart::projectClosed() void ProjectviewPart::slotOpenProjectView(const TQString &view) { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->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() { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->deleteGroup("ProjectViews", true); config->setGroup("ProjectViews"); @@ -559,7 +559,7 @@ void ProjectviewPart::writeConfig() void ProjectviewPart::readConfig() { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); TQMap entries = config->entryMap("ProjectViews"); m_projectViews.clear(); diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 0472f38b..d2d8ffff 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -237,7 +237,7 @@ KDevFileSelector::~KDevFileSelector() //BEGIN Public Methods -void KDevFileSelector::readConfig(KConfig *config, const TQString & name) +void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) { dir->readConfig(config, name + ":dir"); dir->setView( KFile::Default ); @@ -288,7 +288,7 @@ void KDevFileSelector::initialDirChangeHack() setDir( waitingDir ); } -void KDevFileSelector::setupToolbar( KConfig *config ) +void KDevFileSelector::setupToolbar( TDEConfig *config ) { toolbar->clear(); TQStringList tbactions = config->readListEntry( "toolbar actions", ',' ); @@ -311,7 +311,7 @@ void KDevFileSelector::setupToolbar( KConfig *config ) } } -void KDevFileSelector::writeConfig(KConfig *config, const TQString & name) +void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) { dir->writeConfig(config,name + ":dir"); @@ -686,7 +686,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect void KFSConfigPage::apply() { - KConfig *config = fileSelector->m_part->instance()->config(); + TDEConfig *config = fileSelector->m_part->instance()->config(); config->setGroup( "fileselector" ); // toolbar TQStringList l; @@ -741,7 +741,7 @@ void KFSConfigPage::reload() void KFSConfigPage::init() { - KConfig *config = fileSelector->m_part->instance()->config(); + TDEConfig *config = fileSelector->m_part->instance()->config(); config->setGroup( "fileselector" ); // toolbar TQStringList l = config->readListEntry( "toolbar actions", ',' ); diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index 65bd2000..17c533ee 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -116,9 +116,9 @@ public: TQWidget * parent = 0, const char * name = 0 ); ~KDevFileSelector(); - void readConfig( KConfig *, const TQString & ); - void writeConfig( KConfig *, const TQString & ); - void setupToolbar( KConfig * ); + void readConfig( TDEConfig *, const TQString & ); + void writeConfig( TDEConfig *, const TQString & ); + void setupToolbar( TDEConfig * ); void setView( KFile::FileView ); KDevDirOperator *dirOperator(){ return dir; } KActionCollection *actionCollection() { return mActionCollection; }; diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 3873c112..a6c79495 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -112,9 +112,9 @@ void FileViewPart::loadSettings() unknown = TQColor( white ), defaultColor = TQColor( white ); - KConfig *cfg = instance()->config(); + TDEConfig *cfg = instance()->config(); - KConfigGroupSaver gs( cfg, "VCS Colors" ); + TDEConfigGroupSaver gs( cfg, "VCS Colors" ); vcsColors.added = cfg->readColorEntry( "FileAddedColor", &added ); vcsColors.updated = cfg->readColorEntry( "FileUpdatedColor", &updated ); vcsColors.sticky = cfg->readColorEntry( "FileStickyColor", &sticky ); @@ -130,9 +130,9 @@ void FileViewPart::loadSettings() void FileViewPart::storeSettings() { - KConfig *cfg = instance()->config(); + TDEConfig *cfg = instance()->config(); // VCS colors - KConfigGroupSaver gs( cfg, "VCS Colors" ); + TDEConfigGroupSaver gs( cfg, "VCS Colors" ); cfg->writeEntry( "FileAddedColor", vcsColors.added ); cfg->writeEntry( "FileUpdatedColor", vcsColors.updated ); cfg->writeEntry( "FileStickyColor", vcsColors.sticky ); diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 59a95db0..59b598e1 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -51,7 +51,7 @@ ShellFilterDialog::ShellFilterDialog() m_proc = 0; - KConfig *config = FilterFactory::instance()->config(); + TDEConfig *config = FilterFactory::instance()->config(); config->setGroup("General"); combo->insertStringList(config->readListEntry("filteritems")); } @@ -67,7 +67,7 @@ ShellFilterDialog::~ShellFilterDialog() for (int i=0; i < combo->count(); ++i) list << combo->text(i); - KConfig *config = FilterFactory::instance()->config(); + TDEConfig *config = FilterFactory::instance()->config(); config->setGroup("General"); config->writeEntry("filteritems", list); } diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index d1799663..fd8752e4 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -52,7 +52,7 @@ ShellInsertDialog::ShellInsertDialog() connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &))); m_proc = 0; - KConfig *config = FilterFactory::instance()->config(); + TDEConfig *config = FilterFactory::instance()->config(); config->setGroup("General"); TQStringList items = config->readListEntry("InsertItems"); combo->insertStringList(items); @@ -71,7 +71,7 @@ ShellInsertDialog::~ShellInsertDialog() for (int i=0; i < combo->count(); ++i) list << combo->text(i); - KConfig *config = FilterFactory::instance()->config(); + TDEConfig *config = FilterFactory::instance()->config(); config->setGroup("General"); config->writeEntry("InsertItems", list); } diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h index 60637a0f..719bbfdc 100644 --- a/parts/grepview/grepdlg.h +++ b/parts/grepview/grepdlg.h @@ -19,7 +19,7 @@ #include -class KConfig; +class TDEConfig; class KURLRequester; class TQPushButton; class GrepViewPart; @@ -90,7 +90,7 @@ private: TQCheckBox *no_find_err_box; TQCheckBox *case_sens_box; TQCheckBox *keep_output_box; - KConfig* config; + TDEConfig* config; TQPushButton *search_button; TQPushButton *synch_button; GrepViewPart * m_part; diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 62a10d86..8c9e517b 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; - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); kdDebug(9035) << k_funcinfo << "SyncTerminalEmulator: " << config->readBoolEntry("SyncTerminalEmulator") << endl; diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 6560552d..6020b1d6 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -43,7 +43,7 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*))); connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); setSelectionMode(TQListBox::Extended); diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 4dd11fa5..ad106ef0 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -527,7 +527,7 @@ void MakeWidget::searchItem(int parag) void MakeWidget::insertStdoutLine( const TQCString& line ) { TQString sline; - bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( kapp->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 = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( kapp->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; - KConfig *pConfig = kapp->config(); + TDEConfig *pConfig = kapp->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; - KConfig *pConfig = kapp->config(); + TDEConfig *pConfig = kapp->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() ); - KConfig *pConfig = kapp->config(); + TDEConfig *pConfig = kapp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("ShowDirNavigMsg", DirectoryItem::getShowDirectoryMessages()); pConfig->sync(); @@ -778,7 +778,7 @@ void MakeWidget::toggleShowDirNavigMessages() void MakeWidget::updateSettingsFromConfig() { - KConfig *pConfig = kapp->config(); + TDEConfig *pConfig = kapp->config(); pConfig->setGroup("General Options"); TQFont outputFont = pConfig->readFontEntry("OutputViewFont"); setFont(outputFont); diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 78749465..45d005a3 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 kconfig and post list to the m_dirs - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->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 kconfig - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); if( !m_dirs->isEnabled() ) cfg->writeEntry("SearchDirs", TQStringList() ); else diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 496746b2..f12625f8 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -79,11 +79,11 @@ void scriptingPart::init() void scriptingPart::setupActions() { kdDebug() << "Load plugins" << endl; - // Read KConfig and get the list of custom directories. + // Read TDEConfig and get the list of custom directories. TQStringList searchDirs; searchDirs += "kate/scripts"; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); searchDirs += cfg->readListEntry("SearchDirs"); unplugActionList(TQString::fromLatin1( "script_actions" )); diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 4c67b158..1cf8a398 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -385,7 +385,7 @@ void SnippetWidget::writeConfig() As far as some guys might have some snippets stored in the "old" way we need to create a "DEFAULT" group into which we can import all snippets */ -void SnippetWidget::initConfigOldVersion(KConfig *cfg) +void SnippetWidget::initConfigOldVersion(TDEConfig *cfg) { SnippetGroup * group = new SnippetGroup(this, "DEFAULT", 1); _list.append(group); @@ -418,7 +418,7 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg) void SnippetWidget::initConfig() { if (_cfg == NULL) - _cfg = new KConfig("kdevsnippetrc", false, false); + _cfg = new TDEConfig("kdevsnippetrc", false, false); _cfg->setGroup("SnippetPart"); diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 5277e8d5..1a0ef8c1 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -28,7 +28,7 @@ class TQPoint; class SnippetDlg; class SnippetItem; class KTextEdit; -class KConfig; +class TDEConfig; /** @@ -49,7 +49,7 @@ public: ~SnippetWidget(); TQPtrList * getList() { return (&_list); } void writeConfig(); - void initConfigOldVersion(KConfig *cfg); + void initConfigOldVersion(TDEConfig *cfg); SnippetConfig * getSnippetConfig() { return (&_SnippetConfig); } @@ -71,7 +71,7 @@ private: TQPtrList _list; TQMap _mapSaved; - KConfig * _cfg; + TDEConfig * _cfg; SnippetConfig _SnippetConfig; public slots: diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 4bcf842d..5efd3870 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() { - KConfig * config = TDEApplication::kApplication()->config(); + TDEConfig * config = TDEApplication::kApplication()->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 e7de47d9..b414fbbb 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -90,7 +90,7 @@ void ToolsPart::updateMenu() unplugActionList("tools_list"); - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tools"); TQStringList list = config->readListEntry("Tools"); @@ -167,7 +167,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) void ToolsPart::updateToolsMenu() { - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("External Tools"); TQStringList l = config->readListEntry("Tool Menu"); @@ -176,7 +176,7 @@ void ToolsPart::updateToolsMenu() TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { TQString menutext = *it; - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); bool isdesktopfile = config->readBoolEntry("DesktopFile"); KAction *action = new KAction(*it, 0, @@ -204,7 +204,7 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) m_contextFileName = fcontext->urls().first().path(); externalToolMenuEntries.clear(); - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("External Tools"); TQStringList filecontextList = config->readListEntry("File Context"); @@ -225,7 +225,7 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) void ToolsPart::toolsMenuActivated() { TQString menutext = TQT_TQOBJECT(const_cast(sender()))->name(); - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); TQString cmdline = config->readPathEntry("CommandLine"); bool isdesktopfile = config->readBoolEntry("DesktopFile"); @@ -244,7 +244,7 @@ void ToolsPart::fileContextActivated(int id) { TQString menutext = externalToolMenuEntries[ id ]; - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("File Context " + menutext); TQString cmdline = config->readPathEntry("CommandLine"); bool captured = config->readBoolEntry("Captured"); @@ -259,7 +259,7 @@ void ToolsPart::dirContextActivated(int id) { TQString menutext = externalToolMenuEntries[ id ]; - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Dir Context " + menutext); TQString cmdline = config->readPathEntry("CommandLine"); bool captured = config->readBoolEntry("Captured"); diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index 5a8add6e..213ff02f 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -88,7 +88,7 @@ void ToolsConfig::fill() { _entries.clear(); - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tools"); TQStringList list = config->readListEntry("Tools"); @@ -138,7 +138,7 @@ void ToolsConfig::toTree() void ToolsConfig::accept() { - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tools"); TQStringList l; diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index fefef501..ef34eb97 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -63,7 +63,7 @@ ToolsConfigWidget::~ToolsConfigWidget() void ToolsConfigWidget::readGroup(const TQString &group, TQDict *entryDict) { - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("External Tools"); TQStringList list = config->readListEntry(group); @@ -85,7 +85,7 @@ void ToolsConfigWidget::readGroup(const TQString &group, TQDict &entryDict) { - KConfig *config = ToolsFactory::instance()->config(); + TDEConfig *config = ToolsFactory::instance()->config(); TQStringList list; diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index 721118c3..25df2d5a 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() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); int mdistyle = config->readNumEntry( "MDIStyle", 1 ); @@ -86,7 +86,7 @@ void UIChooserWidget::load() void UIChooserWidget::save() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("UI"); if ( AlwaysShowTabs->isChecked() ) -- cgit v1.2.1