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/knotes | |
| parent | 8ebd99fc2d3e2429a1030d60ce693b74b8832a40 (diff) | |
| download | kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.tar.gz kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'conduits/knotes')
| -rw-r--r-- | conduits/knotes/knotes-factory.cc | 8 | ||||
| -rw-r--r-- | conduits/knotes/knotes-factory.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/conduits/knotes/knotes-factory.cc b/conduits/knotes/knotes-factory.cc index 9601e81..dc7f8f3 100644 --- a/conduits/knotes/knotes-factory.cc +++ b/conduits/knotes/knotes-factory.cc @@ -55,19 +55,19 @@ void *init_conduit_knotes() } -/* static */ KAboutData *KNotesConduitFactory::fAbout = 0L; +/* static */ TDEAboutData *KNotesConduitFactory::fAbout = 0L; KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) : KLibFactory(p,n) { FUNCTIONSETUP; - fInstance = new KInstance("knotesconduit"); - fAbout = new KAboutData("knotesconduit", + fInstance = new TDEInstance("knotesconduit"); + fAbout = new TDEAboutData("knotesconduit", I18N_NOOP("KNotes Conduit for KPilot"), KPILOT_VERSION, I18N_NOOP("Configures the KNotes Conduit for KPilot"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2001, Adriaan de Groot"); fAbout->addAuthor("Adriaan de Groot", I18N_NOOP("Primary Author"), diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h index 5fc6a09..3df3c06 100644 --- a/conduits/knotes/knotes-factory.h +++ b/conduits/knotes/knotes-factory.h @@ -31,8 +31,8 @@ #include <klibloader.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KNotesConduitFactory : public KLibFactory { @@ -43,7 +43,7 @@ public: KNotesConduitFactory(TQObject * = 0L,const char * = 0L); virtual ~KNotesConduitFactory(); - static KAboutData *about() { return fAbout; } ; + static TDEAboutData *about() { return fAbout; } ; // The KNotes instance, unlike previous conduits (alphabetically) // has const char * const members. The extra const prevents people @@ -56,8 +56,8 @@ protected: const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: - KInstance *fInstance; - static KAboutData *fAbout; + TDEInstance *fInstance; + static TDEAboutData *fAbout; } ; extern "C" |