diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:22:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:22:42 -0600 |
| commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
| tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kompare/komparenavtreepart | |
| parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
| download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparenavtreepart')
| -rw-r--r-- | kompare/komparenavtreepart/komparenavtreepart.cpp | 10 | ||||
| -rw-r--r-- | kompare/komparenavtreepart/komparenavtreepart.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 9f9d775e..3dca1b12 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -659,8 +659,8 @@ KDirLVI::~KDirLVI() } // part stuff -KInstance* KompareNavTreePartFactory::s_instance = 0L; -KAboutData* KompareNavTreePartFactory::s_about = 0L; +TDEInstance* KompareNavTreePartFactory::s_instance = 0L; +TDEAboutData* KompareNavTreePartFactory::s_about = 0L; KompareNavTreePartFactory::KompareNavTreePartFactory() : KParts::Factory() @@ -687,14 +687,14 @@ KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidge return obj; } -KInstance* KompareNavTreePartFactory::instance() +TDEInstance* KompareNavTreePartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1"); + s_about = new TDEAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1"); s_about->addAuthor("John Firebaugh", "Author", "[email protected]"); s_about->addAuthor("Otto Bruggeman", "Author", "[email protected]" ); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index 4172a8ed..0f670295 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -170,8 +170,8 @@ private: }; // part stuff -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KompareNavTreePartFactory : public KParts::Factory { @@ -183,11 +183,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; #endif |