summaryrefslogtreecommitdiffstats
path: root/kmail
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 /kmail
parentd29a9ff5829fa930c466b98cb93a4cbdd24b1fa2 (diff)
downloadtdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.tar.gz
tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kmail')
-rw-r--r--kmail/dcoptest.cpp2
-rw-r--r--kmail/kmkernel.cpp2
-rw-r--r--kmail/main.cpp4
-rw-r--r--kmail/recipientseditortest.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index 9887dc98..0e5b14d8 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -17,7 +17,7 @@ int main(int argc,char **argv)
KAboutData aboutData( "testKMailDCOP",
"Test for KMail DCOP interface", "0.0" );
- KCmdLineArgs::init(argc, argv, &aboutData);
+ TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication app;
app.dcopClient()->attach();
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 2e204ab5..2bcf6c2a 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -206,7 +206,7 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
bool calledWithSession = false; // for ignoring '-session foo'
// process args:
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (!args->getOption("subject").isNull())
{
subj = TQString::fromLocal8Bit(args->getOption("subject"));
diff --git a/kmail/main.cpp b/kmail/main.cpp
index ae2d5a06..e76b303f 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -73,8 +73,8 @@ int main(int argc, char *argv[])
KMail::AboutData about;
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( kmail_options ); // Add kmail options
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( kmail_options ); // Add kmail options
if (!KMailApplication::start())
return 0;
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 5d8b02ee..e347fe5c 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -92,7 +92,7 @@ int main( int argc, char **argv )
{
KAboutData aboutData( "testrecipienteditor",
"Test Recipient Editor", "0.1" );
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;