diff options
Diffstat (limited to 'kbabel/kbabel')
-rw-r--r-- | kbabel/kbabel/charselectview.cpp | 8 | ||||
-rw-r--r-- | kbabel/kbabel/charselectview.h | 4 | ||||
-rw-r--r-- | kbabel/kbabel/headereditor.cpp | 8 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.cpp | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.h | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelpref.cpp | 12 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelpref.h | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview.cpp | 36 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview.h | 12 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview2.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbcatalogview.cpp | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbcatalogview.h | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbcharselect.cpp | 8 | ||||
-rw-r--r-- | kbabel/kbabel/kbcharselect.h | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbhighlighting.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/spelldlg.cpp | 8 |
16 files changed, 68 insertions, 68 deletions
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 195c3fa0..9f591f17 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -96,17 +96,17 @@ void CharacterSelectorView::setTab(int value) _table->setTableNum( value ); } -void CharacterSelectorView::saveSettings(KConfig* config) +void CharacterSelectorView::saveSettings(TDEConfig* config) { - KConfigGroupSaver saver(config, "KBCharSelector" ); + TDEConfigGroupSaver saver(config, "KBCharSelector" ); config->writeEntry( "TableNum", _tableNum->value() ); config->writeEntry( "SelectedChar", TQString(_table->chr()) ); } -void CharacterSelectorView::restoreSettings(KConfig* config) +void CharacterSelectorView::restoreSettings(TDEConfig* config) { - KConfigGroupSaver saver(config, "KBCharSelector" ); + TDEConfigGroupSaver saver(config, "KBCharSelector" ); _tableNum->setValue( config->readNumEntry("TableNum", 0 )); _table->setChar( config->readEntry("SelectedChar"," ").at(0)); diff --git a/kbabel/kbabel/charselectview.h b/kbabel/kbabel/charselectview.h index bdfff62d..d55d294d 100644 --- a/kbabel/kbabel/charselectview.h +++ b/kbabel/kbabel/charselectview.h @@ -48,8 +48,8 @@ public: */ CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); - void saveSettings(KConfig* config); - void restoreSettings(KConfig* config); + void saveSettings(TDEConfig* config); + void restoreSettings(TDEConfig* config); public slots: // this view does not depend on the current item diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index cc692bbd..11c7eba1 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -84,18 +84,18 @@ HeaderEditor::~HeaderEditor() void HeaderEditor::saveSettings() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "HeaderEditor" ); + TDEConfigGroupSaver saver(config, "HeaderEditor" ); config->writeEntry( "Size", _editor->size() ); } void HeaderEditor::restoreSettings() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "HeaderEditor" ); + TDEConfigGroupSaver saver(config, "HeaderEditor" ); TQSize defaultSize(350,250); _editorSize = config->readSizeEntry("Size", &defaultSize ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 0abd5eca..26f33911 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -874,7 +874,7 @@ void KBabelMW::restoreSettings() { { applyMainWindowSettings(_config, "View"); - KConfigGroupSaver saver(_config,"View"); + TDEConfigGroupSaver saver(_config,"View"); _config->setGroup("View"); m_view->restoreView(_config); @@ -891,12 +891,12 @@ void KBabelMW::restoreSettings() -void KBabelMW::saveProperties(KConfig *config) +void KBabelMW::saveProperties(TDEConfig *config) { m_view->saveSession(config); } -void KBabelMW::readProperties(KConfig *config) +void KBabelMW::readProperties(TDEConfig *config) { m_view->restoreSession(config); diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 5b38414d..b1b63122 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -139,14 +139,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - virtual void saveProperties(KConfig *); + virtual void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - virtual void readProperties(KConfig *); + virtual void readProperties(TDEConfig *); virtual bool queryExit(); virtual bool queryClose(); diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 2bc23b9d..a241b119 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -50,7 +50,7 @@ using namespace KBabel; KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) - : KConfigDialog(0, "Preferences", KBabelSettings::self()) + : TDEConfigDialog(0, "Preferences", KBabelSettings::self()) { _editorPage = new EditorPreferences(0, "editor"); addPage( _editorPage @@ -116,7 +116,7 @@ bool KBabelPreferences::hasChanged() module_ret = info->id != KBabelSettings::defaultModule(); } - return KConfigDialog::hasChanged() + return TDEConfigDialog::hasChanged() || (_editorPage->_kcfg_AutoCheckTools->selectedTools() != KBabelSettings::autoCheckTools()) || (module_ret); } @@ -128,7 +128,7 @@ bool KBabelPreferences::isDefault() ModuleInfo *info = moduleList.at(_searchPage->_kcfg_DefaultModule->currentItem()); bool module_ret = ( info && info->id == KBabelSettings::defaultModule() ); - bool ret = KConfigDialog::isDefault() + bool ret = TDEConfigDialog::isDefault() && (_editorPage->_kcfg_AutoCheckTools->selectedTools().empty()) && (module_ret); @@ -138,7 +138,7 @@ bool KBabelPreferences::isDefault() void KBabelPreferences::updateSettings() { - KConfigDialog::updateSettings(); + TDEConfigDialog::updateSettings(); KBabelSettings::setAutoCheckTools(_editorPage->_kcfg_AutoCheckTools->selectedTools()); @@ -155,7 +155,7 @@ void KBabelPreferences::updateSettings() void KBabelPreferences::updateWidgets() { - KConfigDialog::updateWidgets(); + TDEConfigDialog::updateWidgets(); _editorPage->_kcfg_AutoCheckTools->setSelectedTools(KBabelSettings::autoCheckTools()); int i=0; @@ -172,7 +172,7 @@ void KBabelPreferences::updateWidgets() void KBabelPreferences::updateWidgetsDefault() { - KConfigDialog::updateWidgetsDefault(); + TDEConfigDialog::updateWidgetsDefault(); bool old_useDefault = KBabelSettings::self()->useDefaults(true); diff --git a/kbabel/kbabel/kbabelpref.h b/kbabel/kbabel/kbabelpref.h index a1be6c9a..e126f1e7 100644 --- a/kbabel/kbabel/kbabelpref.h +++ b/kbabel/kbabel/kbabelpref.h @@ -42,7 +42,7 @@ class SearchPreferences; class EditorPreferences; struct ModuleInfo; -class KBabelPreferences : public KConfigDialog +class KBabelPreferences : public TDEConfigDialog { Q_OBJECT @@ -56,8 +56,8 @@ protected slots: virtual void updateWidgetsDefault(); protected: - virtual bool hasChanged(); // reimplemented from KConfigDialog for our ToolSelectionWidget - virtual bool isDefault(); // reimplemented from KConfigDialog for our ToolSelectionWidget + virtual bool hasChanged(); // reimplemented from TDEConfigDialog for our ToolSelectionWidget + virtual bool isDefault(); // reimplemented from TDEConfigDialog for our ToolSelectionWidget private: SearchPreferences* _searchPage; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 37b9d3d6..1b8795e2 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -135,7 +135,7 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project _config = KSharedConfig::openConfig ("kbabelrc"); - KConfigGroupSaver gs(_config,"Editor"); + TDEConfigGroupSaver gs(_config,"Editor"); bool buildLeds=! KBabelSettings::ledInStatusbar(); _fuzzyLed=0; @@ -679,7 +679,7 @@ void KBabelView::update(EditCommand* cmd, bool undo) -void KBabelView::readSettings(KConfig* config) +void KBabelView::readSettings(TDEConfig* config) { if(KBabelSettings::autoUnsetFuzzy()) @@ -690,7 +690,7 @@ void KBabelView::readSettings(KConfig* config) setupAutoCheckTools(); - KConfigGroupSaver saver(config,"Editor"); + TDEConfigGroupSaver saver(config,"Editor"); _diffEnabled = config->readBoolEntry("AutoDiff", false); emit signalDiffEnabled(_diffEnabled); @@ -799,7 +799,7 @@ void KBabelView::readProject(Project::Ptr project) void KBabelView::saveSettings() { - KConfigGroupSaver saver(_config,"Editor"); + TDEConfigGroupSaver saver(_config,"Editor"); _config->writeEntry("AutoDiff",_diffEnabled); @@ -955,15 +955,15 @@ void KBabelView::setRMBSearchMenu(TQPopupMenu* popup) } -void KBabelView::saveView(KConfig *) +void KBabelView::saveView(TDEConfig *) { } -void KBabelView::restoreView(KConfig *) +void KBabelView::restoreView(TDEConfig *) { } -void KBabelView::saveSession(KConfig* config) +void KBabelView::saveSession(TDEConfig* config) { TQString focus; int line=0,col=0; @@ -994,7 +994,7 @@ void KBabelView::saveSession(KConfig* config) if( _spellcheckSettings.valid ) { - KConfigGroupSaver (config, "Spellcheck"); + TDEConfigGroupSaver (config, "Spellcheck"); config->writeEntry("NoRootAffix",_spellcheckSettings.noRootAffix); config->writeEntry("RunTogether",_spellcheckSettings.runTogether); config->writeEntry("SpellEncoding",_spellcheckSettings.spellEncoding); @@ -1007,7 +1007,7 @@ void KBabelView::saveSession(KConfig* config) saveView(config); } -void KBabelView::restoreSession(KConfig* config) +void KBabelView::restoreSession(TDEConfig* config) { TQString url=config->readPathEntry("URL"); @@ -1106,7 +1106,7 @@ void KBabelView::open() void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfModified, bool newView) { #if KDE_IS_VERSION( 3, 5, 0) - KURL url = KIO::NetAccess::mostLocalURL(_url,this); + KURL url = TDEIO::NetAccess::mostLocalURL(_url,this); #else KURL url = _url; #endif @@ -1446,7 +1446,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) newName=true; } - if (KIO::NetAccess::exists(url, false, this)) + if (TDEIO::NetAccess::exists(url, false, this)) { if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) @@ -1515,7 +1515,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) return false; } - if (KIO::NetAccess::exists(url, false, this)) + if (TDEIO::NetAccess::exists(url, false, this)) { if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n" "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) @@ -1584,7 +1584,7 @@ bool KBabelView::saveFileSpecial() KBabel::Project::Ptr project = KBabel::ProjectManager::open (tmpname); project->setSettings( _catalog->saveSettings() ); - KConfigDialog *_prefDialog = new KConfigDialog(this, "project dialog", project->settings(), + TDEConfigDialog *_prefDialog = new TDEConfigDialog(this, "project dialog", project->settings(), KDialogBase::IconList, KDialogBase::Cancel|KDialogBase::Ok|KDialogBase::Help); _prefDialog->setCaption( i18n("Special Save Settings") ); @@ -2700,8 +2700,8 @@ void KBabelView::findInFile(TQCString fileSource, FindOptions options) _showTryLaterBox=true; // delete dontDisplayAgain from configuration - KConfig* config = TDEGlobal::config(); - KConfigGroupSaver saver(config,"Notification Messages"); + TDEConfig* config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config,"Notification Messages"); config->writeEntry("waitForNextFile",true); // set that there can be more files @@ -2729,8 +2729,8 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti _showTryLaterBox=true; // delete dontDisplayAgain from configuration - KConfig* config = TDEGlobal::config(); - KConfigGroupSaver saver(config,"Notification Messages"); + TDEConfig* config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config,"Notification Messages"); config->writeEntry("waitForNextFile",true); // set that there can be more files @@ -3494,7 +3494,7 @@ void KBabelView::processUriDrop(KURL::List& uriList, const TQPoint& pos) KURL first(uriList.first()); KURL second(uriList.last()); - if( KIO::NetAccess::exists(first, true, this) ) + if( TDEIO::NetAccess::exists(first, true, this) ) { open(first); } diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index 8bad4baf..5e9c280a 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.h @@ -131,16 +131,16 @@ public: void setOverwriteMode(bool ovr); bool isSearching() const; - void saveView(KConfig *config); - void restoreView(KConfig *config); - void saveSession(KConfig*); - void restoreSession(KConfig*); + void saveView(TDEConfig *config); + void restoreView(TDEConfig *config); + void saveSession(TDEConfig*); + void restoreSession(TDEConfig*); - void readSettings(KConfig* config); + void readSettings(TDEConfig* config); void saveSettings(); void readProject(KBabel::Project::Ptr project); - void saveProject(KConfig* config); + void saveProject(TDEConfig* config); void openTemplate(const KURL& openURL, const KURL& saveURL); bool saveFile(bool checkSyntax=true); diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 34b9dc5b..c3d95520 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -679,7 +679,7 @@ bool KBabelView::openDiffFile(bool autoDiff) KURL diffFileURL(diffFilePath); - if(diffFileURL.isValid() && KIO::NetAccess::exists(diffFileURL,true,NULL)) + if(diffFileURL.isValid() && TDEIO::NetAccess::exists(diffFileURL,true,NULL)) { url = diffFileURL; diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index af4dd3dd..40aee1c0 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.cpp @@ -111,15 +111,15 @@ void KBCatalogView::readConfigurationSettings() { } -void KBCatalogView::readSessionSettings(KConfig *) +void KBCatalogView::readSessionSettings(TDEConfig *) { } -void KBCatalogView::writeConfigurationSettings(KConfig *) +void KBCatalogView::writeConfigurationSettings(TDEConfig *) { } -void KBCatalogView::writeSessionSettings(KConfig *) +void KBCatalogView::writeSessionSettings(TDEConfig *) { } diff --git a/kbabel/kbabel/kbcatalogview.h b/kbabel/kbabel/kbcatalogview.h index 68efc57a..0c5ce17b 100644 --- a/kbabel/kbabel/kbcatalogview.h +++ b/kbabel/kbabel/kbcatalogview.h @@ -74,10 +74,10 @@ public slots: virtual void readProjectSettings(); virtual void readFileSettings(); virtual void readConfigurationSettings(); - virtual void readSessionSettings(KConfig *config); + virtual void readSessionSettings(TDEConfig *config); - virtual void writeConfigurationSettings(KConfig *config); - virtual void writeSessionSettings(KConfig *config); + virtual void writeConfigurationSettings(TDEConfig *config); + virtual void writeSessionSettings(TDEConfig *config); virtual void setReadOnly (bool on); diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 2b55d4f5..a1ad6c18 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -75,17 +75,17 @@ void KBCharSelect::setTab(int value) _table->setTableNum( value ); } -void KBCharSelect::saveSettings(KConfig* config) +void KBCharSelect::saveSettings(TDEConfig* config) { - KConfigGroupSaver saver(config, "KBCharSelector" ); + TDEConfigGroupSaver saver(config, "KBCharSelector" ); config->writeEntry( "TableNum", _tableNum->value() ); config->writeEntry( "SelectedChar", TQString(_table->chr()) ); } -void KBCharSelect::restoreSettings(KConfig* config) +void KBCharSelect::restoreSettings(TDEConfig* config) { - KConfigGroupSaver saver(config, "KBCharSelector" ); + TDEConfigGroupSaver saver(config, "KBCharSelector" ); _tableNum->setValue( config->readNumEntry("TableNum", 0 )); _table->setChar( config->readEntry("SelectedChar"," ").at(0)); diff --git a/kbabel/kbabel/kbcharselect.h b/kbabel/kbabel/kbcharselect.h index b0780a40..bc515e8b 100644 --- a/kbabel/kbabel/kbcharselect.h +++ b/kbabel/kbabel/kbcharselect.h @@ -35,7 +35,7 @@ #include <tqvbox.h> -class KConfig; +class TDEConfig; class KCharSelectTable; class TQSpinBox; @@ -46,8 +46,8 @@ class KBCharSelect : public TQVBox public: KBCharSelect(TQWidget* parent, const char* name=0); - void saveSettings(KConfig* config); - void restoreSettings(KConfig* config); + void saveSettings(TDEConfig* config); + void restoreSettings(TDEConfig* config); signals: void characterDoubleClicked( TQChar ch ); diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3b494302..deaaf704 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -193,7 +193,7 @@ void KBabelHighlighter::setHasErrors( bool err ) void KBabelHighlighter::readSettings( ) { // FIXME: does not care about different projects yet - KConfig * config = TDEGlobal::config( ); + TDEConfig * config = TDEGlobal::config( ); config->setGroup( "Misc" ); TQString temp = config->readEntry( "AccelMarker", "&" ); accelMarker = temp[0]; diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp index 798467bf..e887fce5 100644 --- a/kbabel/kbabel/spelldlg.cpp +++ b/kbabel/kbabel/spelldlg.cpp @@ -59,8 +59,8 @@ SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name) { _mainWidget->markedBtn->setEnabled(false); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs(config,"SpellDlg"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs(config,"SpellDlg"); TQString what=config->readEntry("Default","All"); if(what=="All") @@ -82,8 +82,8 @@ SpellDlg::~SpellDlg() { if(_mainWidget->defaultBtn->isChecked()) { - KConfig *config=TDEGlobal::config(); - KConfigGroupSaver cs(config,"SpellDlg"); + TDEConfig *config=TDEGlobal::config(); + TDEConfigGroupSaver cs(config,"SpellDlg"); TQString what="All"; if(_mainWidget->endBtn->isChecked()) |