diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:56:54 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:56:54 -0600 |
commit | 28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 (patch) | |
tree | f78e2df40f61288477bbd160d7c795918ad298d5 /conduits/docconduit/doc-factory.cc | |
parent | 8ebd99fc2d3e2429a1030d60ce693b74b8832a40 (diff) | |
download | kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.tar.gz kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'conduits/docconduit/doc-factory.cc')
-rw-r--r-- | conduits/docconduit/doc-factory.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc index cfab20f4d..db3c105 100644 --- a/conduits/docconduit/doc-factory.cc +++ b/conduits/docconduit/doc-factory.cc @@ -47,7 +47,7 @@ extern "C" { // A number of static variables -KAboutData * DOCConduitFactory::fAbout = 0L; +TDEAboutData * DOCConduitFactory::fAbout = 0L; const char *DOCConduitFactory::dbDOCtype = "TEXt"; const char *DOCConduitFactory::dbDOCcreator = "REAd"; @@ -58,11 +58,11 @@ DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n): KLibFactory(p, n) { FUNCTIONSETUP; - fInstance = new KInstance("docconduit"); - fAbout =new KAboutData("docconduit", + fInstance = new TDEInstance("docconduit"); + fAbout =new TDEAboutData("docconduit", I18N_NOOP("Palm DOC Conduit for KPilot"), KPILOT_VERSION, I18N_NOOP("Configures the DOC Conduit for KPilot"), - KAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer"); + TDEAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer"); fAbout->addAuthor("Reinhold Kainhofer", I18N_NOOP("Maintainer"), "reinhold@kainhofer.com", |