summaryrefslogtreecommitdiffstats
path: root/kontact
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
parentd29a9ff5829fa930c466b98cb93a4cbdd24b1fa2 (diff)
downloadtdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.tar.gz
tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kontact')
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp8
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp2
-rw-r--r--kontact/plugins/korganizer/korg_uniqueapp.cpp2
-rw-r--r--kontact/src/main.cpp6
7 files changed, 12 insertions, 12 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();
}
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 37b85be0..dae73e4b 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -133,7 +133,7 @@ void Plugin::saveProperties( KConfig *config )
void UniqueAppHandler::loadCommandLineOptions()
{
- KCmdLineArgs::addCmdLineOptions( akregator_options );
+ TDECmdLineArgs::addCmdLineOptions( akregator_options );
}
int UniqueAppHandler::newInstance()
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 88a975b7..eec79275 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -193,7 +193,7 @@ void KAddressbookPlugin::saveToProfile( const TQString& directory ) const
void KABUniqueAppHandler::loadCommandLineOptions()
{
- KCmdLineArgs::addCmdLineOptions( kaddressbook_options );
+ TDECmdLineArgs::addCmdLineOptions( kaddressbook_options );
}
int KABUniqueAppHandler::newInstance()
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 266823ff..30026936 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -184,7 +184,7 @@ Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent )
#include "../../../kmail/kmail_options.h"
void KMailUniqueAppHandler::loadCommandLineOptions()
{
- KCmdLineArgs::addCmdLineOptions( kmail_options );
+ TDECmdLineArgs::addCmdLineOptions( kmail_options );
}
int KMailUniqueAppHandler::newInstance()
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 365e30d0..8046288f 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -97,7 +97,7 @@ KParts::ReadOnlyPart* KNodePlugin::createPart()
#include "../../../knode/knode_options.h"
void KNodeUniqueAppHandler::loadCommandLineOptions()
{
- KCmdLineArgs::addCmdLineOptions( knode_options );
+ TDECmdLineArgs::addCmdLineOptions( knode_options );
}
int KNodeUniqueAppHandler::newInstance()
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index 3ece77c4..9a1f3fc4 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -30,7 +30,7 @@
void KOrganizerUniqueAppHandler::loadCommandLineOptions()
{
- KCmdLineArgs::addCmdLineOptions( korganizer_options );
+ TDECmdLineArgs::addCmdLineOptions( korganizer_options );
}
int KOrganizerUniqueAppHandler::newInstance()
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 99fff153..54a58622 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -98,7 +98,7 @@ static void listProfiles()
int KontactApp::newInstance()
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQString moduleName;
if ( Kontact::Prefs::self()->forceStartupPlugin() ) {
moduleName = Kontact::Prefs::self()->forcedStartupPlugin();
@@ -156,10 +156,10 @@ int main( int argc, char **argv )
about.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
about.addAuthor( "Matthias Hoelzer-Kluepfel", I18N_NOOP("Original Author"), "mhk@kde.org" );
- KCmdLineArgs::init( argc, argv, &about );
+ TDECmdLineArgs::init( argc, argv, &about );
Kontact::UniqueAppHandler::loadKontactCommandLineOptions();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->isSet( "list" ) ) {
listPlugins();
return 0;