summaryrefslogtreecommitdiffstats
path: root/kontact/interfaces
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:47 -0600
commit32b66c9ae78f439199a6d281cc33218e57c5106d (patch)
treee92cf1651596c736188317c75eeb1ce5662d57bd /kontact/interfaces
parentd29a9ff5829fa930c466b98cb93a4cbdd24b1fa2 (diff)
downloadtdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.tar.gz
tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kontact/interfaces')
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 2dfd1dae..38ae51b3 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();
}