diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:24:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:24:37 -0600 |
| commit | cf989dcd69444c456d60c0eedbc3d5588d653681 (patch) | |
| tree | c9177c5aa7712f1a51ad6d4571d84591d247b515 /lib/pilot.cc | |
| 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/pilot.cc')
| -rw-r--r-- | lib/pilot.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |