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/tests/testaddressee.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kabc/tests/testaddressee.cpp') 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; -- cgit v1.2.1 From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kabc/tests/testaddressee.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kabc/tests/testaddressee.cpp') diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index cc91d29b1..39536efbf 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -26,7 +26,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); kdDebug() << "Creating a" << endl; -- cgit v1.2.1 From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kabc/tests/testaddressee.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kabc/tests/testaddressee.cpp') diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index 39536efbf..9b4993dcc 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -22,7 +22,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("testaddressee","TestAddressee","0.1"); + TDEAboutData aboutData("testaddressee","TestAddressee","0.1"); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); -- cgit v1.2.1 From 5466d52073af147d100482cbf633087bb9fb631b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:46:01 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- kabc/tests/testaddressee.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kabc/tests/testaddressee.cpp') diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index 9b4993dcc..956af2b75 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -13,11 +13,11 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "save", "", 0 }, { "number", "", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc,char **argv) -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- kabc/tests/testaddressee.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kabc/tests/testaddressee.cpp') diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index 956af2b75..09f95d29b 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include #include #include -#include +#include #include #include "addressbook.h" -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kabc/tests/testaddressee.cpp | 57 -------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 kabc/tests/testaddressee.cpp (limited to 'kabc/tests/testaddressee.cpp') diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp deleted file mode 100644 index 09f95d29b..000000000 --- a/kabc/tests/testaddressee.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include "addressbook.h" -#include "plugins/file/resourcefile.h" -#include "formats/binaryformat.h" -#include "vcardformat.h" -#include "phonenumber.h" - -using namespace KABC; - -static const TDECmdLineOptions options[] = -{ - { "save", "", 0 }, - { "number", "", 0 }, - TDECmdLineLastOption -}; - -int main(int argc,char **argv) -{ - TDEAboutData aboutData("testaddressee","TestAddressee","0.1"); - TDECmdLineArgs::init(argc, argv, &aboutData); - TDECmdLineArgs::addCmdLineOptions(options); - - TDEApplication app; - TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); - - kdDebug() << "Creating a" << endl; - Addressee a; - - kdDebug() << "tick1" << endl; - a.setGivenName("Hans"); - kdDebug() << "tick2" << endl; - a.setPrefix("Dr."); - - kdDebug() << "Creating b" << endl; - Addressee b( a ); - - kdDebug() << "tack1" << endl; - a.setFamilyName("Wurst"); - kdDebug() << "tack2" << endl; - a.setNickName("hansi"); - - kdDebug() << "Creating c" << endl; - Addressee c = a; - - kdDebug() << "tock1" << endl; - c.setGivenName("Eberhard"); - - a.dump(); - b.dump(); - c.dump(); -} -- cgit v1.2.1