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 --- lib/pilot.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/pilot.cc') 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) { -- cgit v1.2.1