diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
| commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
| tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kbabel/commonui | |
| parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
| download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/commonui')
| -rw-r--r-- | kbabel/commonui/finddialog.cpp | 4 | ||||
| -rw-r--r-- | kbabel/commonui/projectwizard.cpp | 2 | ||||
| -rw-r--r-- | kbabel/commonui/roughtransdlg.cpp | 6 | ||||
| -rw-r--r-- | kbabel/commonui/toolaction.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 328f9f4a..e4d99b84 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -386,7 +386,7 @@ void FindDialog::setReplaceOpts(ReplaceOptions options) void FindDialog::readSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); if(_replaceDlg) { KConfigGroupSaver cgs(config,"ReplaceDialog"); @@ -459,7 +459,7 @@ void FindDialog::readSettings() void FindDialog::saveSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); if(_replaceDlg) { KConfigGroupSaver cgs(config,"ReplaceDialog"); diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index 31b4ab86..c2526a4f 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -54,7 +54,7 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) // fill the known language codes KConfig all_languages("all_languages", true, false, "locale"); - TQStringList lang_codes = KGlobal::locale()->allLanguagesTwoAlpha(); + 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 ee35a22a..ccf3735f 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -160,7 +160,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat TQPtrList<ModuleInfo> moduleList = dict->moduleInfos(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver gs(config,"RoughTranslation"); TQStringList selectedList=config->readListEntry("Selected"); if(selectedList.isEmpty()) @@ -212,7 +212,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat RoughTransDlg::~RoughTransDlg() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); KConfigGroupSaver gs(config,"RoughTranslation"); config->writeEntry("Selected",dictChooser->selectedDicts()); @@ -667,7 +667,7 @@ void RoughTransDlg::translate() void RoughTransDlg::showStatistics() { int nothing=totalTried-partTransCounter-exactTransCounter; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQString statMsg = i18n("Result of the translation:\n" "Edited entries: %1\n" "Exact translations: %2 (%3%)\n" diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 37f9f671..48650231 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -92,7 +92,7 @@ TQValueList<KDataToolInfo> ToolAction::validationTools() { TQValueList<KDataToolInfo> result; - TQValueList<KDataToolInfo> tools = KDataToolInfo::query("CatalogItem", "application/x-kbabel-catalogitem", KGlobal::instance()); + TQValueList<KDataToolInfo> tools = KDataToolInfo::query("CatalogItem", "application/x-kbabel-catalogitem", TDEGlobal::instance()); for( TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin(); entry != tools.end(); ++entry ) { |