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 --- arts/kde/kiotestslow.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index fd5f1e129..16465cb8d 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -90,8 +90,8 @@ int main(int argc, char **argv) { KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, ""); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); @@ -102,7 +102,7 @@ int main(int argc, char **argv) #endif KIOTestSlow writer; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(args->count()) { -- 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 --- arts/kde/kiotestslow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index 16465cb8d..f35f2a3e2 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -92,7 +92,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); #ifndef USE_FILEINPUTSTREAM -- 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 --- arts/kde/kiotestslow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index f35f2a3e2..e367ea924 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -88,7 +88,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, ""); + TDEAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, ""); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); -- cgit v1.2.1 From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- arts/kde/kiotestslow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index e367ea924..ffb71d8b1 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -96,7 +96,7 @@ int main(int argc, char **argv) QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); #ifndef USE_FILEINPUTSTREAM - KIOInputStream stream; + TDEIOInputStream stream; #else FileInputStream stream; #endif -- 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 --- arts/kde/kiotestslow.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index ffb71d8b1..ffeceafd5 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -78,10 +78,10 @@ public: REGISTER_IMPLEMENTATION(KIOTestSlow_impl); }; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP("URL to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; #undef USE_FILEINPUTSTREAM -- 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 --- arts/kde/kiotestslow.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index ffeceafd5..df6ed645f 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -1,10 +1,10 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include "qiomanager.h" #include "artskde.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 --- arts/kde/kiotestslow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arts/kde/kiotestslow.cc') diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index df6ed645f..93bfac388 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.1