From c705f8f0619865875d6247d9470dced55241bc79 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kcoloredit/kcolorchooser.cpp | 6 +++--- kcoloredit/main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kcoloredit') diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index a2427285..72ec0930 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -48,8 +48,8 @@ int main(int argc, char *argv[]) version, description, KAboutData::License_BSD, "(c) 2000, Waldo Bastian"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) dlg.show(); app.exec(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); const TQColor c = dlg.color(); if ( args->isSet("print") && c.isValid() ) { std::cout << TQString(c.name()).utf8().data() << std::endl; diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp index fcc2ac66..d0d4893e 100644 --- a/kcoloredit/main.cpp +++ b/kcoloredit/main.cpp @@ -43,8 +43,8 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Artur Rataj",0, "art@zeus.polsl.gliwice.pl"); aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "Rewrote UI code " "to be KDE standards compliant" ), "nhasan@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) KColorEditApp *kcoloredit = new KColorEditApp(); kcoloredit->show(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count()) { -- cgit v1.2.3