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/knotes-factory.h | |
| 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/knotes-factory.h')
| -rw-r--r-- | conduits/knotes/knotes-factory.h | 10 |
1 files changed, 5 insertions, 5 deletions
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" |