diff options
| author | Timothy Pearson <[email protected]> | 2013-02-06 19:44:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-06 19:44:17 -0600 |
| commit | 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch) | |
| tree | a5eb4cb7c4754e533de65c5adee17d783e426425 /tdeioslave/trash | |
| parent | 98eb308fc180d9bea71f448b262ab796353ac904 (diff) | |
| download | tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip | |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/trash')
| -rw-r--r-- | tdeioslave/trash/ktrash.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/trash/tdeio_trash.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp index b899e7947..9e020e67c 100644 --- a/tdeioslave/trash/ktrash.cpp +++ b/tdeioslave/trash/ktrash.cpp @@ -25,14 +25,14 @@ #include <kdirnotify_stub.h> #include <kdebug.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "empty", I18N_NOOP( "Empty the contents of the trash" ), 0 }, //{ "migrate", I18N_NOOP( "Migrate contents of old trash" ), 0 }, { "restore <file>", I18N_NOOP( "Restore a trashed file to its original location" ), 0 }, // This hack is for the servicemenu on trash.desktop which uses Exec=ktrash -empty. %f is implied... { "+[ignored]", I18N_NOOP( "Ignored" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index 29fbfa778..6840ab10e 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -41,12 +41,12 @@ #include <sys/stat.h> #include <stdlib.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" { |