diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:28 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:28 -0600 |
commit | 6c1d52c8248adb9189c944a28efde52330e99b66 (patch) | |
tree | 842df8de70813d5097e5d7ffe04577c4077381d9 /kmymoney2/widgets/kaccounttemplateselector.cpp | |
parent | 4b12aca2f1e0304a1cb35df621e9a993dd4d81f7 (diff) | |
download | kmymoney-6c1d52c8248adb9189c944a28efde52330e99b66.tar.gz kmymoney-6c1d52c8248adb9189c944a28efde52330e99b66.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmymoney2/widgets/kaccounttemplateselector.cpp')
-rw-r--r-- | kmymoney2/widgets/kaccounttemplateselector.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index 430c2dc..badcdff 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -180,7 +180,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) #ifndef KMM_DESIGNER TQStringList dirs; // get list of template subdirs and scan them for the list of subdirs - d->dirlist = KGlobal::dirs()->findDirs("appdata", "templates"); + d->dirlist = TDEGlobal::dirs()->findDirs("appdata", "templates"); TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { TQDir dir(*it); @@ -193,16 +193,16 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) continue; TQRegExp exp("(..)_(..)"); if(exp.search(*it_d) != -1) { - TQString country = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); if(country.isEmpty()) country = exp.cap(2); - TQString lang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); + TQString lang = TDEGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); if(d->countries.contains(country)) { if(d->countries[country] != *it_d) { TQString oName = d->countries[country]; exp.search(oName); - TQString oCountry = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); - TQString oLang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); + TQString oCountry = TDEGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); + TQString oLang = TDEGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); d->countries.remove(country); d->countries[TQString("%1 (%2)").arg(oCountry).arg(oLang)] = oName; d->countries[TQString("%1 (%2)").arg(country).arg(lang)] = *it_d; @@ -211,7 +211,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) d->countries[country] = *it_d; } } else if((*it_d).length() == 2) { - TQString country = KGlobal::locale()->twoAlphaToCountryName((*it_d).upper()); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName((*it_d).upper()); d->countries[country] = *it_d; } else { tqDebug("'%s/%s' not scanned", (*it).data(), (*it_d).data()); |