From e87294f77ebcce044a7d9bb20b7c0ed5c7906c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= Date: Fri, 12 Jun 2020 09:51:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(compilewarning):=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BC=96=E8=AF=91=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 编译过程中会由告警信息，目前绝大部分已修复，但DImageButton类因为暂无完全替代的类，还未处理 Log: 解决部分编译告警 --- frame/util/imageutil.cpp | 1 + frame/util/utils.h | 6 ++-- frame/window/mainwindow.cpp | 31 ------------------- plugins/datetime/datetimeplugin.cpp | 2 +- plugins/network/item/wireditem.cpp | 1 + plugins/network/item/wirelessitem.cpp | 1 + plugins/network/networkitem.cpp | 4 +++ plugins/power/powerstatuswidget.cpp | 6 ++-- plugins/sound/sinkinputwidget.cpp | 2 +- plugins/trash/popupcontrolwidget.cpp | 13 ++++---- .../containers/normalcontainer.cpp | 10 +++--- 11 files changed, 26 insertions(+), 51 deletions(-) diff --git a/frame/util/imageutil.cpp b/frame/util/imageutil.cpp index cd5e8b7a9..25e076695 100644 --- a/frame/util/imageutil.cpp +++ b/frame/util/imageutil.cpp @@ -55,4 +55,5 @@ const QPixmap ImageUtil::loadSvg(const QString &iconName, const QSize size, cons pixmap.setDevicePixelRatio(ratio); return pixmap; } + return QPixmap(); } diff --git a/frame/util/utils.h b/frame/util/utils.h index 66d014fc4..d9c27afe3 100644 --- a/frame/util/utils.h +++ b/frame/util/utils.h @@ -4,7 +4,7 @@ #include namespace Utils { - static QPixmap renderSVG(const QString &path, const QSize &size, const qreal devicePixelRatio) { + inline QPixmap renderSVG(const QString &path, const QSize &size, const qreal devicePixelRatio) { QImageReader reader; QPixmap pixmap; reader.setFileName(path); @@ -20,7 +20,7 @@ namespace Utils { return pixmap; } - static QScreen * screenAt(const QPoint &point) { + inline QScreen * screenAt(const QPoint &point) { for (QScreen *screen : qApp->screens()) { const QRect r { screen->geometry() }; const QRect rect { r.topLeft(), r.size() * screen->devicePixelRatio() }; @@ -32,7 +32,7 @@ namespace Utils { return nullptr; } - static QScreen * screenAtByScaled(const QPoint &point) { + inline QScreen * screenAtByScaled(const QPoint &point) { for (QScreen *screen : qApp->screens()) { if (screen->geometry().contains(point)) { return screen; diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 4bc2b1580..07da0e881 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -468,37 +468,6 @@ void MainWindow::internalMove(const QPoint &p) m_mainPanel->move(0, 0); return QWidget::move(p); } - - - QPoint rp = rawXPosition(p); - const auto ratio = devicePixelRatioF(); - - const QRect &r = m_settings->primaryRawRect(); - switch (m_curDockPos) { - case Left: rp.setX(r.x()); break; - case Top: rp.setY(r.y()); break; - case Right: rp.setX(r.right() - 1); break; - case Bottom: rp.setY(r.bottom() - 1); break; - } - - int hx = height() * ratio, wx = width() * ratio; - if (m_settings->hideMode() != HideMode::KeepShowing && - isHide && - m_panelHideAni->state() == QVariantAnimation::Stopped && - m_panelShowAni->state() == QVariantAnimation::Stopped) { - switch (m_curDockPos) { - case Top: - case Bottom: - hx = 2; - break; - case Left: - case Right: - wx = 2; - } - } - - // using platform window to set real window position -// windowHandle()->handle()->setGeometry(QRect(rp.x(), rp.y(), wx, hx)); } void MainWindow::initConnections() diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 4bd06c288..623d3c449 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -33,8 +33,8 @@ DatetimePlugin::DatetimePlugin(QObject *parent) : QObject(parent) - , m_pluginLoaded(false) , m_interface(nullptr) + , m_pluginLoaded(false) { QDBusConnection sessionBus = QDBusConnection::sessionBus(); sessionBus.connect("com.deepin.daemon.Timedate", "/com/deepin/daemon/Timedate", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(propertiesChanged())); diff --git a/plugins/network/item/wireditem.cpp b/plugins/network/item/wireditem.cpp index 92dc0039f..6686f5fdf 100644 --- a/plugins/network/item/wireditem.cpp +++ b/plugins/network/item/wireditem.cpp @@ -148,6 +148,7 @@ WiredItem::WiredStatus WiredItem::getDeviceState() case NetworkDevice::Deactivation: case NetworkDevice::Failed: return Failed; } + Q_UNREACHABLE(); } QJsonObject WiredItem::getActiveWiredConnectionInfo() diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp index d45582493..858fc1b13 100644 --- a/plugins/network/item/wirelessitem.cpp +++ b/plugins/network/item/wirelessitem.cpp @@ -131,6 +131,7 @@ WirelessItem::WirelessStatus WirelessItem::getDeviceState() case NetworkDevice::Deactivation: case NetworkDevice::Failed: return Failed; } + Q_UNREACHABLE(); } QJsonObject &WirelessItem::getConnectedApInfo() diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp index b3dd57b17..b6ecc30c5 100644 --- a/plugins/network/networkitem.cpp +++ b/plugins/network/networkitem.cpp @@ -1245,6 +1245,8 @@ bool NetworkItem::isShowControlCenter() case Adisabled: case Bdisabled: return true; + default: + break; } } else { switch (m_pluginState) { @@ -1255,6 +1257,8 @@ bool NetworkItem::isShowControlCenter() case Disconnected: case Disabled: return true; + default: + break; } } diff --git a/plugins/power/powerstatuswidget.cpp b/plugins/power/powerstatuswidget.cpp index 69048968e..db128e04e 100644 --- a/plugins/power/powerstatuswidget.cpp +++ b/plugins/power/powerstatuswidget.cpp @@ -65,9 +65,9 @@ void PowerStatusWidget::paintEvent(QPaintEvent *e) QPixmap PowerStatusWidget::getBatteryIcon() { const BatteryPercentageMap data = m_powerInter->batteryPercentage(); - const uint value = qMin(100.0, qMax(0.0, data.value("Display"))); - const int percentage = std::round(value); - const int batteryState = m_powerInter->batteryState()["Display"]; + const uint value = uint(qMin(100.0, qMax(0.0, data.value("Display")))); + const int percentage = int(std::round(value)); +// const int batteryState = m_powerInter->batteryState()["Display"]; const bool plugged = !m_powerInter->onBattery(); /*根据新需求，电池电量显示分别是*/ diff --git a/plugins/sound/sinkinputwidget.cpp b/plugins/sound/sinkinputwidget.cpp index d5611a79a..216a29408 100644 --- a/plugins/sound/sinkinputwidget.cpp +++ b/plugins/sound/sinkinputwidget.cpp @@ -47,9 +47,9 @@ const QPixmap getIconFromTheme(const QString &name, const QSize &size, const qre SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent) : QWidget(parent) , m_inputInter(new DBusSinkInput(inputPath, this)) + , m_appBtn(new DImageButton(this)) , m_volumeBtnMin(new DImageButton(this)) , m_volumeIconMax(new QLabel(this)) - , m_appBtn(new DImageButton(this)) , m_volumeSlider(new VolumeSlider(this)) , m_volumeLabel(new TipsWidget(this)) { diff --git a/plugins/trash/popupcontrolwidget.cpp b/plugins/trash/popupcontrolwidget.cpp index 12e5a8747..a841c7c88 100644 --- a/plugins/trash/popupcontrolwidget.cpp +++ b/plugins/trash/popupcontrolwidget.cpp @@ -97,21 +97,21 @@ void PopupControlWidget::clearTrashFloder() } QDir dir(TrashDir + "/files");//QDir::homePath() + "/.local/share/Trash/files"); - uint count = dir.entryList(ItemsShouldCount).count(); + uint count = uint(dir.entryList(ItemsShouldCount).count()); int execCode = -1; if (count > 0) { // blumia: Workaround. There is a bug with DDialog which will let DDialog always use the smallest - // available size of the given icon. So we create a m_dialogTrashFullIcon and leave a minimum + // available size of the given icon. So we create a dialogTrashFullIcon and leave a minimum // 64*64 pixmap size icon here. - QIcon m_dialogTrashFullIcon; + QIcon dialogTrashFullIcon; QIcon trash_full_icon = QIcon::fromTheme("user-trash-full-opened"); - m_dialogTrashFullIcon.addPixmap(trash_full_icon.pixmap(64)); - m_dialogTrashFullIcon.addPixmap(trash_full_icon.pixmap(128)); + dialogTrashFullIcon.addPixmap(trash_full_icon.pixmap(64)); + dialogTrashFullIcon.addPixmap(trash_full_icon.pixmap(128)); d.setTitle(ClearTrashMutliple.arg(count)); d.setMessage(qApp->translate("DialogManager", "This action cannot be restored")); - d.setIcon(m_dialogTrashFullIcon, QSize(64, 64)); + d.setIcon(dialogTrashFullIcon); d.addButton(buttonTexts[0], true, DDialog::ButtonNormal); d.addButton(buttonTexts[1], false, DDialog::ButtonWarning); d.setDefaultButton(1); @@ -128,7 +128,6 @@ void PopupControlWidget::clearTrashFloder() } else { qWarning() << "Clear trash failed"; } -// DFMGlobal::instance()->clearTrash(); } int PopupControlWidget::trashItemCount() const diff --git a/plugins/tray/fashiontray/containers/normalcontainer.cpp b/plugins/tray/fashiontray/containers/normalcontainer.cpp index 412110ee7..3bd1f51d8 100644 --- a/plugins/tray/fashiontray/containers/normalcontainer.cpp +++ b/plugins/tray/fashiontray/containers/normalcontainer.cpp @@ -159,12 +159,12 @@ int NormalContainer::itemCount() void NormalContainer::setExpand(const bool expand) { - int itemSize; +// int itemSize; - if (dockPosition() == Dock::Position::Top || dockPosition() == Dock::Position::Bottom) - itemSize = std::min(parentWidget()->height(), PLUGIN_BACKGROUND_MAX_SIZE); - else - itemSize = std::min(parentWidget()->width(), PLUGIN_BACKGROUND_MAX_SIZE); +// if (dockPosition() == Dock::Position::Top || dockPosition() == Dock::Position::Bottom) +// itemSize = std::min(parentWidget()->height(), PLUGIN_BACKGROUND_MAX_SIZE); +// else +// itemSize = std::min(parentWidget()->width(), PLUGIN_BACKGROUND_MAX_SIZE); for (auto w : wrapperList()) { w->setAttention(false);