diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:56:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:56:54 -0600 |
| commit | 28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 (patch) | |
| tree | f78e2df40f61288477bbd160d7c795918ad298d5 /conduits/docconduit | |
| 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')
| -rw-r--r-- | conduits/docconduit/doc-factory.cc | 8 | ||||
| -rw-r--r-- | conduits/docconduit/doc-factory.h | 10 | ||||
| -rw-r--r-- | conduits/docconduit/kpalmdoc.cpp | 4 |
3 files changed, 11 insertions, 11 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"), "[email protected]", diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h index f8968d9..1a7d2ba 100644 --- a/conduits/docconduit/doc-factory.h +++ b/conduits/docconduit/doc-factory.h @@ -31,8 +31,8 @@ #include <klibloader.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class DOCConduitFactory:public KLibFactory @@ -44,7 +44,7 @@ public: DOCConduitFactory(TQObject * = 0L, const char * = 0L); virtual ~ DOCConduitFactory(); - static KAboutData *about() { + static TDEAboutData *about() { return fAbout; }; @@ -61,8 +61,8 @@ protected: const TQStringList & args = TQStringList()); private: - KInstance * fInstance; - static KAboutData *fAbout; + TDEInstance * fInstance; + static TDEAboutData *fAbout; }; diff --git a/conduits/docconduit/kpalmdoc.cpp b/conduits/docconduit/kpalmdoc.cpp index f686aa4..f43b9c4 100644 --- a/conduits/docconduit/kpalmdoc.cpp +++ b/conduits/docconduit/kpalmdoc.cpp @@ -39,9 +39,9 @@ int main(int argc, char *argv[]) { - KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1", + TDEAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1", "KPalmDOC - KDE Converter for PalmDOC texts.\n\n", - KAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer"); + TDEAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer"); about.addAuthor("Reinhold Kainhofer", I18N_NOOP("Main Developer"), "[email protected]", "http://reinhold.kainhofer.com/Linux/"); about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"), |