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 /umbrello/umbrello | |
| parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
| download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'umbrello/umbrello')
| -rw-r--r-- | umbrello/umbrello/docgenerators/main.cpp | 4 | ||||
| -rw-r--r-- | umbrello/umbrello/main.cpp | 4 | ||||
| -rw-r--r-- | umbrello/umbrello/plugin.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp index 9813cb40..08d8c317 100644 --- a/umbrello/umbrello/docgenerators/main.cpp +++ b/umbrello/umbrello/docgenerators/main.cpp @@ -59,8 +59,8 @@ int main(int argc, char *argv[]) int nbparams = 0; params[nbparams] = NULL; - KAboutData aboutData( "umbodoc", I18N_NOOP("Umbrello UML Modeller autonomous code generator"), - UMBRELLO_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "umbodoc", I18N_NOOP("Umbrello UML Modeller autonomous code generator"), + UMBRELLO_VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller Authors"), 0, "http://uml.sf.net/"); aboutData.addAuthor("Gael de Chalendar (aka Kleag)",0, "kleag@free.fr"); diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index 891fabee..24928759 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -90,8 +90,8 @@ extern "C" int flushEvents() { } int main(int argc, char *argv[]) { - KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"), - UMBRELLO_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"), + UMBRELLO_VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0, "http://uml.sf.net/"); aboutData.addAuthor("Paul Hensgen",0, "phensgen@users.sourceforge.net"); diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h index ce5beff0..da8e92df 100644 --- a/umbrello/umbrello/plugin.h +++ b/umbrello/umbrello/plugin.h @@ -76,8 +76,8 @@ class PluginLoader; * must not load GUI plugins. * * In order to provide application-like functionality, this class offers - * support for accessing the configuration records of the KInstance object - * corresponding to the shared library. Because the KInstance object is + * support for accessing the configuration records of the TDEInstance object + * corresponding to the shared library. Because the TDEInstance object is * only available within the scope of the shared library, the configuration * records must be set in the constructor of the derived plugin class. However, * because the construction name is passed to this constructor (as are the |