diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:18:35 -0600 |
| commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
| tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kcoloredit | |
| parent | e5ce3b4175f2e72788b49b9ed46c722784218dad (diff) | |
| download | tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcoloredit')
| -rw-r--r-- | kcoloredit/kcolorchooser.cpp | 4 | ||||
| -rw-r--r-- | kcoloredit/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index cf4289d7..2d260c14 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -44,8 +44,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { KLocale::setMainCatalogue("tdelibs"); - KAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"), - version, description, KAboutData::License_BSD, + TDEAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"), + version, description, TDEAboutData::License_BSD, "(c) 2000, Waldo Bastian"); aboutData.addAuthor("Waldo Bastian",0, "[email protected]"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp index e92bbdca..b9a091f4 100644 --- a/kcoloredit/main.cpp +++ b/kcoloredit/main.cpp @@ -37,8 +37,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2000, Artur Rataj"); aboutData.addAuthor("Artur Rataj",0, "[email protected]"); aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "Rewrote UI code " |