Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-03 00:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: build warning 2

Browse Source 
Change-Id: I3ebd8122b7147f1a087a773b881d8d7709301b7b
This commit is contained in:
listenerri 2018-12-05 14:45:44 +08:00
parent e18be0ba7f
commit dc1d415dc3
Notes: gerrit 2018-12-05 14:51:20 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Wed, 05 Dec 2018 14:51:19 +0800
Reviewed-on: https://cr.deepin.io/40288
Project: dde/dde-dock
Branch: refs/heads/master
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frame/controller/dockpluginscontroller.cpp
View File

@ -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;
}

14
frame/controller/dockpluginscontroller.h
View File

@ -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:

2
frame/item/components/appsnapshot.cpp
View File

@ -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);

4
plugins/tray/system-trays/systemtrayscontroller.cpp
View File

@ -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)

14
plugins/tray/system-trays/systemtrayscontroller.h
View File

@ -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;