summaryrefslogtreecommitdiffstats
path: root/kioslave/media
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:43 -0600
commitd41050ea3f6904e5156d35f664346b816b9e4d12 (patch)
tree7b3ff517432a631adc61a2a93080dc3bacfab604 /kioslave/media
parentc16d0f2191af1e4810391dbd1a06d7713fb38666 (diff)
downloadtdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz
tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media')
-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
3 files changed, 8 insertions, 8 deletions
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;