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 --- kmail/dcoptest.cpp | 2 +- kmail/kmkernel.cpp | 2 +- kmail/main.cpp | 4 ++-- kmail/recipientseditortest.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kmail') 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; -- cgit v1.2.3