From 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kabc/kab2kabc.cpp | 6 +++--- kabc/tests/bigread.cpp | 2 +- kabc/tests/bigwrite.cpp | 2 +- kabc/tests/kabcargl.cpp | 2 +- kabc/tests/testaddressee.cpp | 6 +++--- kabc/tests/testaddresseelist.cpp | 6 +++--- kabc/tests/testaddressfmt.cpp | 4 ++-- kabc/tests/testaddresslineedit.cpp | 2 +- kabc/tests/testdb.cpp | 2 +- kabc/tests/testdistlist.cpp | 6 +++--- kabc/tests/testkabc.cpp | 2 +- kabc/tests/testkabcdlg.cpp | 6 +++--- kabc/tests/testldapclient.cpp | 2 +- kabc/tests/testlock.cpp | 6 +++--- kabc/vcard/testwrite.cpp | 2 +- kabc/vcardparser/testread.cpp | 6 +++--- kabc/vcardparser/testwrite.cpp | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kabc') diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 9d8ea75ee..20d7305b8 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -435,12 +435,12 @@ int main( int argc, char **argv ) KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool override = false; diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp index e64bafef8..110972b31 100644 --- a/kabc/tests/bigread.cpp +++ b/kabc/tests/bigread.cpp @@ -18,7 +18,7 @@ using namespace KABC; int main(int argc,char **argv) { KAboutData aboutData("bigread","BigReadKabc","0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); KApplication app( false, false ); diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp index 0dd6a7a05..6a5296f91 100644 --- a/kabc/tests/bigwrite.cpp +++ b/kabc/tests/bigwrite.cpp @@ -15,7 +15,7 @@ using namespace KABC; int main(int argc,char **argv) { KAboutData aboutData("bigwrite","BigWriteKabc","0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); KApplication app( false, false ); diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp index b57724c15..d0a0501b3 100644 --- a/kabc/tests/kabcargl.cpp +++ b/kabc/tests/kabcargl.cpp @@ -38,7 +38,7 @@ int main(int argc,char **argv) KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1"); aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); KApplication app; diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index d05c3af24..cc91d29b1 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -23,11 +23,11 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KAboutData aboutData("testaddressee","TestAddressee","0.1"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); kdDebug() << "Creating a" << endl; Addressee a; diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp index e7cc123f1..99cd1f3ab 100644 --- a/kabc/tests/testaddresseelist.cpp +++ b/kabc/tests/testaddresseelist.cpp @@ -20,11 +20,11 @@ static const KCmdLineOptions options[] = int main(int /*argc*/,char /* **argv*/) { /* KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); */ + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */ kdDebug() << "Creating addressees" << endl; Addressee a, b, c, d, e, f; diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp index 19b2e8306..9f70a0eec 100644 --- a/kabc/tests/testaddressfmt.cpp +++ b/kabc/tests/testaddressfmt.cpp @@ -20,8 +20,8 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp index 0dea6f742..f74af6089 100644 --- a/kabc/tests/testaddresslineedit.cpp +++ b/kabc/tests/testaddresslineedit.cpp @@ -12,7 +12,7 @@ int main( int argc,char **argv ) { KAboutData aboutData( "testaddresslineedit", I18N_NOOP( "Test Address LineEdit" ), "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp index f94397a62..1c5454630 100644 --- a/kabc/tests/testdb.cpp +++ b/kabc/tests/testdb.cpp @@ -13,7 +13,7 @@ using namespace KABC; int main(int argc,char **argv) { KAboutData aboutData("testdb","TestKabcDB","0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); // KApplication app( false, false ); KApplication app; diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp index abf551ace..4323db30d 100644 --- a/kabc/tests/testdistlist.cpp +++ b/kabc/tests/testdistlist.cpp @@ -23,12 +23,12 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("list")) { TQString name = args->getOption("list"); diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp index c5d2d12e4..04a589eef 100644 --- a/kabc/tests/testkabc.cpp +++ b/kabc/tests/testkabc.cpp @@ -21,7 +21,7 @@ using namespace KABC; int main(int argc,char **argv) { KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication app( false, false ); AddressBook *ab = StdAddressBook::self(); diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp index 3c9a23792..322bb1ca9 100644 --- a/kabc/tests/testkabcdlg.cpp +++ b/kabc/tests/testkabcdlg.cpp @@ -19,12 +19,12 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("multiple")) { Addressee::List al = AddresseeDialog::getAddressees( 0 ); Addressee::List::ConstIterator it; diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp index 2fa6a1c72..456bb64e3 100644 --- a/kabc/tests/testldapclient.cpp +++ b/kabc/tests/testldapclient.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0); KApplication app; TestLDAPClient test; diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp index 4674606e0..5c52e98ee 100644 --- a/kabc/tests/testlock.cpp +++ b/kabc/tests/testlock.cpp @@ -166,14 +166,14 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; TQString identifier; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() == 1 ) { identifier = args->arg( 0 ); } else if ( args->count() != 0 ) { diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp index f9b8944d7..082ca480d 100644 --- a/kabc/vcard/testwrite.cpp +++ b/kabc/vcard/testwrite.cpp @@ -9,7 +9,7 @@ int main(int argc,char **argv) { KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); KApplication app; diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp index 7dd8692fc..d3eada6c6 100644 --- a/kabc/vcardparser/testread.cpp +++ b/kabc/vcardparser/testread.cpp @@ -47,12 +47,12 @@ int main( int argc, char **argv ) KAboutData aboutData( "testread", "vCard test reader", "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) { std::cerr << "Missing argument" << std::endl; diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp index f6e894f4b..d9d92e5aa 100644 --- a/kabc/vcardparser/testwrite.cpp +++ b/kabc/vcardparser/testwrite.cpp @@ -37,7 +37,7 @@ int main( int argc, char **argv ) { KAboutData aboutData( "testwrite", "vCard test writer", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app( false, false ); -- cgit v1.2.1