summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit/doc-setup.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:24:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:24:37 -0600
commitcf989dcd69444c456d60c0eedbc3d5588d653681 (patch)
treec9177c5aa7712f1a51ad6d4571d84591d247b515 /conduits/docconduit/doc-setup.cc
parent7443f5c7a2870116707ac47da4986231a1d927a9 (diff)
downloadkpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.tar.gz
kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'conduits/docconduit/doc-setup.cc')
-rw-r--r--conduits/docconduit/doc-setup.cc2
1 files changed, 1 insertions, 1 deletions
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);