summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-19 18:46:43 -0600
committerTimothy Pearson <[email protected]>2013-01-19 18:46:43 -0600
commitd41050ea3f6904e5156d35f664346b816b9e4d12 (patch)
tree7b3ff517432a631adc61a2a93080dc3bacfab604 /kioslave
parentc16d0f2191af1e4810391dbd1a06d7713fb38666 (diff)
downloadtdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz
tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/home/kio_home.cpp6
-rw-r--r--kioslave/home/testhome.cpp2
-rw-r--r--kioslave/media/kio_media.cpp6
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.cpp8
-rw-r--r--kioslave/media/testmedia.cpp2
-rw-r--r--kioslave/remote/kio_remote.cpp6
-rw-r--r--kioslave/remote/testremote.cpp2
-rw-r--r--kioslave/system/kio_system.cpp6
-rw-r--r--kioslave/system/testsystem.cpp2
-rw-r--r--kioslave/trash/kio_trash.cpp6
-rw-r--r--kioslave/trash/ktrash.cpp6
-rw-r--r--kioslave/trash/testtrash.cpp2
12 files changed, 27 insertions, 27 deletions
diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp
index c8a77acc5..eb9acd15a 100644
--- a/kioslave/home/kio_home.cpp
+++ b/kioslave/home/kio_home.cpp
@@ -42,13 +42,13 @@ extern "C" {
{
// KApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
- KCmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
HomeProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop();
return 0;
diff --git a/kioslave/home/testhome.cpp b/kioslave/home/testhome.cpp
index 61e7d9fa6..e35b443c7 100644
--- a/kioslave/home/testhome.cpp
+++ b/kioslave/home/testhome.cpp
@@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0);
KApplication app;
TestHome test;
diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp
index 7f42ff637..dc9542cd1 100644
--- a/kioslave/media/kio_media.cpp
+++ b/kioslave/media/kio_media.cpp
@@ -44,13 +44,13 @@ extern "C" {
{
// KApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
- KCmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
MediaProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop();
return 0;
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index f184a9ad5..6289a85fc 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -63,7 +63,7 @@ const Medium MountHelper::findMedium(const KURL &url)
MountHelper::MountHelper() : KApplication()
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
m_errorStr = TQString::null;
@@ -263,15 +263,15 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KCmdLineArgs::init(argc, argv, "kio_media_mounthelper",
+ TDECmdLineArgs::init(argc, argv, "kio_media_mounthelper",
"kio_media_mounthelper", "kio_media_mounthelper",
"0.1");
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("kio_media");
KApplication::addCmdLineOptions();
- if (KCmdLineArgs::parsedArgs()->count()==0) KCmdLineArgs::usage();
+ if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
KApplication *app = new MountHelper();
KStartupInfo::appStarted();
diff --git a/kioslave/media/testmedia.cpp b/kioslave/media/testmedia.cpp
index 89ced4ba1..9bc8ac071 100644
--- a/kioslave/media/testmedia.cpp
+++ b/kioslave/media/testmedia.cpp
@@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0);
KApplication app;
TestMedia test;
diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp
index 646a99d30..985593bb0 100644
--- a/kioslave/remote/kio_remote.cpp
+++ b/kioslave/remote/kio_remote.cpp
@@ -42,13 +42,13 @@ extern "C" {
{
// KApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
- KCmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
RemoteProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop();
return 0;
diff --git a/kioslave/remote/testremote.cpp b/kioslave/remote/testremote.cpp
index 3c76b6f22..f493da2f4 100644
--- a/kioslave/remote/testremote.cpp
+++ b/kioslave/remote/testremote.cpp
@@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0);
KApplication app;
TestRemote test;
diff --git a/kioslave/system/kio_system.cpp b/kioslave/system/kio_system.cpp
index 1f86a90d1..c9815ff7b 100644
--- a/kioslave/system/kio_system.cpp
+++ b/kioslave/system/kio_system.cpp
@@ -43,13 +43,13 @@ extern "C" {
{
// KApplication is necessary to use other ioslaves
putenv(strdup("SESSION_MANAGER="));
- KCmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
// We want to be anonymous even if we use DCOP
app.dcopClient()->attach();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
SystemProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop();
return 0;
diff --git a/kioslave/system/testsystem.cpp b/kioslave/system/testsystem.cpp
index d9ad43e50..c3cc84c6e 100644
--- a/kioslave/system/testsystem.cpp
+++ b/kioslave/system/testsystem.cpp
@@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b)
int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0);
KApplication app;
TestSystem test;
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index 344f31f74..e8bd00792 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -56,11 +56,11 @@ extern "C" {
// KApplication is necessary to use kio_file
putenv(strdup("SESSION_MANAGER="));
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TrashProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop();
return 0;
diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp
index b84f69355..41980b060 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/kioslave/trash/ktrash.cpp
@@ -38,15 +38,15 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init( argc, argv, "ktrash",
+ TDECmdLineArgs::init( argc, argv, "ktrash",
I18N_NOOP( "ktrash" ),
I18N_NOOP( "Helper program to handle the TDE trash can\n"
"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ),
TDE_VERSION_STRING );
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app;
- KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if ( args->isSet( "empty" ) ) {
// We use a kio job instead of linking to TrashImpl, for a smaller binary
// (and the possibility of a central service at some point)
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index c5c25d872..4819d8d55 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
setenv( "TDE_FORK_SLAVES", "yes", true );
KApplication::disableAutoDcopRegistration();
- KCmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0);
+ TDECmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0);
KApplication app;
TestTrash test;