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 /lib | |
| parent | 7443f5c7a2870116707ac47da4986231a1d927a9 (diff) | |
| download | kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.tar.gz kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idmapper.cc | 2 | ||||
| -rw-r--r-- | lib/pilot.cc | 4 | ||||
| -rw-r--r-- | lib/pilotLocalDatabase.cc | 2 | ||||
| -rw-r--r-- | lib/plugin.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/idmapper.cc b/lib/idmapper.cc index f4fc38c..dc14072 100644 --- a/lib/idmapper.cc +++ b/lib/idmapper.cc @@ -57,7 +57,7 @@ IDMapper::IDMapper() fP = new IDMapperPrivate(); - TQString dbPath = KGlobal::dirs()-> + TQString dbPath = TDEGlobal::dirs()-> saveLocation("data", CSL1("kpilot/") ); TQString dbFile = dbPath + CSL1("mapping.xml"); diff --git a/lib/pilot.cc b/lib/pilot.cc index 2abfb7b..ef4054b 100644 --- a/lib/pilot.cc +++ b/lib/pilot.cc @@ -118,13 +118,13 @@ bool setupPilotCodec(const TQString &s) FUNCTIONSETUP; mutex = new TQMutex(); mutex->lock(); - TQString encoding(KGlobal::charsets()->encodingForName(s)); + TQString encoding(TDEGlobal::charsets()->encodingForName(s)); DEBUGKPILOT << fname << ": Using codec name " << s << endl; DEBUGKPILOT << fname << ": Creating codec " << encoding << endl; // if the desired codec can't be found, latin1 will be returned anyway, no need to do this manually - codec = KGlobal::charsets()->codecForName(encoding); + codec = TDEGlobal::charsets()->codecForName(encoding); if (codec) { diff --git a/lib/pilotLocalDatabase.cc b/lib/pilotLocalDatabase.cc index 91e0047..4946312 100644 --- a/lib/pilotLocalDatabase.cc +++ b/lib/pilotLocalDatabase.cc @@ -102,7 +102,7 @@ PilotLocalDatabase::PilotLocalDatabase(const TQString & path, } else { - fPathName = KGlobal::dirs()->saveLocation("data", + fPathName = TDEGlobal::dirs()->saveLocation("data", CSL1("kpilot/DBBackup/")); } fixupDBName(); diff --git a/lib/plugin.cc b/lib/plugin.cc index 0e61b32..baabc9c 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -116,8 +116,8 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad) TQString s; TQLabel *text; - KIconLoader *l = KGlobal::iconLoader(); - const TDEAboutData *p = ad ? ad : KGlobal::instance()->aboutData(); + KIconLoader *l = TDEGlobal::iconLoader(); + const TDEAboutData *p = ad ? ad : TDEGlobal::instance()->aboutData(); TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING); |