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

Browse Source 
Change-Id: I57b1e5a68f699fface1ed542813791013020691e
This commit is contained in:
listenerri 2018-12-04 13:31:51 +08:00
parent 63dc102939
commit 61197b9d3d
Notes: gerrit 2018-12-05 12:33:00 +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 12:32:59 +0800
Reviewed-on: https://cr.deepin.io/40280
Project: dde/dde-dock
Branch: refs/heads/master
8 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frame/item/appitem.h
View File

@ -55,7 +55,7 @@ public:
QWidget *appDragWidget();
void setDockInfo(Dock::Position dockPosition, const QRect &dockGeometry);
inline ItemType itemType() const { return App; }
inline ItemType itemType() const Q_DECL_OVERRIDE { return App; }
signals:
void requestActivateWindow(const WId wid) const;
@ -77,17 +77,17 @@ private:
void leaveEvent(QEvent *e) override;
void showEvent(QShowEvent *e) override;
void showHoverTips();
void invokedMenuItem(const QString &itemId, const bool checked);
const QString contextMenu() const;
QWidget *popupTips();
void showHoverTips() Q_DECL_OVERRIDE;
void invokedMenuItem(const QString &itemId, const bool checked) Q_DECL_OVERRIDE;
const QString contextMenu() const Q_DECL_OVERRIDE;
QWidget *popupTips() Q_DECL_OVERRIDE;
void startDrag();
bool hasAttention() const;
private slots:
void updateWindowInfos(const WindowInfoMap &info);
void refershIcon();
void refershIcon() Q_DECL_OVERRIDE;
void activeChanged();
void showPreview();
void cancelAndHidePreview();

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

@ -236,7 +236,6 @@ void AppSnapshot::paintEvent(QPaintEvent *e)
if (m_snapshot.isNull())
return;
const QRect r = rect().marginsRemoved(QMargins(8, 8, 8, 8));
const auto ratio = devicePixelRatioF();
// draw attention background

4
plugins/datetime/datetimeplugin.h
View File

@ -47,8 +47,8 @@ public:
bool pluginIsAllowDisable() override { return true; }
bool pluginIsDisable() override;
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
int itemSortKey(const QString &itemKey) Q_DECL_OVERRIDE;
void setSortKey(const QString &itemKey, const int order) Q_DECL_OVERRIDE;
QWidget *itemWidget(const QString &itemKey) override;
QWidget *itemTipsWidget(const QString &itemKey) override;

4
plugins/power/powerplugin.h
View File

@ -55,8 +55,8 @@ public:
const QString itemContextMenu(const QString &itemKey) override;
void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override;
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
int itemSortKey(const QString &itemKey) Q_DECL_OVERRIDE;
void setSortKey(const QString &itemKey, const int order) Q_DECL_OVERRIDE;
private:
void updateBatteryVisible();

4
plugins/shutdown/shutdownplugin.h
View File

@ -52,8 +52,8 @@ public:
void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override;
void displayModeChanged(const Dock::DisplayMode displayMode) override;
int itemSortKey(const QString &itemKey);
void setSortKey(const QString &itemKey, const int order);
int itemSortKey(const QString &itemKey) Q_DECL_OVERRIDE;
void setSortKey(const QString &itemKey, const int order) Q_DECL_OVERRIDE;
private:
void requestContextMenu(const QString &itemKey);

24
plugins/trash/trashplugin.h
View File

@ -42,20 +42,20 @@ class TrashPlugin : public QObject, PluginsItemInterface
public:
explicit TrashPlugin(QObject *parent = 0);
const QString pluginName() const;
void init(PluginProxyInterface *proxyInter);
const QString pluginName() const Q_DECL_OVERRIDE;
void init(PluginProxyInterface *proxyInter) Q_DECL_OVERRIDE;
QWidget *itemWidget(const QString &itemKey);
QWidget *itemTipsWidget(const QString &itemKey);
QWidget *itemPopupApplet(const QString &itemKey);
const QString itemCommand(const QString &itemKey);
const QString itemContextMenu(const QString &itemKey);
void refreshIcon(const QString &itemKey);
void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked);
QWidget *itemWidget(const QString &itemKey) Q_DECL_OVERRIDE;
QWidget *itemTipsWidget(const QString &itemKey) Q_DECL_OVERRIDE;
QWidget *itemPopupApplet(const QString &itemKey) Q_DECL_OVERRIDE;
const QString itemCommand(const QString &itemKey) Q_DECL_OVERRIDE;
const QString itemContextMenu(const QString &itemKey) Q_DECL_OVERRIDE;
void refreshIcon(const QString &itemKey) Q_DECL_OVERRIDE;
void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) Q_DECL_OVERRIDE;
int itemSortKey(const QString &itemKey) override;
void setSortKey(const QString &itemKey, const int order) override;
void displayModeChanged(const Dock::DisplayMode displayMode);
int itemSortKey(const QString &itemKey) Q_DECL_OVERRIDE;
void setSortKey(const QString &itemKey, const int order) Q_DECL_OVERRIDE;
void displayModeChanged(const Dock::DisplayMode displayMode) Q_DECL_OVERRIDE;
private:
void showContextMenu();

14
plugins/trash/trashwidget.h
View File

@ -43,7 +43,7 @@ public:
QWidget *popupApplet();
QSize sizeHint() const;
QSize sizeHint() const Q_DECL_OVERRIDE;
const QString contextMenu() const;
int trashItemCount() const;
void invokeMenuItem(const QString &menuId, const bool checked);
@ -53,12 +53,12 @@ signals:
void requestContextMenu() const;
protected:
void dragEnterEvent(QDragEnterEvent *e) override;
void dragMoveEvent(QDragMoveEvent *e) override;
void dropEvent(QDropEvent *e) override;
void paintEvent(QPaintEvent *e);
void resizeEvent(QResizeEvent *e);
void mousePressEvent(QMouseEvent *e);
void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
private slots:
void removeApp(const QString &appKey);

2
plugins/tray/indicatortray.cpp
View File

@ -109,7 +109,7 @@ public:
void IndicatorTrayPrivate::init()
{
Q_Q(IndicatorTray);
//Q_Q(IndicatorTray);
indicatorTrayWidget = new IndicatorTrayWidget(itemKey);