diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
| commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
| tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kompare/komparepart | |
| parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
| download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparepart')
| -rw-r--r-- | kompare/komparepart/kompare_part.cpp | 4 | ||||
| -rw-r--r-- | kompare/komparepart/kompare_part.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index a00a7cb8..0c565820 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -476,9 +476,9 @@ void KomparePart::saveDiff() delete dlg; } -KAboutData *KomparePart::createAboutData() +TDEAboutData *KomparePart::createAboutData() { - KAboutData *about = new KAboutData("kompare", I18N_NOOP("KomparePart"), "3.2"); + TDEAboutData *about = new TDEAboutData("kompare", I18N_NOOP("KomparePart"), "3.2"); about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org"); about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" ); return about; diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index a3de09f2..c2ed918e 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -87,7 +87,7 @@ public: // Do we really want to expose this ??? const Diff2::KompareModelList* model() const { return m_modelList; }; - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); public: // Reimplemented from the KompareInterface |