diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 88451c2c70..c0aecceefd 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -24,8 +24,6 @@ if(WIN32) MSWindowsClipboardFacade.h MSWindowsClipboardHTMLConverter.cpp MSWindowsClipboardHTMLConverter.h - MSWindowsClipboardTextConverter.cpp - MSWindowsClipboardTextConverter.h MSWindowsClipboardUTF16Converter.cpp MSWindowsClipboardUTF16Converter.h MSWindowsDebugOutputter.cpp diff --git a/src/lib/platform/MSWindowsClipboard.cpp b/src/lib/platform/MSWindowsClipboard.cpp index a7efe94d7b..1d13e1253e 100644 --- a/src/lib/platform/MSWindowsClipboard.cpp +++ b/src/lib/platform/MSWindowsClipboard.cpp @@ -11,7 +11,6 @@ #include "platform/MSWindowsClipboardBitmapConverter.h" #include "platform/MSWindowsClipboardFacade.h" #include "platform/MSWindowsClipboardHTMLConverter.h" -#include "platform/MSWindowsClipboardTextConverter.h" #include "platform/MSWindowsClipboardUTF16Converter.h" // @@ -30,7 +29,6 @@ MSWindowsClipboard::MSWindowsClipboard(HWND window) m_converters.push_back(new MSWindowsClipboardUTF16Converter); m_converters.push_back(new MSWindowsClipboardBitmapConverter); m_converters.push_back(new MSWindowsClipboardHTMLConverter); - m_converters.push_back(new MSWindowsClipboardTextConverter); } MSWindowsClipboard::~MSWindowsClipboard() diff --git a/src/lib/platform/MSWindowsClipboardTextConverter.cpp b/src/lib/platform/MSWindowsClipboardTextConverter.cpp deleted file mode 100644 index c81e928ad5..0000000000 --- a/src/lib/platform/MSWindowsClipboardTextConverter.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#include "platform/MSWindowsClipboardTextConverter.h" - -#include - -// -// MSWindowsClipboardTextConverter -// - -UINT MSWindowsClipboardTextConverter::getWin32Format() const -{ - return CF_TEXT; -} - -std::string MSWindowsClipboardTextConverter::doFromIClipboard(const std::string &data) const -{ - return QString::fromStdString(data).toLatin1().toStdString() + '\0'; -} - -std::string MSWindowsClipboardTextConverter::doToIClipboard(const std::string &data) const -{ - auto q = QString::fromStdString(data); - q.truncate(q.indexOf('\0')); - return q.toStdString(); -} diff --git a/src/lib/platform/MSWindowsClipboardTextConverter.h b/src/lib/platform/MSWindowsClipboardTextConverter.h deleted file mode 100644 index d80cdf90ba..0000000000 --- a/src/lib/platform/MSWindowsClipboardTextConverter.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#include "platform/MSWindowsClipboardAnyTextConverter.h" - -//! Convert to/from locale text encoding -class MSWindowsClipboardTextConverter : public MSWindowsClipboardAnyTextConverter -{ -public: - MSWindowsClipboardTextConverter() = default; - ~MSWindowsClipboardTextConverter() override = default; - - // IMSWindowsClipboardConverter overrides - UINT getWin32Format() const override; - -protected: - // MSWindowsClipboardAnyTextConverter overrides - std::string doFromIClipboard(const std::string &) const override; - std::string doToIClipboard(const std::string &) const override; -};