From cf376ebb3f4fa075bfea571e570c28e68fc528bb Mon Sep 17 00:00:00 2001 From: donghualin Date: Fri, 4 Nov 2022 06:29:03 +0000 Subject: [PATCH] =?UTF-8?q?style:=20=E6=B6=88=E9=99=A4=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将代码中的过期的不建议使用的函数或类替换成建议使用的函数或类 Log: 消除编译警告 Influence: 无 Task: https://pms.uniontech.com/task-view-96831.html Change-Id: Ie42a3eed97013adb047105bcf75e07ff8e0277a0 --- frame/controller/proxyplugincontroller.cpp | 2 ++ frame/dbus/dbusdockadaptors.cpp | 2 +- frame/dbusinterface/types/zoneinfo.cpp | 2 +- frame/item/components/appsnapshot.cpp | 2 +- frame/pluginadapter/pluginadapter.cpp | 2 ++ frame/pluginadapter/pluginadapter.h | 1 + frame/pluginadapter/pluginsiteminterface_v20.h | 4 ++-- frame/util/utils.h | 4 ++-- frame/window/components/desktop_widget.cpp | 2 +- frame/window/tray/tray_model.cpp | 2 +- plugins/onboard/onboardplugin.cpp | 6 ++++-- .../overlay-warning/overlay-warning-plugin.cpp | 4 ++-- plugins/show-desktop/showdesktopplugin.cpp | 4 ++-- plugins/shutdown/shutdownplugin.cpp | 3 +-- plugins/sound/componments/volumeslider.cpp | 5 ++--- plugins/sound/sounditem.cpp | 2 +- plugins/trash/trashwidget.cpp | 15 ++++++++------- widgets/tipswidget.cpp | 4 ++-- 18 files changed, 36 insertions(+), 30 deletions(-) diff --git a/frame/controller/proxyplugincontroller.cpp b/frame/controller/proxyplugincontroller.cpp index f8a434188..d9a529b65 100644 --- a/frame/controller/proxyplugincontroller.cpp +++ b/frame/controller/proxyplugincontroller.cpp @@ -24,6 +24,7 @@ #include +#ifndef QT_DEBUG static QStringList getPathFromConf(const QString &key) { QSettings set("/etc/deepin/dde-dock.conf", QSettings::IniFormat); auto value = set.value(key).toString(); @@ -33,6 +34,7 @@ static QStringList getPathFromConf(const QString &key) { return QStringList(); } +#endif // 该方法用来设置所有的需要加载的插件的路径信息 static QMap getPluginPaths() diff --git a/frame/dbus/dbusdockadaptors.cpp b/frame/dbus/dbusdockadaptors.cpp index c85a6ecd5..8cca73401 100644 --- a/frame/dbus/dbusdockadaptors.cpp +++ b/frame/dbus/dbusdockadaptors.cpp @@ -116,7 +116,7 @@ QStringList DBusDockAdaptors::GetLoadedPlugins() } // 排序,保持和原先任务栏右键菜单中的插件列表顺序一致 - qSort(nameList.begin(), nameList.end(), [ = ] (const QString &name1, const QString &name2) { + std::sort(nameList.begin(), nameList.end(), [ = ] (const QString &name1, const QString &name2) { return name1 > name2; }); diff --git a/frame/dbusinterface/types/zoneinfo.cpp b/frame/dbusinterface/types/zoneinfo.cpp index 95b46df3a..20f987c60 100644 --- a/frame/dbusinterface/types/zoneinfo.cpp +++ b/frame/dbusinterface/types/zoneinfo.cpp @@ -40,7 +40,7 @@ bool ZoneInfo::operator ==(const ZoneInfo &what) const QDebug operator<<(QDebug argument, const ZoneInfo & info) { argument << info.m_zoneName << ',' << info.m_zoneCity << ',' << info.m_utcOffset << ','; - argument << info.i2 << ',' << info.i3 << ',' << info.i4 << endl; + argument << info.i2 << ',' << info.i3 << ',' << info.i4 << Qt::endl; return argument; } diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index a271fc617..25b6f01fc 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -118,7 +118,7 @@ void AppSnapshot::updateTitle() } QFontMetrics fm(m_3DtitleBtn->font()); - int textWidth = fm.width(title()) + 10 + BTN_TITLE_MARGIN; + int textWidth = fm.horizontalAdvance(title()) + 10 + BTN_TITLE_MARGIN; int titleWidth = SNAP_WIDTH - (TITLE_MARGIN * 2 + BORDER_MARGIN); if (textWidth < titleWidth) { diff --git a/frame/pluginadapter/pluginadapter.cpp b/frame/pluginadapter/pluginadapter.cpp index 2fc20b9b4..dc2b72375 100644 --- a/frame/pluginadapter/pluginadapter.cpp +++ b/frame/pluginadapter/pluginadapter.cpp @@ -148,6 +148,7 @@ PluginsItemInterface::PluginType PluginAdapter::type() case PluginsItemInterface_V20::PluginType::Normal: return PluginsItemInterface::PluginType::Normal; } + return PluginsItemInterface::PluginType::Normal; } PluginsItemInterface::PluginSizePolicy PluginAdapter::pluginSizePolicy() const @@ -158,6 +159,7 @@ PluginsItemInterface::PluginSizePolicy PluginAdapter::pluginSizePolicy() const case PluginsItemInterface_V20::PluginSizePolicy::System: return PluginsItemInterface::PluginSizePolicy::System; } + return PluginsItemInterface::PluginSizePolicy::Custom; } QIcon PluginAdapter::icon(const DockPart &dockPart) diff --git a/frame/pluginadapter/pluginadapter.h b/frame/pluginadapter/pluginadapter.h index a9afbfc91..ad9c2a271 100644 --- a/frame/pluginadapter/pluginadapter.h +++ b/frame/pluginadapter/pluginadapter.h @@ -33,6 +33,7 @@ class PluginAdapter : public QObject, public PluginsItemInterface { Q_OBJECT + Q_INTERFACES(PluginsItemInterface) public: PluginAdapter(PluginsItemInterface_V20 *pluginInter); diff --git a/frame/pluginadapter/pluginsiteminterface_v20.h b/frame/pluginadapter/pluginsiteminterface_v20.h index ba992fc22..913aa0e9d 100644 --- a/frame/pluginadapter/pluginsiteminterface_v20.h +++ b/frame/pluginadapter/pluginsiteminterface_v20.h @@ -253,9 +253,9 @@ protected: QT_BEGIN_NAMESPACE -#define ModuleInterface_iid "com.deepin.dock.PluginsItemInterface" +#define ModuleInterfaceV20_iid "com.deepin.dock.PluginsItemInterface" -Q_DECLARE_INTERFACE(PluginsItemInterface_V20, ModuleInterface_iid) +Q_DECLARE_INTERFACE(PluginsItemInterface_V20, ModuleInterfaceV20_iid) QT_END_NAMESPACE #endif // PLUGINSITEMINTERFACE_H diff --git a/frame/util/utils.h b/frame/util/utils.h index fd4cfdd33..57da80219 100644 --- a/frame/util/utils.h +++ b/frame/util/utils.h @@ -189,8 +189,8 @@ inline int comparePluginApi(const QString &pluginApi1, const QString &pluginApi2 return 0; // 拆分版本号 - QStringList subPluginApis1 = pluginApi1.split(".", QString::SkipEmptyParts, Qt::CaseSensitive); - QStringList subPluginApis2 = pluginApi2.split(".", QString::SkipEmptyParts, Qt::CaseSensitive); + QStringList subPluginApis1 = pluginApi1.split(".", Qt::SkipEmptyParts, Qt::CaseSensitive); + QStringList subPluginApis2 = pluginApi2.split(".", Qt::SkipEmptyParts, Qt::CaseSensitive); for (int i = 0; i < subPluginApis1.size(); ++i) { auto subPluginApi1 = subPluginApis1[i]; if (subPluginApis2.size() > i) { diff --git a/frame/window/components/desktop_widget.cpp b/frame/window/components/desktop_widget.cpp index f21911490..a16e53fc8 100644 --- a/frame/window/components/desktop_widget.cpp +++ b/frame/window/components/desktop_widget.cpp @@ -37,7 +37,7 @@ void DesktopWidget::enterEvent(QEvent *event) { if (checkNeedShowDesktop()) { m_needRecoveryWin = true; - QProcess::startDetached("/usr/lib/deepin-daemon/desktop-toggle"); + QProcess::startDetached("/usr/lib/deepin-daemon/desktop-toggle", QStringList()); } m_isHover = true; diff --git a/frame/window/tray/tray_model.cpp b/frame/window/tray/tray_model.cpp index 7911adfb7..aa460d4cc 100644 --- a/frame/window/tray/tray_model.cpp +++ b/frame/window/tray/tray_model.cpp @@ -711,7 +711,7 @@ void TrayModel::insertRow(int index, WinInfo info) const WinInfo &wininfo = m_winInfos[i]; if (wininfo.key == info.key) { beginResetModel(); - m_winInfos.swap(index, i); + m_winInfos.swapItemsAt(index, i); endResetModel(); return; } diff --git a/plugins/onboard/onboardplugin.cpp b/plugins/onboard/onboardplugin.cpp index d3c522b67..28496dbb1 100644 --- a/plugins/onboard/onboardplugin.cpp +++ b/plugins/onboard/onboardplugin.cpp @@ -126,7 +126,9 @@ void OnboardPlugin::invokedMenuItem(const QString &itemKey, const QString &menuI Q_UNUSED(itemKey) Q_UNUSED(checked) - if (menuId != "onboard-settings") return; + if (menuId != "onboard-settings") + return; + if(!m_startupState) { QProcess *process = new QProcess; connect(process,&QProcess::started, this, [ = ] { @@ -142,7 +144,7 @@ void OnboardPlugin::invokedMenuItem(const QString &itemKey, const QString &menuI process->close(); process->deleteLater(); }); - process->start("onboard-settings"); + process->start("onboard-settings", QStringList()); } DBusDock DockInter(serviceName, servicePath, QDBusConnection::sessionBus(), this); diff --git a/plugins/overlay-warning/overlay-warning-plugin.cpp b/plugins/overlay-warning/overlay-warning-plugin.cpp index 4c588418d..f6d8d2969 100644 --- a/plugins/overlay-warning/overlay-warning-plugin.cpp +++ b/plugins/overlay-warning/overlay-warning-plugin.cpp @@ -192,9 +192,9 @@ void OverlayWarningPlugin::showCloseOverlayDialogPre() void OverlayWarningPlugin::showCloseOverlayDialog() { qDebug() << "start disable overlayroot process"; - const int result = QProcess::execute("/usr/bin/pkexec /usr/sbin/overlayroot-disable"); + const int result = QProcess::execute("/usr/bin/pkexec /usr/sbin/overlayroot-disable", QStringList()); if (result == 0) { - QProcess::startDetached("reboot"); + QProcess::startDetached("reboot", QStringList()); } else { qDebug() << "disable overlayroot failed, the return code is" << result; } diff --git a/plugins/show-desktop/showdesktopplugin.cpp b/plugins/show-desktop/showdesktopplugin.cpp index 506c6ce55..526e14829 100644 --- a/plugins/show-desktop/showdesktopplugin.cpp +++ b/plugins/show-desktop/showdesktopplugin.cpp @@ -87,7 +87,7 @@ bool ShowDesktopPlugin::pluginIsDisable() const QString ShowDesktopPlugin::itemCommand(const QString &itemKey) { if (itemKey == pluginName()) - QProcess::startDetached("/usr/lib/deepin-daemon/desktop-toggle"); + QProcess::startDetached("/usr/lib/deepin-daemon/desktop-toggle", QStringList()); return QString(); } @@ -127,7 +127,7 @@ void ShowDesktopPlugin::invokedMenuItem(const QString &itemKey, const QString &m Q_UNUSED(checked) if (menuId == "show-desktop") { - QProcess::startDetached("/usr/lib/deepin-daemon/desktop-toggle"); + QProcess::startDetached("/usr/lib/deepin-daemon/desktop-toggle", QStringList()); } else if (menuId == "remove") { pluginStateSwitched(); } diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index a18263687..3461c244b 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -368,8 +368,7 @@ bool ShutdownPlugin::checkSwap() QTextStream stream(body.toUtf8()); while (!stream.atEnd()) { const std::pair result = - checkIsPartitionType(stream.readLine().simplified().split( - " ", QString::SplitBehavior::SkipEmptyParts)); + checkIsPartitionType(stream.readLine().simplified().split(" ", Qt::SkipEmptyParts)); qint64 image_size{ get_power_image_size() }; if (result.first) { diff --git a/plugins/sound/componments/volumeslider.cpp b/plugins/sound/componments/volumeslider.cpp index 15e6ade6d..f21af93af 100644 --- a/plugins/sound/componments/volumeslider.cpp +++ b/plugins/sound/componments/volumeslider.cpp @@ -71,8 +71,7 @@ void VolumeSlider::mouseMoveEvent(QMouseEvent *e) void VolumeSlider::mouseReleaseEvent(QMouseEvent *e) { - if (e->button() == Qt::LeftButton) - { + if (e->button() == Qt::LeftButton) { m_pressed = false; emit requestPlaySoundEffect(); } @@ -84,7 +83,7 @@ void VolumeSlider::wheelEvent(QWheelEvent *e) m_timer->start(); - DSlider::setValue(value() + (e->delta() > 0 ? 2 : -2)); + DSlider::setValue(value() + (e->angleDelta().y() > 0 ? 2 : -2)); } void VolumeSlider::onTimeout() diff --git a/plugins/sound/sounditem.cpp b/plugins/sound/sounditem.cpp index 1872af7d9..2b046ac28 100644 --- a/plugins/sound/sounditem.cpp +++ b/plugins/sound/sounditem.cpp @@ -166,7 +166,7 @@ void SoundItem::resizeEvent(QResizeEvent *e) void SoundItem::wheelEvent(QWheelEvent *e) { - QWheelEvent *event = new QWheelEvent(e->pos(), e->delta(), e->buttons(), e->modifiers()); + QWheelEvent *event = new QWheelEvent(e->position(), e->angleDelta().y(), e->buttons(), e->modifiers()); qApp->postEvent(m_applet->mainSlider(), event); e->accept(); diff --git a/plugins/trash/trashwidget.cpp b/plugins/trash/trashwidget.cpp index 6e0e44ae3..a399b6499 100644 --- a/plugins/trash/trashwidget.cpp +++ b/plugins/trash/trashwidget.cpp @@ -27,6 +27,8 @@ #include "constants.h" #include "trashwidget.h" +#include + #include #include #include @@ -239,13 +241,12 @@ void TrashWidget::setDragging(bool state) void TrashWidget::removeApp(const QString &appKey) { - const QString cmd("dbus-send --print-reply --dest=org.deepin.dde.Launcher1 /org/deepin/dde/Launcher1 org.deepin.dde.Launcher1.UninstallApp string:\"" + appKey + "\""); - - QProcess *proc = new QProcess; - proc->start(cmd); - proc->waitForFinished(); - - proc->deleteLater(); + DDBusSender().service("org.deepin.dde.Launcher1") + .path("/org/deepin/dde/Launcher1") + .interface("org.deepin.dde.Launcher1") + .method("UninstallApp") + .arg(appKey) + .call(); } void TrashWidget::moveToTrash(const QUrl &url) diff --git a/widgets/tipswidget.cpp b/widgets/tipswidget.cpp index 1bdb90add..6e5e4907a 100644 --- a/widgets/tipswidget.cpp +++ b/widgets/tipswidget.cpp @@ -26,7 +26,7 @@ void TipsWidget::setText(const QString &text) m_text = "བོད་སྐད་ཡིག་གཟུགས་ཚད་ལེན་ཚོད་ལྟའི་སྐོར་གྱི་རྗོད་ཚིག"; #endif - setFixedSize(fontMetrics().width(m_text) + 20, fontMetrics().boundingRect(m_text).height()); + setFixedSize(fontMetrics().horizontalAdvance(m_text) + 20, fontMetrics().boundingRect(m_text).height()); update(); @@ -46,7 +46,7 @@ void TipsWidget::setTextList(const QStringList &textList) int width = 0; int height = 0; for (QString text : m_textList) { - width = qMax(width, fontMetrics().width(text) + 20); + width = qMax(width, fontMetrics().horizontalAdvance(text) + 20); height += fontMetrics().boundingRect(text).height(); }