From dc1d415dc34ab1d3b4a02f0c3328392ad31820fc Mon Sep 17 00:00:00 2001 From: listenerri Date: Wed, 5 Dec 2018 14:45:44 +0800 Subject: [PATCH] fix: build warning 2 Change-Id: I3ebd8122b7147f1a087a773b881d8d7709301b7b --- frame/controller/dockpluginscontroller.cpp | 4 ++-- frame/controller/dockpluginscontroller.h | 14 +++++++------- frame/item/components/appsnapshot.cpp | 2 +- .../tray/system-trays/systemtrayscontroller.cpp | 4 ++-- plugins/tray/system-trays/systemtrayscontroller.h | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp index de07dbb6c..8b63a4de0 100644 --- a/frame/controller/dockpluginscontroller.cpp +++ b/frame/controller/dockpluginscontroller.cpp @@ -225,7 +225,7 @@ void DockPluginsController::saveValue(PluginsItemInterface *const itemInter, con const QVariant DockPluginsController::getValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant& failback) { m_pluginsSetting.beginGroup(itemInter->pluginName()); - QVariant value { std::move(m_pluginsSetting.value(itemKey, failback)) }; + QVariant value(m_pluginsSetting.value(itemKey, failback)); m_pluginsSetting.endGroup(); - return std::move(value); + return value; } diff --git a/frame/controller/dockpluginscontroller.h b/frame/controller/dockpluginscontroller.h index d4ba1ba23..691fccd1c 100644 --- a/frame/controller/dockpluginscontroller.h +++ b/frame/controller/dockpluginscontroller.h @@ -42,14 +42,14 @@ public: explicit DockPluginsController(DockItemController *itemControllerInter = 0); // implements PluginProxyInterface - void itemAdded(PluginsItemInterface * const itemInter, const QString &itemKey); - void itemUpdate(PluginsItemInterface * const itemInter, const QString &itemKey); - void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey); - void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey); + void itemAdded(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void itemUpdate(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; void requestWindowAutoHide(PluginsItemInterface * const itemInter, const QString &itemKey, const bool autoHide) Q_DECL_OVERRIDE; void requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; - void saveValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant &value); - const QVariant getValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant& failback = QVariant()); + void saveValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant &value) Q_DECL_OVERRIDE; + const QVariant getValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant& failback = QVariant()) Q_DECL_OVERRIDE; signals: void pluginItemInserted(PluginsItem *pluginItem) const; @@ -65,7 +65,7 @@ private slots: void initPlugin(PluginsItemInterface *interface); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; PluginsItem *pluginItemAt(PluginsItemInterface * const itemInter, const QString &itemKey) const; private: diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index ad874f3b6..bca6b54ff 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -55,8 +55,8 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent) : QWidget(parent) , m_wid(wid) , m_title(new TipsWidget) - , m_closeBtn(new DImageButton) , m_waitLeaveTimer(new QTimer(this)) + , m_closeBtn(new DImageButton) , m_wmHelper(DWindowManagerHelper::instance()) { m_closeBtn->setFixedSize(24, 24); diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp index e34e6b93b..c0ee08863 100644 --- a/plugins/tray/system-trays/systemtrayscontroller.cpp +++ b/plugins/tray/system-trays/systemtrayscontroller.cpp @@ -240,9 +240,9 @@ void SystemTraysController::saveValue(PluginsItemInterface *const itemInter, con const QVariant SystemTraysController::getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& fallback) { m_pluginsSetting.beginGroup(itemInter->pluginName()); - QVariant value { std::move(m_pluginsSetting.value(key, fallback)) }; + QVariant value(m_pluginsSetting.value(key, fallback)); m_pluginsSetting.endGroup(); - return std::move(value); + return value; } int SystemTraysController::systemTrayItemSortKey(const QString &itemKey) diff --git a/plugins/tray/system-trays/systemtrayscontroller.h b/plugins/tray/system-trays/systemtrayscontroller.h index 7ed54d97e..69557ccdc 100644 --- a/plugins/tray/system-trays/systemtrayscontroller.h +++ b/plugins/tray/system-trays/systemtrayscontroller.h @@ -39,14 +39,14 @@ public: explicit SystemTraysController(QObject *parent = nullptr); // implements PluginProxyInterface - void itemAdded(PluginsItemInterface * const itemInter, const QString &itemKey); - void itemUpdate(PluginsItemInterface * const itemInter, const QString &itemKey); - void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey); - void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey); + void itemAdded(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void itemUpdate(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; void requestWindowAutoHide(PluginsItemInterface * const itemInter, const QString &itemKey, const bool autoHide) Q_DECL_OVERRIDE; void requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; - void saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value); - const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& failback = QVariant()); + void saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value) Q_DECL_OVERRIDE; + const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& failback = QVariant()) Q_DECL_OVERRIDE; int systemTrayItemSortKey(const QString &itemKey); void setSystemTrayItemSortKey(const QString &itemKey, const int order); @@ -66,7 +66,7 @@ private slots: void initPlugin(PluginsItemInterface *interface); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; SystemTrayItem *pluginItemAt(PluginsItemInterface * const itemInter, const QString &itemKey) const; PluginsItemInterface *pluginInterAt(const QString &itemKey) const; PluginsItemInterface *pluginInterAt(SystemTrayItem *systemTrayItem) const;