From f8069e2ea048f2657cc417d83820576ec55c181b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:49 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kbabel/commonui/context.cpp | 2 +- kbabel/commonui/context.h | 4 ++-- kbabel/commonui/finddialog.cpp | 12 ++++++------ kbabel/commonui/projectpref.cpp | 4 ++-- kbabel/commonui/projectpref.h | 2 +- kbabel/commonui/projectprefwidgets.cpp | 2 +- kbabel/commonui/projectwizard.cpp | 2 +- kbabel/commonui/roughtransdlg.cpp | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kbabel/commonui') diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index bcce1578..6f4f16a7 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -128,7 +128,7 @@ TQValueList SourceContext::resolvePath( const TQString& packageDir, // ### TODO: find a way to allow remote files too TQString poDir; #if KDE_IS_VERSION( 3, 5, 0 ) - const KURL localUrl( KIO::NetAccess::mostLocalURL( urlPoFile, m_parent ) ); + const KURL localUrl( TDEIO::NetAccess::mostLocalURL( urlPoFile, m_parent ) ); if ( localUrl.isLocalFile() ) { const TQFileInfo fi( localUrl.path() ); diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h index 82c9ceb7..cb641c67 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.h @@ -45,7 +45,7 @@ class TQComboBox; class TQVBoxLayout; class TQLineEdit; class KListEditor; -class KConfig; +class TDEConfig; class KURL; struct ContextInfo @@ -107,7 +107,7 @@ private: TQValueList resolvePath( const TQString& packageDir, const TQString& packageName, const TQString& gettextComment, const KURL& urlPoFile ); bool loadPart(); - /// Parent widget (for KIO::NetAccess member functions) + /// Parent widget (for TDEIO::NetAccess member functions) TQWidget* m_parent; KTextEditor::Document* _part; KTextEditor::View* _view; diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index e4d99b84..02a1b2c3 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -386,10 +386,10 @@ void FindDialog::setReplaceOpts(ReplaceOptions options) void FindDialog::readSettings() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); if(_replaceDlg) { - KConfigGroupSaver cgs(config,"ReplaceDialog"); + TDEConfigGroupSaver cgs(config,"ReplaceDialog"); _replaceOptions.inMsgstr = config->readBoolEntry("InMsgstr",true); _replaceOptions.inComment = config->readBoolEntry("InComment",false); @@ -421,7 +421,7 @@ void FindDialog::readSettings() _findCombo->insertStringList(_replaceFindList); } else { - KConfigGroupSaver cgs(config,"FindDialog"); + TDEConfigGroupSaver cgs(config,"FindDialog"); _findOptions.inMsgid = config->readBoolEntry("InMsgid",true); _findOptions.inMsgstr = config->readBoolEntry("InMsgstr",true); @@ -459,10 +459,10 @@ void FindDialog::readSettings() void FindDialog::saveSettings() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); if(_replaceDlg) { - KConfigGroupSaver cgs(config,"ReplaceDialog"); + TDEConfigGroupSaver cgs(config,"ReplaceDialog"); config->writeEntry("InMsgstr",_replaceOptions.inMsgstr); config->writeEntry("InComment",_replaceOptions.inComment); @@ -478,7 +478,7 @@ void FindDialog::saveSettings() config->writeEntry("ReplaceList",_replaceList); } else { - KConfigGroupSaver cgs(config,"FindDialog"); + TDEConfigGroupSaver cgs(config,"FindDialog"); config->writeEntry("InMsgid",_findOptions.inMsgid); config->writeEntry("InMsgstr",_findOptions.inMsgstr); diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index f34d2cc2..0899fa34 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -61,7 +61,7 @@ using namespace KBabel; ProjectDialog::ProjectDialog(Project::Ptr project) - : KConfigDialog(0, "project dialog", project->settings(), + : TDEConfigDialog(0, "project dialog", project->settings(), IconList, Help|Default|Ok|Apply|Cancel) , _project( project ) { @@ -133,7 +133,7 @@ ProjectDialog::ProjectDialog(Project::Ptr project) void ProjectDialog::slotDefault() { - // redefine the KConfigDialog behavior to push default on the + // redefine the TDEConfigDialog behavior to push default on the // current page only _project->settings()->useDefaults(true); diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h index d2493cd0..ca99bdea 100644 --- a/kbabel/commonui/projectpref.h +++ b/kbabel/commonui/projectpref.h @@ -55,7 +55,7 @@ class DiffPreferences; namespace KBabel { -class KDE_EXPORT ProjectDialog : public KConfigDialog +class KDE_EXPORT ProjectDialog : public TDEConfigDialog { Q_OBJECT diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 4aa6ab74..d9f7a051 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -1163,7 +1163,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p tempLabel->setBuddy( _coderootEdit ); layout->addWidget(box); - // FIXME: use KConfigXT + // FIXME: use TDEConfigXT _pathsEditor = new KListEditor(page); _pathsEditor->setTitle(i18n("Path Patterns")); layout->addWidget(_pathsEditor); diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index c2526a4f..c9108f3f 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -53,7 +53,7 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) _wizard = new ProjectStep1(this,"project wizard widget"); // fill the known language codes - KConfig all_languages("all_languages", true, false, "locale"); + TDEConfig all_languages("all_languages", true, false, "locale"); TQStringList lang_codes = TDEGlobal::locale()->allLanguagesTwoAlpha(); for (TQStringList::iterator it = lang_codes.begin(); it != lang_codes.end(); ++it) diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index ccf3735f..f19747e3 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -160,8 +160,8 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat TQPtrList moduleList = dict->moduleInfos(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver gs(config,"RoughTranslation"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver gs(config,"RoughTranslation"); TQStringList selectedList=config->readListEntry("Selected"); if(selectedList.isEmpty()) { @@ -212,8 +212,8 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat RoughTransDlg::~RoughTransDlg() { - KConfig *config=TDEGlobal::config(); - KConfigGroupSaver gs(config,"RoughTranslation"); + TDEConfig *config=TDEGlobal::config(); + TDEConfigGroupSaver gs(config,"RoughTranslation"); config->writeEntry("Selected",dictChooser->selectedDicts()); bool flag=transButton->isChecked(); -- cgit v1.2.1