diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:24:37 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:24:37 -0600 |
commit | cf989dcd69444c456d60c0eedbc3d5588d653681 (patch) | |
tree | c9177c5aa7712f1a51ad6d4571d84591d247b515 /conduits/abbrowserconduit | |
parent | 7443f5c7a2870116707ac47da4986231a1d927a9 (diff) | |
download | kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.tar.gz kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'conduits/abbrowserconduit')
-rw-r--r-- | conduits/abbrowserconduit/kabcRecord.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc index 91cbcb1..a02b83b 100644 --- a/conduits/abbrowserconduit/kabcRecord.cc +++ b/conduits/abbrowserconduit/kabcRecord.cc @@ -292,14 +292,14 @@ TQString KABCSync::getFieldForHHCustom( case eCustomBirthdate: if (settings.dateFormat().isEmpty()) { - retval = KGlobal::locale()->formatDate(abEntry.birthday().date()); + retval = TDEGlobal::locale()->formatDate(abEntry.birthday().date()); } else { - TQString tmpfmt(KGlobal::locale()->dateFormat()); - KGlobal::locale()->setDateFormat(settings.dateFormat()); - TQString ret(KGlobal::locale()->formatDate(abEntry.birthday().date())); - KGlobal::locale()->setDateFormat(tmpfmt); + TQString tmpfmt(TDEGlobal::locale()->dateFormat()); + TDEGlobal::locale()->setDateFormat(settings.dateFormat()); + TQString ret(TDEGlobal::locale()->formatDate(abEntry.birthday().date())); + TDEGlobal::locale()->setDateFormat(tmpfmt); retval = ret; } break; @@ -346,20 +346,20 @@ void KABCSync::setFieldFromHHCustom( if (settings.dateFormat().isEmpty()) { // empty format means use locale setting - bdate=KGlobal::locale()->readDate(value, &ok); + bdate=TDEGlobal::locale()->readDate(value, &ok); } else { // use given format - bdate=KGlobal::locale()->readDate(value, settings.dateFormat(), &ok); + bdate=TDEGlobal::locale()->readDate(value, settings.dateFormat(), &ok); } if (!ok) { - TQString format = KGlobal::locale()->dateFormatShort(); + TQString format = TDEGlobal::locale()->dateFormatShort(); TQRegExp re(CSL1("%[yY][^%]*")); format.remove(re); // Remove references to year and following punctuation - bdate = KGlobal::locale()->readDate(value, format, &ok); + bdate = TDEGlobal::locale()->readDate(value, format, &ok); } DEBUGKPILOT << "Birthdate from " << index << "-th custom field: " << TQString(bdate.toString()) << endl; |