summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:44:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:44:17 -0600
commit5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch)
treea5eb4cb7c4754e533de65c5adee17d783e426425 /tdeioslave/media
parent98eb308fc180d9bea71f448b262ab796353ac904 (diff)
downloadtdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz
tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/media')
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp4
-rw-r--r--tdeioslave/media/tdeio_media.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 2e4761f82..4427f919f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -249,7 +249,7 @@ void MountHelper::slotCancel()
exit(0);
}
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "d", I18N_NOOP("Decrypt given URL"), 0 },
{ "u", I18N_NOOP("Unmount given URL"), 0 },
@@ -257,7 +257,7 @@ static KCmdLineOptions options[] =
{ "e", I18N_NOOP("Eject given URL via kdeeject"), 0},
{ "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},
{"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index c8af18133..51467420f 100644
--- a/tdeioslave/media/tdeio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -31,12 +31,12 @@
#include "tdeio_media.h"
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{ "+protocol", I18N_NOOP( "Protocol name" ), 0 },
{ "+pool", I18N_NOOP( "Socket name" ), 0 },
{ "+app", I18N_NOOP( "Socket name" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
extern "C" {