diff options
Diffstat (limited to 'conduits')
-rw-r--r-- | conduits/abbrowserconduit/kabcRecord.cc | 18 | ||||
-rw-r--r-- | conduits/docconduit/doc-setup.cc | 2 | ||||
-rw-r--r-- | conduits/docconduit/kpalmdoc_dlg.cc | 4 | ||||
-rw-r--r-- | conduits/knotes/knotes-action.cc | 2 |
4 files changed, 13 insertions, 13 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; diff --git a/conduits/docconduit/doc-setup.cc b/conduits/docconduit/doc-setup.cc index 6e6858a..4269c9e 100644 --- a/conduits/docconduit/doc-setup.cc +++ b/conduits/docconduit/doc-setup.cc @@ -51,7 +51,7 @@ DOCWidgetConfig::DOCWidgetConfig(TQWidget * w, const char *n): fWidget=fConfigWidget; - TQStringList l = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList l = TDEGlobal::charsets()->descriptiveEncodingNames(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { fConfigWidget->fEncoding->insertItem(*it); diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index 20e8d2f..02cfed1 100644 --- a/conduits/docconduit/kpalmdoc_dlg.cc +++ b/conduits/docconduit/kpalmdoc_dlg.cc @@ -60,7 +60,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) { TQWidget *page = makeHBoxMainWidget(); dlg=new ConverterDlgBase(page); - TQStringList l = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList l = TDEGlobal::charsets()->descriptiveEncodingNames(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { dlg->fEncoding->insertItem(*it); @@ -420,7 +420,7 @@ void ConverterDlg::slotToPDB() void ConverterDlg::slotUser1() { - KAboutApplication ab(KGlobal::instance()->aboutData(), this); + KAboutApplication ab(TDEGlobal::instance()->aboutData(), this); ab.show(); ab.exec(); return; diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index c99d143..18076b2 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -260,7 +260,7 @@ bool KNotesAction::openKNotesResource() TQString tz(korgcfg.readEntry( "TimeZoneId" ) ); fP->fNotesResource = new KCal::CalendarLocal(tz); - KURL mURL = KGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; + KURL mURL = TDEGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; if( fP->fNotesResource->load( mURL.path() ) ) { |