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