Rename KCmd to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent fbf63c1345
commit b542273c9f

@ -985,13 +985,13 @@ void KPilotInstaller::componentUpdate()
//
//
//
static KCmdLineOptions kpilotoptions[] = {
static TDECmdLineOptions kpilotoptions[] = {
{"s", 0, 0},
{"setup",
I18N_NOOP("Setup the Pilot device, conduits and other parameters"),
0L},
{"debug <level>", I18N_NOOP("Set debugging level"), "0"},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -60,7 +60,7 @@
#include "hotSync.h"
static KCmdLineOptions generalOptions[] = {
static TDECmdLineOptions generalOptions[] = {
{"p",0,0},
{"port <device>",
I18N_NOOP("Path to Pilot device node"),
@ -85,10 +85,10 @@ static KCmdLineOptions generalOptions[] = {
{ "debug <level>",
I18N_NOOP("Set the debug level"), "1" },
#endif
KCmdLineLastOption
TDECmdLineLastOption
} ;
static KCmdLineOptions conduitOptions[] = {
static TDECmdLineOptions conduitOptions[] = {
{ "T",0,0},
{ "notest",
I18N_NOOP("*Really* run the conduit, not in test mode."),
@ -106,7 +106,7 @@ static KCmdLineOptions conduitOptions[] = {
{ "loop",
I18N_NOOP("Repeated perform action - only useful for --list"),
0 } ,
KCmdLineLastOption
TDECmdLineLastOption
} ;
/**

@ -1291,13 +1291,13 @@ void PilotDaemon::updateTrayStatus(const TQString &s)
emitDCOPSignal( "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", data );
}
static KCmdLineOptions daemonoptions[] = {
static TDECmdLineOptions daemonoptions[] = {
#ifdef DEBUG
{"debug <level>", I18N_NOOP("Set debugging level"), "0"},
#endif
{ "device <device>", I18N_NOOP("Device to try first"), ""},
{"fail-silently", I18N_NOOP("Exit instead of complaining about bad configuration files"), 0},
KCmdLineLastOption
TDECmdLineLastOption
} ;

@ -44,12 +44,12 @@
#include "../conduits/vcalconduit/kcalRecord.cc"
#include "../conduits/vcalconduit/vcalRecord.cc"
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
{"data-dir <path>","Set data directory", "."},
{"vcal-file <path>","Set vcal file", 0},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -43,12 +43,12 @@
#include "../conduits/abbrowserconduit/kabcRecord.h"
#include "../conduits/abbrowserconduit/kabcRecord.cc"
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
{"data-dir <path>","Set data directory", "."},
{"address-file <path>","Set addressbook file", 0},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -43,12 +43,12 @@
#include "../conduits/vcalconduit/kcalRecord.cc"
#include "../conduits/vcalconduit/vcalRecord.cc"
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
{"data-dir <path>","Set data directory", "."},
{"vcal-file <path>","Set vcal file", 0},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -37,13 +37,13 @@
#include "options.h"
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"korgfile <path>","KOrganizer master file", 0},
{"newfile <path>","Calendar file to merge into korganizer", 0},
{"category <string>","Category to remove from 'korgfile' and to add to events in 'newfile' for synch purposes", 0},
{"verbose", "Verbose debugging", 0},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -38,11 +38,11 @@
#include "pilotAddress.h"
#include "pilotLocalDatabase.h"
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
{"data-dir <path>","Set data directory", "."},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -144,11 +144,11 @@ void categoryNames( const TQString &dir )
DEBUGKPILOT << "# Final categories\n# " << categories( appinfo ).join("\n# ") << endl;
}
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
{"data-dir <path>","Set data directory", "."},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -244,10 +244,10 @@ int checkMemo()
return OK;
}
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
KCmdLineLastOption
TDECmdLineLastOption
};

@ -38,11 +38,11 @@
#include "pilotDateEntry.h"
#include "pilotLocalDatabase.h"
static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"verbose", "Verbose output", 0},
{"data-dir <path>","Set data directory", "."},
KCmdLineLastOption
TDECmdLineLastOption
};

Loading…
Cancel
Save