fix deprecated warnings and adjust function calls

3rdparty/kcalendarcore/src/icalformat_p.cpp

@@ -1747,7 +1747,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
             // We can't change that -- in order to retain backwards compatibility.
             text = icalproperty_get_categories(p);
             const QString val = QString::fromUtf8(text);
-            const QStringList lstVal = val.split(QLatin1Char(','), QString::SkipEmptyParts);
+            const QStringList lstVal = val.split(QLatin1Char(','), Qt::SkipEmptyParts);
             for (const QString &cat : lstVal) {
                 // ensure no duplicates
                 if (!categories.contains(cat)) {

calendar-client/src/customWidget/cdateedit.cpp

@@ -115,7 +115,7 @@ void CDateEdit::slotRefreshLineEditTextFormat(const QString &text)
 {
     QFont font = lineEdit()->font();
     QFontMetrics fm(font);
-    int textWidth = fm.width(text);
+    int textWidth = fm.horizontalAdvance(text);
     int maxWidth = lineEdit()->width() - 25; //文本能正常显示的最大宽度
     if (textWidth > maxWidth) {
         setToolTip(text);
@@ -224,7 +224,7 @@ bool CDateEdit::showGongli()
 {
     QString str = m_strCurrrentDate;
     QFontMetrics fontMetrice(lineEdit()->font());
-    if (fontMetrice.width(str) > lineEdit()->width() - 20) {
+    if (fontMetrice.horizontalAdvance(str) > lineEdit()->width() - 20) {
         return false;
     }
     return true;

calendar-client/src/customWidget/cdynamicicon.cpp

@@ -4,7 +4,7 @@
 
 #include "cdynamicicon.h"
 
-#include <DHiDPIHelper>
+
 #include <DAboutDialog>
 #include <DLog>
 

calendar-client/src/customWidget/colorWidget/colorpickerWidget.cpp

@@ -117,7 +117,7 @@ void CColorPickerWidget::setLabelText() {
     }
     QString  str = m_strColorLabel;
     QFontMetrics fontMetrice(m_wordLabel->font());
-    if(fontMetrice.width(str) > (m_wordLabel->width()+4)) {
+    if(fontMetrice.horizontalAdvance(str) > (m_wordLabel->width()+4)) {
         str = fontMetrice.elidedText(str,Qt::ElideRight,m_wordLabel->width());
     }
     m_wordLabel->setText(str);

calendar-client/src/customWidget/colorseletorwidget.cpp

@@ -18,7 +18,7 @@ void ColorSeletorWidget::init()
     initView();
     m_colorGroup = new QButtonGroup(this);
     m_colorGroup->setExclusive(true);
-    connect(m_colorGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ColorSeletorWidget::slotButtonClicked);
+    connect(m_colorGroup, &QButtonGroup::idClicked, this, &ColorSeletorWidget::slotButtonClicked);
 
     m_colorInfo.reset(new DTypeColor());
 }

calendar-client/src/customWidget/cpushbutton.cpp

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "cpushbutton.h"
-#include <DApplicationHelper>
-#include <DHiDPIHelper>
+#include <DPaletteHelper>
+
 #include <DGuiApplicationHelper>
 #include <QMouseEvent>
 #include <QPainter>
@@ -28,7 +28,7 @@ CPushButton::CPushButton(QWidget *parent) : QWidget(parent)
     m_iconButton->setFixedSize(16, 16);
     m_iconButton->setFlat(true);
 
-    DPalette palette = DApplicationHelper::instance()->palette(this);
+    DPalette palette = DPaletteHelper::instance()->palette(this);
     QPalette pa = m_textLabel->palette();
 
     //设置深浅色主题下正常状态时的文本颜色，与下拉框颜色对其
@@ -78,7 +78,7 @@ void CPushButton::mouseReleaseEvent(QMouseEvent *event)
 void CPushButton::paintEvent(QPaintEvent *event)
 {
     QWidget::paintEvent(event);
-    DPalette palette = DApplicationHelper::instance()->palette(this);
+    DPalette palette = DPaletteHelper::instance()->palette(this);
     QPainter painter(this);
     // 反走样
     painter.setRenderHint(QPainter::Antialiasing);

calendar-client/src/customWidget/cradiobutton.cpp

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "cradiobutton.h"
-#include <DApplicationHelper>
+#include <DPaletteHelper>
 #include <QPainterPath>
 #include <QPainter>
 
@@ -49,7 +49,7 @@ void CRadioButton::paintEvent(QPaintEvent *event)
         painter.setBrush(c);
         painter.drawPath(path);
     } else {
-        DPalette palette = DApplicationHelper::instance()->palette(this);
+        DPalette palette = DPaletteHelper::instance()->palette(this);
         QPainterPath path;
         path.addEllipse(0, 0, w, h);
         path.addEllipse(2, 2, w - 4, h - 4);

calendar-client/src/customWidget/ctitlewidget.cpp

@@ -240,7 +240,7 @@ void CTitleWidget::resizeEvent(QResizeEvent *event)
     }
     QString str  = m_strPlaceHolder;
     QFontMetrics fontMetrice(m_searchEdit->font());
-    if (fontMetrice.width(str) > (m_searchEdit->width() - 30) && m_clickShowLeft == false && !m_buttonBox->isHidden()) {
+    if (fontMetrice.horizontalAdvance(str) > (m_searchEdit->width() - 30) && m_clickShowLeft == false && !m_buttonBox->isHidden()) {
         str = fontMetrice.elidedText(str, Qt::ElideRight, m_searchEdit->width() - 30);
         m_searchEdit->setPlaceHolder(str);
         m_searchEdit->setPlaceholderText(str);
@@ -263,7 +263,7 @@ void  CTitleWidget::updateSearchEditPlaceHolder()
 {
     QString str  = m_strPlaceHolder;
     QFontMetrics fontMetrice(m_searchEdit->font());
-    if (fontMetrice.width(str) > (m_searchEdit->width() - 30)) {
+    if (fontMetrice.horizontalAdvance(str) > (m_searchEdit->width() - 30)) {
         str = fontMetrice.elidedText(str, Qt::ElideRight, m_searchEdit->width() - 30);
         m_searchEdit->setPlaceHolder(str);
         m_searchEdit->setPlaceholderText(str);

calendar-client/src/customWidget/customframe.cpp

@@ -51,7 +51,7 @@ void CustomFrame::setTextStr(const QString &strc)
 
     if (!m_fixsizeflag) {
         QFontMetrics fm(m_font);
-        int w = fm.width(m_text);
+        int w = fm.horizontalAdvance(m_text);
         setMinimumWidth(w);
     }
     update();
@@ -69,7 +69,7 @@ void CustomFrame::setTextFont(const QFont &font)
 
     if (!m_fixsizeflag) {
         QFontMetrics fm(m_font);
-        int w = fm.width(m_text);
+        int w = fm.horizontalAdvance(m_text);
         setMinimumWidth(w);
     }
 }

calendar-client/src/customWidget/jobtypecombobox.cpp

@@ -19,7 +19,7 @@ JobTypeComboBox::JobTypeComboBox(QWidget *parent) : DComboBox(parent)
 {
     initUI();
     //不启用自动匹配
-    setAutoCompletion(false);
+    setCompleter(nullptr);
     //设置不接受回车键插入
     setInsertPolicy(QComboBox::NoInsert);
     this->view()->setTextElideMode(Qt::ElideRight);

calendar-client/src/customWidget/jobtypelistview.cpp

@@ -11,8 +11,9 @@
 #include "icalformat.h"
 #include "memorycalendar.h"
 
-#include <DHiDPIHelper>
+
 #include <DStyle>
+#include <DIcon>
 #include <DIconButton>
 #include <QToolTip>
 #include <QPainter>
@@ -149,12 +150,12 @@ bool JobTypeListView::viewportEvent(QEvent *event)
                         return true;
                     }
                     auto actionEdit = new DViewItemAction(Qt::AlignVCenter, QSize(20, 20), QSize(20, 20), true);
-                    actionEdit->setIcon(DHiDPIHelper::loadNxPixmap(":/icons/deepin/builtin/icons/dde_calendar_edit_32px.svg"));
+                    actionEdit->setIcon(DIcon::loadNxPixmap(":/icons/deepin/builtin/icons/dde_calendar_edit_32px.svg"));
                     actionEdit->setParent(this);
                     connect(actionEdit, &QAction::triggered, this, &JobTypeListView::slotUpdateJobType);
 
                     auto actionDelete = new DViewItemAction(Qt::AlignVCenter, QSize(20, 20), QSize(20, 20), true);
-                    actionDelete->setIcon(DHiDPIHelper::loadNxPixmap(":/icons/deepin/builtin/icons/dde_calendar_delete_32px.svg"));
+                    actionDelete->setIcon(DIcon::loadNxPixmap(":/icons/deepin/builtin/icons/dde_calendar_delete_32px.svg"));
                     actionDelete->setParent(this);
                     connect(actionDelete, &QAction::triggered, this, &JobTypeListView::slotDeleteJobType);
 
@@ -226,7 +227,6 @@ void JobTypeListView::slotImportScheduleType()
     KCalendarCore::ICalFormat icalformat;
     QTimeZone timezone = QDateTime::currentDateTime().timeZone();
     KCalendarCore::MemoryCalendar::Ptr cal(new KCalendarCore::MemoryCalendar(timezone));
-    auto ok = icalformat.load(cal, filename);
     auto typeID = cal->nonKDECustomProperty("X-DDE-CALENDAR-TYPE-ID");
     auto typeName = cal->nonKDECustomProperty("X-DDE-CALENDAR-TYPE-NAME");
     auto typeColor = cal->nonKDECustomProperty("X-DDE-CALENDAR-TYPE-COLOR");
@@ -453,7 +453,7 @@ void JobTypeListViewStyle::paint(QPainter *painter, const QStyleOptionViewItem &
     // 获取当前字体的信息
     QFontMetrics fontMetrics(opt.font);
     // 当前文字长度是否大于显示框长度
-    if (fontMetrics.width(displayName) > (opt.rect.width() - 90)) {
+    if (fontMetrics.horizontalAdvance(displayName) > (opt.rect.width() - 90)) {
         displayName = fontMetrics.elidedText(displayName, Qt::ElideRight, opt.rect.width() - 90); // 截取字符串长度用...代替
     }
     if (view && view->m_iIndexCurrentHover == index.row()) {

calendar-client/src/customWidget/lunarcalendarwidget.cpp

@@ -7,8 +7,7 @@
 
 #include <DPalette>
 #include <DStyle>
-#include <DApplicationHelper>
-#include <DApplicationHelper>
+#include <DPaletteHelper>
 
 #include <QLabel>
 #include <QTableView>
@@ -93,7 +92,7 @@ class CalenderStyle : public QProxyStyle
 
 QColor CalenderStyle::getColor(const QStyleOption *option, DPalette::ColorType type, const QWidget *widget) const
 {
-    const DPalette &pa = DApplicationHelper::instance()->palette(widget, option->palette);
+    const DPalette &pa = DPaletteHelper::instance()->palette(widget, option->palette);
     return pa.brush(type).color();
 }
 

calendar-client/src/customWidget/monthbrefwidget.cpp

@@ -7,7 +7,7 @@
 #include "scheduledatamanage.h"
 #include "calendarglobalenv.h"
 
-#include <DApplicationHelper>
+#include <DPaletteHelper>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QGridLayout>
@@ -263,14 +263,14 @@ void CMonthDayRectWidget::paintEvent(QPaintEvent *event)
     font.setPixelSize(int(r/20.0*12));
     painter.setFont(font);
 
-    QColor highColor = DApplicationHelper::instance()->palette(this).highlight().color();
+    QColor highColor = DPaletteHelper::instance()->palette(this).highlight().color();
 
     if (m_date == QDate::currentDate() && m_globaldata->isBelongMonth(m_date)) {
         //当天日期
         painter.setBrush(highColor);
         painter.setPen(Qt::NoPen);
         painter.drawEllipse(rectf);
-        painter.setPen(DApplicationHelper::instance()->palette(this).highlightedText().color());
+        painter.setPen(DPaletteHelper::instance()->palette(this).highlightedText().color());
         painter.drawText(rectf, Qt::AlignCenter, text);
     } else if (m_globaldata->isSelectedDate(m_date)) {
         //被选中的日期
@@ -321,13 +321,13 @@ void CMonthDayRectWidget::paintEvent(QPaintEvent *event)
 
     if (m_pressed) {
         //按下状态，绘制点击效果
-        painter.setBrush(DApplicationHelper::instance()->palette(this).text());
+        painter.setBrush(DPaletteHelper::instance()->palette(this).text());
         painter.setPen(Qt::NoPen);
         painter.setOpacity(0.3);
         painter.drawEllipse(rectf);
     } else if (m_hovered) {
         //悬浮状态，绘制悬浮效果
-        painter.setBrush(DApplicationHelper::instance()->palette(this).text());
+        painter.setBrush(DPaletteHelper::instance()->palette(this).text());
         painter.setOpacity(0.2);
         painter.setPen(Qt::NoPen);
         painter.drawEllipse(rectf);

calendar-client/src/customWidget/scheduleRemindWidget.cpp

@@ -118,7 +118,7 @@ void CenterWidget::UpdateTextList()
 {
     testList.clear();
     QFontMetrics metrics(textfont);
-    textwidth = metrics.width(m_ScheduleInfo->summary());
+    textwidth = metrics.horizontalAdvance(m_ScheduleInfo->summary());
     textheight = metrics.height();
     const int  h_count = qCeil(textwidth / textRectWidth);
     QString text;
@@ -131,7 +131,7 @@ void CenterWidget::UpdateTextList()
 
         for (int i = 0; i < m_ScheduleInfo->summary().count(); ++i) {
             text += m_ScheduleInfo->summary().at(i);
-            if (metrics.width(text) > textRectWidth) {
+            if (metrics.horizontalAdvance(text) > textRectWidth) {
                 text.remove(text.count() - 1, 1);
                 testList.append(text);
                 text = "";
@@ -172,7 +172,7 @@ void CenterWidget::paintEvent(QPaintEvent *e)
     QFontMetrics metrics(timeFont);
     if (m_ScheduleInfo->allDay())
         timestr = tr("All Day");
-    int timewidth = metrics.width(timestr);
+    int timewidth = metrics.horizontalAdvance(timestr);
     int timeheight = metrics.height();
 
     painter.drawText(QRect(x + 13, 7, timewidth, timeheight), Qt::AlignLeft | Qt::AlignTop, timestr);

calendar-client/src/customWidget/scheduleview.cpp

@@ -360,7 +360,7 @@ void CScheduleView::resizeEvent(QResizeEvent *event)
 
 void CScheduleView::wheelEvent(QWheelEvent *e)
 {
-    if (e->orientation() == Qt::Orientation::Horizontal) {
+    if (e->angleDelta().x() != 0) {
         emit signalAngleDelta(e->angleDelta().x());
     }
 }

calendar-client/src/customWidget/timeedit.cpp

@@ -157,7 +157,7 @@ void CTimeEdit::slotEditingFinished()
 void CTimeEdit::initUI()
 {
     //关闭自动补全
-    this->setAutoCompletion(false);
+    this->setCompleter(nullptr);
     //设置edit的宽度
     m_timeEdit->getLineEdit()->setFixedWidth(100);
     m_timeEdit->setDisplayFormat(m_timeFormat);
@@ -174,7 +174,7 @@ void CTimeEdit::initConnection()
     connect(m_timeEdit, &CCustomTimeEdit::signalUpdateFocus, this, &CTimeEdit::slotFocusDraw);
     connect(m_timeEdit->getLineEdit(), &QLineEdit::editingFinished, this,
             &CTimeEdit::slotEditingFinished);
-    connect(this, static_cast<void (CTimeEdit::*)(const QString &)>(&CTimeEdit::activated), this,
+    connect(this, &CTimeEdit::textActivated, this,
             &CTimeEdit::slotActivated);
 }
 
@@ -196,7 +196,7 @@ void CTimeEdit::showPopup()
         int maxLen = 0;
         QFontMetrics fontMet(view()->font());
         for (int i = 0 ; i < count() ; ++i) {
-            int &&itemWidth = fontMet.width(this->itemText(i));
+            int &&itemWidth = fontMet.horizontalAdvance(this->itemText(i));
             maxLen = qMax(maxLen, itemWidth);
         }
         maxLen += 45;   //选项前√占用的大小

calendar-client/src/dataManage/accountitem.cpp

@@ -315,8 +315,8 @@ void AccountItem::deleteSchedulesByTypeID(const QString &typeID, CallbackFunc ca
 
 void AccountItem::querySchedulesWithParameter(const int year, CallbackFunc callback)
 {
-    QDateTime start = QDateTime(QDate(year - 1, 12, 1));
-    QDateTime end = QDateTime(QDate(year + 1, 1, 31));
+    QDateTime start = QDate(year - 1, 12, 1).startOfDay();
+    QDateTime end = QDate(year + 1, 1, 31).startOfDay();
     querySchedulesWithParameter(start, end, callback);
 }
 

calendar-client/src/dataManage/calendarmanage.cpp

@@ -212,7 +212,7 @@ void CalendarManager::setYearBeginAndEndDate(const int year)
     QDate _firstDayOfDec(year, 12, 1);
     m_showDateRange.stopDate = getFirstDayOfWeek(_firstDayOfDec).addDays(42 - 1);
     //更新日程
-    gScheduleManager->resetSchedule(QDateTime(m_showDateRange.startDate), QDateTime(m_showDateRange.stopDate));
+    gScheduleManager->resetSchedule(m_showDateRange.startDate.startOfDay(), m_showDateRange.stopDate.startOfDay());
     if (m_showLunar) {
         //刷新农历和节假日信息
         gLunarManager->queryLunarInfo(m_showDateRange.startDate, m_showDateRange.stopDate);

calendar-client/src/dialog/myscheduleview.cpp

@@ -10,7 +10,7 @@
 #include "cscheduleoperation.h"
 #include "lunarmanager.h"
 
-#include <DHiDPIHelper>
+
 #include <DPalette>
 #include <DFontSizeManager>
 #include <DLabel>
@@ -63,8 +63,8 @@
     QFont labelF;
     labelF.setWeight(QFont::Medium);
     labelF = DFontSizeManager::instance()->get(DFontSizeManager::T6, labelF);
     QFontMetrics fm(labelF);
-    int titlewidth = fm.width(strText);
+    int titlewidth = fm.horizontalAdvance(strText);
     QStringList strList;
     QString str;
     int h = fm.height();
@@ -77,7 +77,7 @@
         for (int i = 0; i < strText.count(); i++) {
             str += strText.at(i);
 
-            if (fm.width(str) > 330) {
+            if (fm.horizontalAdvance(str) > 330) {
                 str.remove(str.count() - 1, 1);
                 strList.append(str);
                 resultStr += str + "\n";
@@ -108,7 +108,7 @@
         if (index != -1) {
             timeName[index - 1] = ' ';
             QFontMetrics fm(m_timeLabel->font());
-            int textWidth = fm.width(m_timeLabel->text());
+            int textWidth = fm.horizontalAdvance(m_timeLabel->text());
             if (textWidth > m_timeLabel->width()) {
                 timeName[index - 1] = '\n';
                 m_timeLabelH = 58;

calendar-client/src/dialog/schedulectrldlg.cpp

@@ -11,7 +11,7 @@
 
 #include <DMessageBox>
 #include <DPushButton>
-#include <DHiDPIHelper>
+
 #include <DPalette>
 #include <DFontSizeManager>
 
@@ -122,8 +122,8 @@ void CScheduleCtrlDlg::changeEvent(QEvent *event)
     QFontMetrics font_button(font);
     QFontMetrics font_firstLabel(font);
     QFontMetrics font_seconLabel(font);
-    int height_firstLabel = (font_firstLabel.width(m_firstLabel->text()) / 300 + 1) * font_firstLabel.height();
-    int height_seconLabel = (font_seconLabel.width(m_seconLabel->text()) / 300 + 1) * font_seconLabel.height();
+    int height_firstLabel = (font_firstLabel.horizontalAdvance(m_firstLabel->text()) / 300 + 1) * font_firstLabel.height();
+    int height_seconLabel = (font_seconLabel.horizontalAdvance(m_seconLabel->text()) / 300 + 1) * font_seconLabel.height();
 
     for (int i = 0; i < buttonCount(); i++) {
         QAbstractButton *button = getButton(i);