chore: rename IApp::standardStartup -> IApp::start
This commit is contained in:
parent
03e014c753
commit
57e34ded54
7 changed files with 9 additions and 9 deletions
|
|
@ -402,7 +402,7 @@ static int daemonMainLoopStatic(int argc, const char **argv)
|
||||||
return ClientApp::instance().daemonMainLoop(argc, argv);
|
return ClientApp::instance().daemonMainLoop(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ClientApp::standardStartup(int argc, char **argv)
|
int ClientApp::start(int argc, char **argv)
|
||||||
{
|
{
|
||||||
initApp(argc, argv);
|
initApp(argc, argv);
|
||||||
return mainLoop();
|
return mainLoop();
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ public:
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
int standardStartup(int argc, char **argv) override;
|
int start(int argc, char **argv) override;
|
||||||
int runInner(int argc, char **argv, StartupFunc startup) override;
|
int runInner(int argc, char **argv, StartupFunc startup) override;
|
||||||
deskflow::Screen *createScreen() override;
|
deskflow::Screen *createScreen() override;
|
||||||
int mainLoop() override;
|
int mainLoop() override;
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ public:
|
||||||
virtual ~IApp() = default;
|
virtual ~IApp() = default;
|
||||||
virtual void setByeFunc(void (*bye)(int)) = 0;
|
virtual void setByeFunc(void (*bye)(int)) = 0;
|
||||||
virtual deskflow::ArgsBase &argsBase() const = 0;
|
virtual deskflow::ArgsBase &argsBase() const = 0;
|
||||||
virtual int standardStartup(int argc, char **argv) = 0;
|
virtual int start(int argc, char **argv) = 0;
|
||||||
virtual int runInner(int argc, char **argv, StartupFunc startup) = 0;
|
virtual int runInner(int argc, char **argv, StartupFunc startup) = 0;
|
||||||
virtual void startNode() = 0;
|
virtual void startNode() = 0;
|
||||||
virtual void bye(int error) = 0;
|
virtual void bye(int error) = 0;
|
||||||
|
|
|
||||||
|
|
@ -675,7 +675,7 @@ int daemonMainLoopStatic(int argc, const char **argv)
|
||||||
return ServerApp::instance().daemonMainLoop(argc, argv);
|
return ServerApp::instance().daemonMainLoop(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ServerApp::standardStartup(int argc, char **argv)
|
int ServerApp::start(int argc, char **argv)
|
||||||
{
|
{
|
||||||
initApp(argc, argv);
|
initApp(argc, argv);
|
||||||
return mainLoop();
|
return mainLoop();
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ public:
|
||||||
deskflow::Screen *createScreen() override;
|
deskflow::Screen *createScreen() override;
|
||||||
int mainLoop() override;
|
int mainLoop() override;
|
||||||
int runInner(int argc, char **argv, StartupFunc startup) override;
|
int runInner(int argc, char **argv, StartupFunc startup) override;
|
||||||
int standardStartup(int argc, char **argv) override;
|
int start(int argc, char **argv) override;
|
||||||
void startNode() override;
|
void startNode() override;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -26,14 +26,14 @@ AppUtilUnix::AppUtilUnix(const IEventQueue *)
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
int standardStartupStatic(int argc, char **argv)
|
int startStatic(int argc, char **argv)
|
||||||
{
|
{
|
||||||
return AppUtil::instance().app().standardStartup(argc, argv);
|
return AppUtil::instance().app().start(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
int AppUtilUnix::run(int argc, char **argv)
|
int AppUtilUnix::run(int argc, char **argv)
|
||||||
{
|
{
|
||||||
return app().runInner(argc, argv, &standardStartupStatic);
|
return app().runInner(argc, argv, &startStatic);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AppUtilUnix::startNode()
|
void AppUtilUnix::startNode()
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ static int daemonNTStartupStatic(int argc, char **argv)
|
||||||
|
|
||||||
static int foregroundStartupStatic(int argc, char **argv)
|
static int foregroundStartupStatic(int argc, char **argv)
|
||||||
{
|
{
|
||||||
return AppUtil::instance().app().standardStartup(argc, argv);
|
return AppUtil::instance().app().start(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
int AppUtilWindows::run(int argc, char **argv)
|
int AppUtilWindows::run(int argc, char **argv)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue