From 479647c43c62fc50302342c8ac50a2fe024b4426 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:47 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- cervisia/cvsservice/cvsaskpass.cpp | 8 ++++---- cervisia/cvsservice/main.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cervisia/cvsservice') diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index 13660c7e..eb581f34 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -42,8 +42,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv) KAboutData::License_LGPL, I18N_NOOP("Copyright (c) 2003 Christian Loose")); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); // no need to register with the dcop server KApplication::disableAutoDcopRegistration(); @@ -52,11 +52,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv) // no need for session management app.disableSessionManagement(); - if( !KCmdLineArgs::parsedArgs()->count() ) + if( !TDECmdLineArgs::parsedArgs()->count() ) return 1; // parse repository name from the passed argument - TQString prompt = KCmdLineArgs::parsedArgs()->arg(0); + TQString prompt = TDECmdLineArgs::parsedArgs()->arg(0); TQRegExp rx("(.*@.*)'s password:"); int pos = rx.search(prompt); diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index d8975783..3264487c 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -33,7 +33,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv) about.addAuthor("Christian Loose", I18N_NOOP("Developer"), "christian.loose@hamburg.de"); - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); KApplication app; -- cgit v1.2.1