Rename KCmd to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 34ec7cf1e7
commit fe0432259a

@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// ark includes // ark includes
#include "arkapp.h" #include "arkapp.h"
static KCmdLineOptions option[] = static TDECmdLineOptions option[] =
{ {
{ "extract", I18N_NOOP( "Open extract dialog, quit when finished" ), 0 }, { "extract", I18N_NOOP( "Open extract dialog, quit when finished" ), 0 },
{ "extract-to", I18N_NOOP( "Extract 'archive' to 'folder'. Quit when finished.\n" { "extract-to", I18N_NOOP( "Extract 'archive' to 'folder'. Quit when finished.\n"
@ -59,7 +59,7 @@ static KCmdLineOptions option[] =
{ "+[folder]", I18N_NOOP( "Folder to extract to" ), 0 }, { "+[folder]", I18N_NOOP( "Folder to extract to" ), 0 },
{ "+[files]", I18N_NOOP( "Files to be added" ), 0 }, { "+[files]", I18N_NOOP( "Files to be added" ), 0 },
{ "+[archive]", I18N_NOOP( "Open 'archive'" ), 0 }, { "+[archive]", I18N_NOOP( "Open 'archive'" ), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] )

@ -33,7 +33,7 @@
#include "sshdlg.h" #include "sshdlg.h"
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
{ "+host", I18N_NOOP("Specifies the remote host"), 0 }, { "+host", I18N_NOOP("Specifies the remote host"), 0 },
{ "+command", I18N_NOOP("The command to run"), 0 }, { "+command", I18N_NOOP("The command to run"), 0 },
@ -42,7 +42,7 @@ static KCmdLineOptions options[] =
{ "n", I18N_NOOP("Do not keep password"), 0 }, { "n", I18N_NOOP("Do not keep password"), 0 },
{ "q", I18N_NOOP("Stop the daemon (forgets all passwords)"), 0 }, { "q", I18N_NOOP("Stop the daemon (forgets all passwords)"), 0 },
{ "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 }, { "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };

@ -49,9 +49,9 @@ static const char description[] =
static const char version[] = "0.2"; static const char version[] = "0.2";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
KCmdLineLastOption TDECmdLineLastOption
}; };
/*****************************************************************************/ /*****************************************************************************/

@ -1252,11 +1252,11 @@ void TopLevel::toggle_overwrite(){
static const char description[] = I18N_NOOP("TDE text editor"); static const char description[] = I18N_NOOP("TDE text editor");
static const KCmdLineOptions options[] = static const TDECmdLineOptions options[] =
{ {
{ "encoding <encoding>", I18N_NOOP("Encoding to use for the following documents"), 0 }, { "encoding <encoding>", I18N_NOOP("Encoding to use for the following documents"), 0 },
{ "+file", I18N_NOOP("File or URL to open"), 0 }, { "+file", I18N_NOOP("File or URL to open"), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
extern "C" KDE_EXPORT int kdemain (int argc, char **argv) extern "C" KDE_EXPORT int kdemain (int argc, char **argv)

@ -33,10 +33,10 @@
static const char description[] = static const char description[] =
I18N_NOOP("TDE Floppy Disk Utility"); I18N_NOOP("TDE Floppy Disk Utility");
static const KCmdLineOptions options[] = static const TDECmdLineOptions options[] =
{ {
{ "+[device]", I18N_NOOP("Default device"), 0 }, { "+[device]", I18N_NOOP("Default device"), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )

@ -31,7 +31,7 @@ static const char description[] =
static const char version[] = "1.2.2"; static const char version[] = "1.2.2";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
{ "e", I18N_NOOP("Encrypt file"), 0 }, { "e", I18N_NOOP("Encrypt file"), 0 },
{ "k", I18N_NOOP("Open key manager"), 0 }, { "k", I18N_NOOP("Open key manager"), 0 },
@ -40,7 +40,7 @@ static KCmdLineOptions options[] =
{ "V", I18N_NOOP("Verify signature"), 0 }, { "V", I18N_NOOP("Verify signature"), 0 },
{ "X", I18N_NOOP("Shred file"), 0 }, { "X", I18N_NOOP("Shred file"), 0 },
{ "+[File]", I18N_NOOP("File to open"), 0 }, { "+[File]", I18N_NOOP("File to open"), 0 },
KCmdLineLastOption TDECmdLineLastOption
// INSERT YOUR COMMANDLINE OPTIONS HERE // INSERT YOUR COMMANDLINE OPTIONS HERE
}; };

@ -35,11 +35,11 @@ static const char description[] =
static const char version[] = APP_VERSION_STRING; static const char version[] = APP_VERSION_STRING;
static KCmdLineOptions option[] = static TDECmdLineOptions option[] =
{ {
{ "offset <offset>", I18N_NOOP("Jump to 'offset'"), 0 }, { "offset <offset>", I18N_NOOP("Jump to 'offset'"), 0 },
{ "+[file(s)]", I18N_NOOP("File(s) to open"), 0 }, { "+[file(s)]", I18N_NOOP("File(s) to open"), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
static uint parseDecimalOrHexadecimal( char *buf ); static uint parseDecimalOrHexadecimal( char *buf );

@ -44,7 +44,7 @@ static const char *description =
static const char *version = "0.42"; static const char *version = "0.42";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
// { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, // { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
// { "!nosystray", I18N_NOOP("Disable systray icon"), 0 }, // { "!nosystray", I18N_NOOP("Disable systray icon"), 0 },

@ -39,7 +39,7 @@ static const char *description =
static const char *version = "0.17"; static const char *version = "0.17";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
// { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, // { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
{ "+file", I18N_NOOP("A required argument 'file'"), 0 }, { "+file", I18N_NOOP("A required argument 'file'"), 0 },

@ -41,11 +41,11 @@ class MyApp : public KUniqueApplication {
}; };
int main(int argc, char **argv) { int main(int argc, char **argv) {
static KCmdLineOptions options[] = { static TDECmdLineOptions options[] = {
{"show", I18N_NOOP("Show window on startup"), 0}, {"show", I18N_NOOP("Show window on startup"), 0},
{"tdewalletd", I18N_NOOP("For use by tdewalletd only"), 0}, {"tdewalletd", I18N_NOOP("For use by tdewalletd only"), 0},
{"+name", I18N_NOOP("A wallet name"), 0}, {"+name", I18N_NOOP("A wallet name"), 0},
KCmdLineLastOption TDECmdLineLastOption
}; };
TDEAboutData about("tdewalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1", TDEAboutData about("tdewalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",

Loading…
Cancel
Save