Remove the touch emulation feature

This feature was implemented before Qt's pointer handlers were
introduced and thanks to those it really isn't needed nowadays.
Plus, it was only ever working on X11, limiting its usefulness.

Change-Id: Icb03e2e8ede4fc5b62564fc70c20a460fe2d0134
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

5 files changed, 5 insertions, 36 deletions

diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp
index b9b152de..c17f2ca0 100644
--- a/src/main-lib/configuration.cpp
+++ b/src/main-lib/configuration.cpp
@@ -191,7 +191,7 @@ Configuration::Configuration(const QStringList &defaultConfigFilePaths,
     m_clp.addOption({ qSL("single-app"),           qSL("Runs a single application only (ignores the database)"), qSL("info.yaml file") }); // rename single-package
     m_clp.addOption({ qSL("logging-rule"),         qSL("Adds a standard Qt logging rule."), qSL("rule") });
     m_clp.addOption({ qSL("qml-debug"),            qSL("Enables QML debugging and profiling.") });
-    m_clp.addOption({ qSL("enable-touch-emulation"), qSL("Enables the touch emulation, converting mouse to touch events.") });
+    m_clp.addOption({ qSL("enable-touch-emulation"), qSL("Deprecated (ignored).") });
 }
 
 QVariant Configuration::buildConfig() const
@@ -386,7 +386,7 @@ void Configuration::parseWithArguments(const QStringList &arguments)
 }
 
 
-const quint32 ConfigurationData::DataStreamVersion = 6;
+const quint32 ConfigurationData::DataStreamVersion = 7;
 
 
 ConfigurationData *ConfigurationData::loadFromCache(QDataStream &ds)
@@ -431,7 +431,6 @@ ConfigurationData *ConfigurationData::loadFromCache(QDataStream &ds)
        >> cd->ui.pluginPaths
        >> cd->ui.iconThemeName
        >> cd->ui.loadDummyData
-       >> cd->ui.enableTouchEmulation
        >> cd->ui.iconThemeSearchPaths
        >> cd->ui.opengl
        >> cd->applications.builtinAppsManifestDir
@@ -494,7 +493,6 @@ void ConfigurationData::saveToCache(QDataStream &ds) const
        << ui.pluginPaths
        << ui.iconThemeName
        << ui.loadDummyData
-       << ui.enableTouchEmulation
        << ui.iconThemeSearchPaths
        << ui.opengl
        << applications.builtinAppsManifestDir
@@ -594,7 +592,6 @@ void ConfigurationData::mergeFrom(const ConfigurationData *from)
     MERGE_FIELD(ui.pluginPaths);
     MERGE_FIELD(ui.iconThemeName);
     MERGE_FIELD(ui.loadDummyData);
-    MERGE_FIELD(ui.enableTouchEmulation);
     MERGE_FIELD(ui.iconThemeSearchPaths);
     MERGE_FIELD(ui.opengl);
     MERGE_FIELD(applications.builtinAppsManifestDir);
@@ -767,8 +764,9 @@ ConfigurationData *ConfigurationData::loadFromSource(QIODevice *source, const QS
                   }); } },
             { "ui", false, YamlParser::Map, [&cd](YamlParser *p) {
                   p->parseFields({
-                      { "enableTouchEmulation", false, YamlParser::Scalar, [&cd](YamlParser *p) {
-                            cd->ui.enableTouchEmulation = p->parseScalar().toBool(); } },
+                      { "enableTouchEmulation", false, YamlParser::Scalar, [](YamlParser *p) {
+                            qCDebug(LogDeployment) << "ignoring 'enableTouchEmulation'";
+                            (void) p->parseScalar(); } },
                       { "iconThemeSearchPaths", false, YamlParser::Scalar | YamlParser::List, [&cd](YamlParser *p) {
                             cd->ui.iconThemeSearchPaths = p->parseStringOrStringList(); } },
                       { "iconThemeName", false, YamlParser::Scalar, [&cd](YamlParser *p) {
@@ -1147,11 +1145,6 @@ QStringList Configuration::iconThemeSearchPaths() const
     return m_data->ui.iconThemeSearchPaths;
 }
 
-bool Configuration::enableTouchEmulation() const
-{
-    return value("enable-touch-emulation", m_data->ui.enableTouchEmulation);
-}
-
 QString Configuration::dltId() const
 {
     return value<QString>(nullptr, m_data->logging.dlt.id);
diff --git a/src/main-lib/configuration.h b/src/main-lib/configuration.h
index 64eb040e..dce0baa3 100644
--- a/src/main-lib/configuration.h
+++ b/src/main-lib/configuration.h
@@ -95,7 +95,6 @@ public:
     QString style() const;
     QString iconThemeName() const;
     QStringList iconThemeSearchPaths() const;
-    bool enableTouchEmulation() const;
     QString dltId() const;
     QString dltDescription() const;
     QString dltLongMessageBehavior() const;
diff --git a/src/main-lib/configuration_p.h b/src/main-lib/configuration_p.h
index 671cbf82..1195c4fb 100644
--- a/src/main-lib/configuration_p.h
+++ b/src/main-lib/configuration_p.h
@@ -113,7 +113,6 @@ struct ConfigurationData
 
     struct {
         QVariantMap opengl;
-        bool enableTouchEmulation = false;
         QStringList iconThemeSearchPaths;
         QString iconThemeName;
         QString style;
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index e5b4df13..1fc545a3 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -101,7 +101,6 @@
 #if defined(QT_DBUS_LIB) && !defined(AM_DISABLE_EXTERNAL_DBUS_INTERFACES)
 #  include "windowmanagerdbuscontextadaptor.h"
 #endif
-#include "touchemulation.h"
 #include "windowframetimer.h"
 #include "gpustatus.h"
 
@@ -246,7 +245,6 @@ void Main::setup(const Configuration *cfg) Q_DECL_NOEXCEPT_EXPR(false)
     setupWindowTitle(QString(), cfg->windowIcon());
     setupWindowManager(cfg->waylandSocketName(), cfg->waylandExtraSockets(),
                        cfg->slowAnimations(), cfg->noUiWatchdog());
-    setupTouchEmulation(cfg->enableTouchEmulation());
 
     setupDBus(std::bind(&Configuration::dbusRegistration, cfg, std::placeholders::_1),
               std::bind(&Configuration::dbusPolicy, cfg, std::placeholders::_1));
@@ -723,25 +721,6 @@ void Main::setupWindowManager(const QString &waylandSocketName, const QVariantLi
                      m_windowManager, &WindowManager::raiseApplicationWindow);
 }
 
-void Main::setupTouchEmulation(bool enableTouchEmulation)
-{
-    if (enableTouchEmulation) {
-        if (TouchEmulation::isSupported()) {
-            if (TouchEmulation::hasPhysicalTouchscreen()) {
-                TouchEmulation::createInstance();
-                qCDebug(LogGraphics) << "Touch emulation is enabled: all mouse events will be "
-                                        "converted to touch events.";
-            } else {
-                qCDebug(LogGraphics) << "Touch emulation is disabled, because at least one touch "
-                                        "input device was detected";
-            }
-        } else {
-            qCWarning(LogGraphics) << "Touch emulation cannot be enabled. Either it was disabled at "
-                                      "build time or the platform does not support it.";
-        }
-    }
-}
-
 void Main::loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false)
 {
     for (auto iface : qAsConst(m_startupPlugins))
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index 69777fc1..1cfe6218 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -116,7 +116,6 @@ protected:
     void setupQmlEngine(const QStringList &importPaths, const QString &quickControlsStyle = QString());
     void setupWindowTitle(const QString &title, const QString &iconPath);
     void setupWindowManager(const QString &waylandSocketName, const QVariantList &waylandExtraSockets, bool slowAnimations, bool uiWatchdog);
-    void setupTouchEmulation(bool enableTouchEmulation);
 
     enum SystemProperties {
         SP_ThirdParty = 0,