diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:17:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:17:27 -0600 |
| commit | 78f8b2d68bde64c6e656effef397080ddfa1048d (patch) | |
| tree | 83166b4ada30661b704e9ba65346af0f6608f94d /keduca | |
| parent | f2240fa06f8350fbbd6e6a4f23fe0c164768c6c1 (diff) | |
| download | tdeedu-78f8b2d68bde64c6e656effef397080ddfa1048d.tar.gz tdeedu-78f8b2d68bde64c6e656effef397080ddfa1048d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'keduca')
| -rw-r--r-- | keduca/keduca/keduca_part.cpp | 6 | ||||
| -rw-r--r-- | keduca/keduca/keduca_part.h | 4 | ||||
| -rw-r--r-- | keduca/keduca/main.cpp | 4 | ||||
| -rw-r--r-- | keduca/keducabuilder/main.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index bc9e5485..1d3631cc 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -54,11 +54,11 @@ KEducaPart::~KEducaPart() { } -KAboutData* KEducaPart::createAboutData() +TDEAboutData* KEducaPart::createAboutData() { - KAboutData *data = new KAboutData( "keduca", I18N_NOOP( "KEducaPart" ), + TDEAboutData *data = new TDEAboutData( "keduca", I18N_NOOP( "KEducaPart" ), "0.2", I18N_NOOP( "KEduca KParts Component" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2004, Henrique Pinto <henrique.pinto@kdemail.net>" ); return data; diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index ea56c38e..b11a7f1c 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -27,7 +27,7 @@ #include <kparts/part.h> class KEducaView; -class KAboutData; +class TDEAboutData; /** * KPart component for KEduca @@ -52,7 +52,7 @@ class KEducaPart : public KParts::ReadOnlyPart /* * Returns information about this part. */ - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); protected: /* diff --git a/keduca/keduca/main.cpp b/keduca/keduca/main.cpp index 63ec70b9..717529d0 100644 --- a/keduca/keduca/main.cpp +++ b/keduca/keduca/main.cpp @@ -33,8 +33,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "keduca", I18N_NOOP("KEduca"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( "keduca", I18N_NOOP("KEduca"), + version, description, TDEAboutData::License_GPL, "(c) 2001, Javier Campos", 0, "http://keduca.sourceforge.net", "submit@bugs.kde.org"); aboutData.addAuthor("Javier Campos",I18N_NOOP( "Original Author" ), "javi@asyris.org"); aboutData.addAuthor("Klas Kalass",I18N_NOOP( "Maintainer 2002-2004" ), "klas@kde.org"); diff --git a/keduca/keducabuilder/main.cpp b/keduca/keducabuilder/main.cpp index eef58a77..21f459f1 100644 --- a/keduca/keducabuilder/main.cpp +++ b/keduca/keducabuilder/main.cpp @@ -34,8 +34,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"), + version, description, TDEAboutData::License_GPL, "(c) 2001, Javier Campos", 0, "http://keduca.sourceforge.net", "submit@bugs.kde.org"); aboutData.addAuthor("Javier Campos",I18N_NOOP("Original Author"), "javi@asyris.org"); aboutData.addAuthor("Klas Kalass",I18N_NOOP("Maintainer 2002-2004"), "klas@kde.org"); |