TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent bc1c842c61
commit a200f22dde
15 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
conduits/docconduit/kpalmdoc.cpp
Unescape View File

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"), about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"),
"groot@kde.org", "http://www.kpilot.org/"); "groot@kde.org", "http://www.kpilot.org/");
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KApplication::addCmdLineOptions(); KApplication::addCmdLineOptions();
KApplication app; KApplication app;

6
kpilot/kpilot.cc
Unescape View File

@ -1047,10 +1047,10 @@ int main(int argc, char **argv)
about.addCredit("Bertjan Broeksema", about.addCredit("Bertjan Broeksema",
I18N_NOOP("VCalconduit state machine, CMake")); I18N_NOOP("VCalconduit state machine, CMake"));
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(kpilotoptions, "kpilot"); TDECmdLineArgs::addCmdLineOptions(kpilotoptions, "kpilot");
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();
KCmdLineArgs *p = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs();
#ifdef DEBUG #ifdef DEBUG
KPilotConfig::getDebugLevel(p); KPilotConfig::getDebugLevel(p);

2
kpilot/kpilotConfig.cc
Unescape View File

@ -93,7 +93,7 @@
return defaultDBPath; return defaultDBPath;
} }
/* static */ int KPilotConfig::getDebugLevel(KCmdLineArgs *p) /* static */ int KPilotConfig::getDebugLevel(TDECmdLineArgs *p)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;

4
kpilot/kpilotConfig.h
Unescape View File

@ -33,7 +33,7 @@
#include "kpilotSettings.h" #include "kpilotSettings.h"
class KCmdLineArgs; class TDECmdLineArgs;
class KPilotConfig class KPilotConfig
@ -110,7 +110,7 @@ public:
* Deal with --debug options. * Deal with --debug options.
* @ret resulting debug level * @ret resulting debug level
*/ */
static int getDebugLevel(KCmdLineArgs *p); static int getDebugLevel(TDECmdLineArgs *p);
/** /**
* Returns the user's preference for the system-wide * Returns the user's preference for the system-wide

28
kpilot/main-test.cc
Unescape View File

@ -156,7 +156,7 @@ void connectStack( KPilotLink *l, ActionQueue *a, bool loop = false )
int exec(const TQString &device, const TQString &what, KCmdLineArgs *p) int exec(const TQString &device, const TQString &what, TDECmdLineArgs *p)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -181,7 +181,7 @@ int exec(const TQString &device, const TQString &what, KCmdLineArgs *p)
return kapp->exec(); return kapp->exec();
} }
int backup(const TQString &device, const TQString &what, KCmdLineArgs *p) int backup(const TQString &device, const TQString &what, TDECmdLineArgs *p)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KPilotLink *link = createLink( p->isSet("local") ); KPilotLink *link = createLink( p->isSet("local") );
@ -196,7 +196,7 @@ int backup(const TQString &device, const TQString &what, KCmdLineArgs *p)
return kapp->exec(); return kapp->exec();
} }
int restore(const TQString &device, const TQString &what, KCmdLineArgs *p) int restore(const TQString &device, const TQString &what, TDECmdLineArgs *p)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KPilotLink *link = createLink( p->isSet("local") ); KPilotLink *link = createLink( p->isSet("local") );
@ -211,7 +211,7 @@ int restore(const TQString &device, const TQString &what, KCmdLineArgs *p)
return kapp->exec(); return kapp->exec();
} }
int listDB(const TQString &device, KCmdLineArgs *p) int listDB(const TQString &device, TDECmdLineArgs *p)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KPilotLink *link = createLink( p->isSet("local") ); KPilotLink *link = createLink( p->isSet("local") );
@ -224,7 +224,7 @@ int listDB(const TQString &device, KCmdLineArgs *p)
return kapp->exec(); return kapp->exec();
} }
int check( const TQString &device, const TQString &what, KCmdLineArgs *p ) int check( const TQString &device, const TQString &what, TDECmdLineArgs *p )
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -352,15 +352,15 @@ int main(int argc, char **argv)
I18N_NOOP("KPilot Maintainer"), I18N_NOOP("KPilot Maintainer"),
"groot@kde.org", "http://www.kpilot.org/"); "groot@kde.org", "http://www.kpilot.org/");
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(generalOptions, TDECmdLineArgs::addCmdLineOptions(generalOptions,
I18N_NOOP("General")); I18N_NOOP("General"));
KCmdLineArgs::addCmdLineOptions(conduitOptions, TDECmdLineArgs::addCmdLineOptions(conduitOptions,
I18N_NOOP("Conduit Actions"),"conduit"); I18N_NOOP("Conduit Actions"),"conduit");
KApplication::addCmdLineOptions(); KApplication::addCmdLineOptions();
KCmdLineArgs *p = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs();
bool needGUI = false; bool needGUI = false;
@ -387,7 +387,7 @@ int main(int argc, char **argv)
if ( p->isSet("check") ) if ( p->isSet("check") )
{ {
return check( device, p->getOption("check"), return check( device, p->getOption("check"),
KCmdLineArgs::parsedArgs("conduit") ); TDECmdLineArgs::parsedArgs("conduit") );
} }
if ( p->isSet("show") ) if ( p->isSet("show") )
@ -398,25 +398,25 @@ int main(int argc, char **argv)
if ( p->isSet("exec") ) if ( p->isSet("exec") )
{ {
return exec( device, p->getOption("exec"), return exec( device, p->getOption("exec"),
KCmdLineArgs::parsedArgs("conduit") ); TDECmdLineArgs::parsedArgs("conduit") );
} }
if ( p->isSet("list") ) if ( p->isSet("list") )
{ {
return listDB( device, return listDB( device,
KCmdLineArgs::parsedArgs("conduit") ); TDECmdLineArgs::parsedArgs("conduit") );
} }
if ( p->isSet("backup") ) if ( p->isSet("backup") )
{ {
return backup( device, p->getOption("backup"), return backup( device, p->getOption("backup"),
KCmdLineArgs::parsedArgs("conduit") ); TDECmdLineArgs::parsedArgs("conduit") );
} }
if ( p->isSet("restore") ) if ( p->isSet("restore") )
{ {
return restore( device, p->getOption("restore"), return restore( device, p->getOption("restore"),
KCmdLineArgs::parsedArgs("conduit") ); TDECmdLineArgs::parsedArgs("conduit") );
} }

6
kpilot/pilotDaemon.cc
Unescape View File

@ -1328,10 +1328,10 @@ int main(int argc, char **argv)
aboutData = &about; aboutData = &about;
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(daemonoptions,"kpilotconfig"); TDECmdLineArgs::addCmdLineOptions(daemonoptions,"kpilotconfig");
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();
KCmdLineArgs *p = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs();
#ifdef DEBUG #ifdef DEBUG
KPilotConfig::getDebugLevel(p); KPilotConfig::getDebugLevel(p);

6
tests/exportdatebook.cc
Unescape View File

@ -61,12 +61,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("exportdatebook","Emport Date Book","0.1"); KAboutData aboutData("exportdatebook","Emport Date Book","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
debug_level= (args->isSet("verbose")) ? 4 : 0; debug_level= (args->isSet("verbose")) ? 4 : 0;

6
tests/importaddresses.cc
Unescape View File

@ -56,13 +56,13 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData aboutData("importaddresses","Import Address Book","0.1"); KAboutData aboutData("importaddresses","Import Address Book","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
// KApplication app( false, false ); // KApplication app( false, false );
KApplication app; KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
#ifdef DEBUG #ifdef DEBUG
debug_level= (args->isSet("verbose")) ? 4 : 0; debug_level= (args->isSet("verbose")) ? 4 : 0;

6
tests/importdatebook.cc
Unescape View File

@ -58,12 +58,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("importdatebook","Import Date Book","0.1"); KAboutData aboutData("importdatebook","Import Date Book","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
debug_level= (args->isSet("verbose")) ? 4 : 0; debug_level= (args->isSet("verbose")) ? 4 : 0;

6
tests/mergecalendars.cc
Unescape View File

@ -54,12 +54,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1"); KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
int debug_level= (args->isSet("verbose")) ? 4 : 0; int debug_level= (args->isSet("verbose")) ? 4 : 0;

6
tests/testaddress.cc
Unescape View File

@ -52,12 +52,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("testaddress","Test Addresses","0.1"); KAboutData aboutData("testaddress","Test Addresses","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
#ifdef DEBUG #ifdef DEBUG
debug_level= (args->isSet("verbose")) ? 4 : 0; debug_level= (args->isSet("verbose")) ? 4 : 0;

6
tests/testcategories.cc
Unescape View File

@ -157,12 +157,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("testcategories","Test Categories","0.1"); KAboutData aboutData("testcategories","Test Categories","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
#ifdef DEBUG #ifdef DEBUG
debug_level= (args->isSet("verbose")) ? 4 : 0; debug_level= (args->isSet("verbose")) ? 4 : 0;

6
tests/testdatabase.cc
Unescape View File

@ -256,12 +256,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("testdatabase","Test Databases","0.1"); KAboutData aboutData("testdatabase","Test Databases","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
Q_UNUSED(args) Q_UNUSED(args)

6
tests/testdatebook.cc
Unescape View File

@ -52,12 +52,12 @@ int main(int argc, char **argv)
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("testdatebook","Test Date Book","0.1"); KAboutData aboutData("testdatebook","Test Date Book","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); KApplication app( false, false );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
#ifdef DEBUG #ifdef DEBUG
debug_level= (args->isSet("verbose")) ? 4 : 0; debug_level= (args->isSet("verbose")) ? 4 : 0;

2
tests/testidmapper.cc
Unescape View File

@ -288,7 +288,7 @@ int main(int argc, char **argv)
{ {
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
KAboutData aboutData("testidmapper","Test IDMapper","0.1"); KAboutData aboutData("testidmapper","Test IDMapper","0.1");
KCmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::init(argc,argv,&aboutData);
KApplication app( false, false ); KApplication app( false, false );

Write Preview
Loading…
Cancel
Save