diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index a26c09586..b417c41b0 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -264,7 +264,7 @@ int MinimalApp::standardStartup(int argc, char **argv) return 0; } -int MinimalApp::runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) +int MinimalApp::runInner(int argc, char **argv, StartupFunc startup) { return 0; } diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h index 10a70948e..1faef6178 100644 --- a/src/lib/deskflow/App.h +++ b/src/lib/deskflow/App.h @@ -21,11 +21,12 @@ #include -class ILogOutputter; -class FileLogOutputter; namespace deskflow { class Screen; } + +class ILogOutputter; +class FileLogOutputter; class IEventQueue; class SocketMultiplexer; @@ -136,7 +137,7 @@ public: // IApp overrides virtual int standardStartup(int argc, char **argv) override; - virtual int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override; + virtual int runInner(int argc, char **argv, StartupFunc startup) override; virtual void startNode() override; virtual int mainLoop() override; virtual int foregroundStartup(int argc, char **argv) override; diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index d1e456cb9..c742b0be3 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -510,17 +510,12 @@ int ClientApp::standardStartup(int argc, char **argv) } } -int ClientApp::runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) +int ClientApp::runInner(int argc, char **argv, StartupFunc startup) { // general initialization m_serverAddress = new NetworkAddress; args().m_pname = ARCH->getBasename(argv[0]); - // install caller's output filter - if (outputter != NULL) { - CLOG->insert(outputter); - } - int result; try { // run diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h index a53f5589f..4a2792a0e 100644 --- a/src/lib/deskflow/ClientApp.h +++ b/src/lib/deskflow/ClientApp.h @@ -11,17 +11,15 @@ namespace deskflow { class Screen; -} +class ClientArgs; +} // namespace deskflow + class Event; class Client; class NetworkAddress; class Thread; class ISocketFactory; -namespace deskflow { -class ClientArgs; -} - class ClientApp : public App { public: @@ -45,7 +43,7 @@ public: } int foregroundStartup(int argc, char **argv) override; int standardStartup(int argc, char **argv) override; - int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override; + int runInner(int argc, char **argv, StartupFunc startup) override; deskflow::Screen *createScreen() override; int mainLoop() override; void startNode() override; diff --git a/src/lib/deskflow/IApp.h b/src/lib/deskflow/IApp.h index bb34a655b..f79b7bd7d 100644 --- a/src/lib/deskflow/IApp.h +++ b/src/lib/deskflow/IApp.h @@ -13,12 +13,9 @@ typedef int (*StartupFunc)(int, char **); namespace deskflow { class ArgsBase; -} - -class ILogOutputter; -namespace deskflow { class Screen; -} +} // namespace deskflow + class IEventQueue; class IApp : public IInterface @@ -27,7 +24,7 @@ public: virtual void setByeFunc(void (*bye)(int)) = 0; virtual deskflow::ArgsBase &argsBase() const = 0; virtual int standardStartup(int argc, char **argv) = 0; - virtual int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) = 0; + virtual int runInner(int argc, char **argv, StartupFunc startup) = 0; virtual void startNode() = 0; virtual void bye(int error) = 0; virtual int mainLoop() = 0; diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index 884b341af..aa6f0484d 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -776,18 +776,13 @@ void ServerApp::resetServer(const Event &, void *) startServer(); } -int ServerApp::runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) +int ServerApp::runInner(int argc, char **argv, StartupFunc startup) { // general initialization m_deskflowAddress = new NetworkAddress; args().m_config = std::make_shared(m_events); args().m_pname = ARCH->getBasename(argv[0]); - // install caller's output filter - if (outputter != NULL) { - CLOG->insert(outputter); - } - // run int result = startup(argc, argv); diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h index a0dc76247..4be70ec1c 100644 --- a/src/lib/deskflow/ServerApp.h +++ b/src/lib/deskflow/ServerApp.h @@ -60,7 +60,7 @@ public: bool loadConfig(const std::string &pathname) override; deskflow::Screen *createScreen() override; int mainLoop() override; - int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override; + int runInner(int argc, char **argv, StartupFunc startup) override; int standardStartup(int argc, char **argv) override; int foregroundStartup(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 93f3f512c..596b72757 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -42,7 +42,7 @@ int standardStartupStatic(int argc, char **argv) int AppUtilUnix::run(int argc, char **argv) { - return app().runInner(argc, argv, NULL, &standardStartupStatic); + return app().runInner(argc, argv, &standardStartupStatic); } void AppUtilUnix::startNode() diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index d8943fbaf..969cd2202 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -119,7 +119,7 @@ int AppUtilWindows::run(int argc, char **argv) app().argsBase().m_daemon = false; } - return app().runInner(argc, argv, NULL, startup); + return app().runInner(argc, argv, startup); } AppUtilWindows &AppUtilWindows::instance() diff --git a/src/test/mock/deskflow/MockApp.h b/src/test/mock/deskflow/MockApp.h index bd1b3467f..84f155716 100644 --- a/src/test/mock/deskflow/MockApp.h +++ b/src/test/mock/deskflow/MockApp.h @@ -27,7 +27,7 @@ public: MOCK_METHOD(void, parseArgs, (int, const char *const *), (override)); MOCK_METHOD(void, version, (), (override)); MOCK_METHOD(int, standardStartup, (int, char **), (override)); - MOCK_METHOD(int, runInner, (int, char **, ILogOutputter *, StartupFunc), (override)); + MOCK_METHOD(int, runInner, (int, char **, StartupFunc), (override)); MOCK_METHOD(void, startNode, (), (override)); MOCK_METHOD(int, mainLoop, (), (override)); MOCK_METHOD(int, foregroundStartup, (int, char **), (override)); diff --git a/src/test/unittests/deskflow/ServerAppTests.cpp b/src/test/unittests/deskflow/ServerAppTests.cpp index 021d0de77..b96b4c424 100644 --- a/src/test/unittests/deskflow/ServerAppTests.cpp +++ b/src/test/unittests/deskflow/ServerAppTests.cpp @@ -30,7 +30,7 @@ TEST(ServerAppTests, runInner_will_handle_configuration_lifetime) EXPECT_FALSE(app.args().m_config); const char *argv[]{"deskflow-server"}; - app.runInner(1, const_cast(argv), nullptr, [](int, char **) { return 0; }); + app.runInner(1, const_cast(argv), [](int, char **) { return 0; }); EXPECT_TRUE(app.args().m_config); }