From 32b66c9ae78f439199a6d281cc33218e57c5106d 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 --- kontact/interfaces/uniqueapphandler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kontact/interfaces/uniqueapphandler.cpp') diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 2dfd1daef..38ae51b3b 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -96,12 +96,12 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data, if ( fun == "newInstance()" ) { replyType = "int"; - KCmdLineArgs::reset(); // forget options defined by other "applications" + TDECmdLineArgs::reset(); // forget options defined by other "applications" loadCommandLineOptions(); // implemented by plugin // This bit is duplicated from KUniqueApplication::processDelayed() TQDataStream ds( data, IO_ReadOnly ); - KCmdLineArgs::loadAppArgs( ds ); + TDECmdLineArgs::loadAppArgs( ds ); if ( !ds.atEnd() ) { // backwards compatibility TQCString asn_id; ds >> asn_id; @@ -114,7 +114,7 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data, // OK, we're done, reload the initial kontact command line options, // so that "kontact --module foo" keeps working (#103775). - KCmdLineArgs::reset(); // forget options defined above + TDECmdLineArgs::reset(); // forget options defined above loadKontactCommandLineOptions(); } else if ( fun == "load()" ) { @@ -195,7 +195,7 @@ static KCmdLineOptions options[] = void Kontact::UniqueAppHandler::loadKontactCommandLineOptions() { - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); KApplication::addCmdLineOptions(); } -- cgit v1.2.1