From 50d6569cdef5f0aac099f5d01864bd0e14f82ae3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:46 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- ksirc/KSTicker/ksttest.cpp | 2 +- ksirc/ksirc.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ksirc') diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 36ad249a..ab057cdd 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -68,7 +68,7 @@ int main(int argc, char **argv){ "2.0.0", "", KAboutData::License_Artistic, I18N_NOOP("(c) 1997-2002, Andrew Stanley-Jones")); aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication a(argc, argv); diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index 2025abc1..c8b72bcd 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -78,8 +78,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) aboutData.addAuthor("Daniel Molkentin",0, "molkentin@kde.org"); aboutData.addAuthor("Simon Hausmann",0, "hausmann@kde.org"); aboutData.addAuthor("Alyssa Mejawohld", I18N_NOOP("Icons Author"), "amejawohld@bellsouth.net"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) { @@ -108,7 +108,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) if( !opts.geometry.isEmpty() ) sc->setGeometry( opts.geometry ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQCString nickName = args->getOption( "nick" ); TQCString server = args->getOption( "server" ); -- cgit v1.2.1