diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h index 1d9cacba5..a65ad90e3 100644 --- a/src/lib/deskflow/App.h +++ b/src/lib/deskflow/App.h @@ -146,8 +146,6 @@ private: " --enable-crypto enable TLS encryption.\n" \ " --tls-cert specify the path to the TLS certificate file.\n" -#define DRAG_AND_DROP " --enable-drag-drop enable file drag & drop.\n" - #define HELP_COMMON_INFO_2 \ " -h, --help display this help and exit.\n" \ " --version display version information and exit.\n" diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index fd25ef6f7..d387270cf 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -113,9 +113,6 @@ void ClientApp::help() << " -a, --address
local network interface address.\n" << HELP_COMMON_INFO_1 << HELP_SYS_INFO << " --yscroll defines the vertical scrolling delta,\n" << " which is 120 by default.\n" -#ifndef WINAPI_XWINDOWS - << DRAG_AND_DROP "\n" -#endif << " --sync-language enable language synchronization.\n" << " --invert-scroll invert scroll direction on this\n" << " computer.\n" diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index 06410f14f..0328d145f 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -110,9 +110,6 @@ void ServerApp::help() #endif << HELP_SYS_ARGS HELP_COMMON_ARGS "\n" -#ifndef WINAPI_XWINDOWS - << DRAG_AND_DROP "\n" -#endif << "\n" << "Start the " << kAppName << " mouse/keyboard sharing server.\n" << "\n" diff --git a/src/lib/gui/ServerConfig.cpp b/src/lib/gui/ServerConfig.cpp index d2ab96760..3c02f7c97 100644 --- a/src/lib/gui/ServerConfig.cpp +++ b/src/lib/gui/ServerConfig.cpp @@ -74,7 +74,6 @@ bool ServerConfig::operator==(const ServerConfig &sc) const m_SwitchCornerSize == sc.m_SwitchCornerSize && // m_SwitchCorners == sc.m_SwitchCorners && // m_Hotkeys == sc.m_Hotkeys && // - m_EnableDragAndDrop == sc.m_EnableDragAndDrop && // m_DisableLockToScreen == sc.m_DisableLockToScreen && // m_ClipboardSharing == sc.m_ClipboardSharing && // m_ClipboardSharingSize == sc.m_ClipboardSharingSize && // @@ -124,7 +123,6 @@ void ServerConfig::commit() settings().setValue("switchDoubleTap", switchDoubleTap()); settings().setValue("switchCornerSize", switchCornerSize()); settings().setValue("disableLockToScreen", disableLockToScreen()); - settings().setValue("enableDragAndDrop", enableDragAndDrop()); settings().setValue("clipboardSharing", clipboardSharing()); settings().setValue("clipboardSharingSize", QVariant::fromValue(clipboardSharingSize())); @@ -176,7 +174,6 @@ void ServerConfig::recall() setSwitchDoubleTap(settings().value("switchDoubleTap", 250).toInt()); setSwitchCornerSize(settings().value("switchCornerSize").toInt()); setDisableLockToScreen(settings().value("disableLockToScreen", false).toBool()); - setEnableDragAndDrop(settings().value("enableDragAndDrop", false).toBool()); setClipboardSharingSize( settings().value("clipboardSharingSize", (int)ServerConfig::defaultClipboardSharingSize()).toULongLong() ); diff --git a/src/lib/gui/ServerConfig.h b/src/lib/gui/ServerConfig.h index f02336ba5..441baadb1 100644 --- a/src/lib/gui/ServerConfig.h +++ b/src/lib/gui/ServerConfig.h @@ -57,10 +57,6 @@ public: { return m_Screens; } - bool enableDragAndDrop() const override - { - return m_EnableDragAndDrop; - } // // New methods @@ -229,10 +225,6 @@ private: { m_SwitchCornerSize = val; } - void setEnableDragAndDrop(bool on) - { - m_EnableDragAndDrop = on; - } void setDisableLockToScreen(bool on) { m_DisableLockToScreen = on; @@ -269,7 +261,6 @@ private: bool m_HasSwitchDoubleTap = false; int m_SwitchDoubleTap = 0; int m_SwitchCornerSize = 0; - bool m_EnableDragAndDrop = false; bool m_DisableLockToScreen = false; bool m_ClipboardSharing = true; QString m_ClientAddress = ""; diff --git a/src/lib/gui/config/IServerConfig.h b/src/lib/gui/config/IServerConfig.h index a90414cda..8c943fced 100644 --- a/src/lib/gui/config/IServerConfig.h +++ b/src/lib/gui/config/IServerConfig.h @@ -21,7 +21,6 @@ public: virtual bool screenExists(const QString &screenName) const = 0; virtual bool save(const QString &fileName) const = 0; virtual void save(QFile &file) const = 0; - virtual bool enableDragAndDrop() const = 0; virtual const ScreenList &screens() const = 0; }; diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index 2d7d14a85..78ed722eb 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -459,14 +459,6 @@ bool CoreProcess::addGenericArgs(QStringList &args, const ProcessMode processMod args << "--name" << Settings::value(Settings::Core::ScreenName).toString(); -#ifndef Q_OS_LINUX - - if (m_serverConfig.enableDragAndDrop()) { - args << "--enable-drag-drop"; - } - -#endif - if (Settings::value(Settings::Security::TlsEnabled).toBool()) { args << "--enable-crypto"; } diff --git a/src/unittests/legacytests/shared/gui/mocks/ServerConfigMock.h b/src/unittests/legacytests/shared/gui/mocks/ServerConfigMock.h index c5329fcf9..3f5c45874 100644 --- a/src/unittests/legacytests/shared/gui/mocks/ServerConfigMock.h +++ b/src/unittests/legacytests/shared/gui/mocks/ServerConfigMock.h @@ -22,7 +22,6 @@ public: MOCK_METHOD(bool, screenExists, (const QString &screenName), (const, override)); MOCK_METHOD(bool, save, (const QString &fileName), (const, override)); MOCK_METHOD(void, save, (QFile & file), (const, override)); - MOCK_METHOD(bool, enableDragAndDrop, (), (const, override)); MOCK_METHOD(const ScreenList &, screens, (), (const, override)); private: