diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index c7f31144c..26c266a7c 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -402,7 +402,7 @@ static int daemonMainLoopStatic(int argc, const char **argv) return ClientApp::instance().daemonMainLoop(argc, argv); } -int ClientApp::standardStartup(int argc, char **argv) +int ClientApp::start(int argc, char **argv) { initApp(argc, argv); return mainLoop(); diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h index b1c1af35f..9f1013d6e 100644 --- a/src/lib/deskflow/ClientApp.h +++ b/src/lib/deskflow/ClientApp.h @@ -43,7 +43,7 @@ public: { 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; deskflow::Screen *createScreen() override; int mainLoop() override; diff --git a/src/lib/deskflow/IApp.h b/src/lib/deskflow/IApp.h index 7f0571ea6..d07252610 100644 --- a/src/lib/deskflow/IApp.h +++ b/src/lib/deskflow/IApp.h @@ -23,7 +23,7 @@ public: virtual ~IApp() = default; virtual void setByeFunc(void (*bye)(int)) = 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 void startNode() = 0; virtual void bye(int error) = 0; diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index a8c1783d4..5715a2841 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -675,7 +675,7 @@ int daemonMainLoopStatic(int argc, const char **argv) return ServerApp::instance().daemonMainLoop(argc, argv); } -int ServerApp::standardStartup(int argc, char **argv) +int ServerApp::start(int argc, char **argv) { initApp(argc, argv); return mainLoop(); diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h index 0823b8a69..f994150a3 100644 --- a/src/lib/deskflow/ServerApp.h +++ b/src/lib/deskflow/ServerApp.h @@ -64,7 +64,7 @@ public: deskflow::Screen *createScreen() override; int mainLoop() 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; // diff --git a/src/lib/deskflow/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp index 663f90ec9..334d03f7b 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -26,14 +26,14 @@ AppUtilUnix::AppUtilUnix(const IEventQueue *) // 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) { - return app().runInner(argc, argv, &standardStartupStatic); + return app().runInner(argc, argv, &startStatic); } void AppUtilUnix::startNode() diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index 7d95084aa..07cb34071 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -100,7 +100,7 @@ static int daemonNTStartupStatic(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)