From cf989dcd69444c456d60c0eedbc3d5588d653681 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:24:37 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ChangeLog | 2 +- conduits/abbrowserconduit/kabcRecord.cc | 18 +++++++++--------- conduits/docconduit/doc-setup.cc | 2 +- conduits/docconduit/kpalmdoc_dlg.cc | 4 ++-- conduits/knotes/knotes-action.cc | 2 +- kpilot/conduitConfigDialog.h | 2 +- kpilot/fileInstallWidget.cc | 2 +- kpilot/fileInstaller.cc | 2 +- kpilot/hotSync.cc | 4 ++-- kpilot/kpilot.cc | 8 ++++---- kpilot/kpilot.kcfg | 2 +- kpilot/kpilotConfig.cc | 4 ++-- kpilot/kpilotConfigDialog.cc | 8 ++++---- kpilot/logWidget.cc | 2 +- kpilot/pilotDaemon.cc | 10 +++++----- lib/idmapper.cc | 2 +- lib/pilot.cc | 4 ++-- lib/pilotLocalDatabase.cc | 2 +- lib/plugin.cc | 4 ++-- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 278eb1c..679007b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -600,7 +600,7 @@ TODO: only re-write a local database if it is changed. message make sense. 2004-04-11 Reinhold Kainhofer -* Fix the codec handling to use KGlobal::charsets. +* Fix the codec handling to use TDEGlobal::charsets. * Implemented the startListening and stopListening methods of the daemon. * Fixed the config dialog so that just showing a conduit's config widget doesn't trigger the modified signal. 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() ) ) { diff --git a/kpilot/conduitConfigDialog.h b/kpilot/conduitConfigDialog.h index 57ad6a7..c4696ee 100644 --- a/kpilot/conduitConfigDialog.h +++ b/kpilot/conduitConfigDialog.h @@ -38,7 +38,7 @@ class TQListViewItem; class TQPushButton; class TQLabel; class TQWidgetStack; -class KProcess; +class TDEProcess; class ConduitConfigBase; class ConduitConfig; diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc index 1789d68..42eba9d 100644 --- a/kpilot/fileInstallWidget.cc +++ b/kpilot/fileInstallWidget.cc @@ -251,7 +251,7 @@ void FileInstallWidget::refreshFileInstallList() FUNCTIONSETUP; TQStringList fileNames = fInstaller->fileNames(); - TQPixmap kpilotIcon = KGlobal::iconLoader()->loadIcon(CSL1("kpilot"), KIcon::Desktop); + TQPixmap kpilotIcon = TDEGlobal::iconLoader()->loadIcon(CSL1("kpilot"), KIcon::Desktop); fIconView->clear(); diff --git a/kpilot/fileInstaller.cc b/kpilot/fileInstaller.cc index d46c67d..61b0e8c 100644 --- a/kpilot/fileInstaller.cc +++ b/kpilot/fileInstaller.cc @@ -51,7 +51,7 @@ FileInstaller::FileInstaller() : { FUNCTIONSETUP; - fDirName = KGlobal::dirs()->saveLocation("data", + fDirName = TDEGlobal::dirs()->saveLocation("data", CSL1("kpilot/pending_install/")); fPendingCopies = 0; diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc index 49212bf..49e0182 100644 --- a/kpilot/hotSync.cc +++ b/kpilot/hotSync.cc @@ -328,7 +328,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) if (fP->fPreferBackupDir.isEmpty()) { fP->fBackupDir = - KGlobal::dirs()->saveLocation("data",CSL1("kpilot/DBBackup/")) + + TDEGlobal::dirs()->saveLocation("data",CSL1("kpilot/DBBackup/")) + deviceLink()->getPilotUser().name() + '/'; } else @@ -923,7 +923,7 @@ CheckUser::~CheckUser() // fix the database location for local databases. // // - TQString pathName = KGlobal::dirs()->saveLocation("data", + TQString pathName = TDEGlobal::dirs()->saveLocation("data", CSL1("kpilot/DBBackup/")); if (!guiUserName.isEmpty()) { diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index d3722f2..eba6203 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -255,7 +255,7 @@ void KPilotInstaller::initComponents() TQWidget *w; #define ADDICONPAGE(a,b) \ - pixmap = KGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \ + pixmap = TDEGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \ w = getManagingWidget()->addVBoxPage(a,TQString(), pixmap) ; ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync")); @@ -717,7 +717,7 @@ void KPilotInstaller::optionsConfigureToolbars() FUNCTIONSETUP; // use the standard toolbar editor // This was added in KDE 3.1 - saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); @@ -729,7 +729,7 @@ void KPilotInstaller::slotNewToolbarConfig() FUNCTIONSETUP; // recreate our GUI createGUI(); - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } void KPilotInstaller::slotResetLink() @@ -1126,7 +1126,7 @@ int main(int argc, char **argv) TQTimer::singleShot(0,tp,TQT_SLOT(startDaemonIfNeeded())); - KGlobal::dirs()->addResourceType("pilotdbs", + TDEGlobal::dirs()->addResourceType("pilotdbs", CSL1("share/apps/kpilot/DBBackup")); tp->show(); a.setMainWidget(tp); diff --git a/kpilot/kpilot.kcfg b/kpilot/kpilot.kcfg index ebced52..ed8f107 100644 --- a/kpilot/kpilot.kcfg +++ b/kpilot/kpilot.kcfg @@ -54,7 +54,7 @@ - KGlobal::dirs()->saveLocation("data", "kpilot/").append("lastsync.log") + TDEGlobal::dirs()->saveLocation("data", "kpilot/").append("lastsync.log")