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 /conduits/docconduit | |
| parent | 7443f5c7a2870116707ac47da4986231a1d927a9 (diff) | |
| download | kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.tar.gz kpilot-cf989dcd69444c456d60c0eedbc3d5588d653681.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'conduits/docconduit')
| -rw-r--r-- | conduits/docconduit/doc-setup.cc | 2 | ||||
| -rw-r--r-- | conduits/docconduit/kpalmdoc_dlg.cc | 4 |
2 files changed, 3 insertions, 3 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); 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; |