From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:50 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- src/Mainpage.dox | 4 ++-- src/main.cpp | 4 ++-- src/main_assistant.cpp | 4 ++-- src/profileengine/editor/main.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 78ee051b..12599626 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -42,8 +42,8 @@ Example: int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("My Application"); - KAboutData aboutData("myapp", I18N_NOOP("My Application"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("myapp", I18N_NOOP("My Application"), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2004, MyApp developers"), "", "http://www.myapp.org"); aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org"); diff --git a/src/main.cpp b/src/main.cpp index cba4e334..c25755a9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,8 +30,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment"); - KAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de"); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 8f8214b2..1f3ecf9b 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -30,8 +30,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer"); - KAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de"); diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp index c88caea0..4ffe6f92 100644 --- a/src/profileengine/editor/main.cpp +++ b/src/profileengine/editor/main.cpp @@ -30,8 +30,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", - KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); + TDEAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", + TDEAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); -- cgit v1.2.1