Fixed deprecation warnings

psi-im · Mar 17, 2024 · 4b93355 · 4b93355
1 parent ebd549c
commit 4b93355
Show file tree

Hide file tree

Showing 22 changed files with 191 additions and 138 deletions.
diff --git a/3rdparty/qite b/3rdparty/qite
diff --git a/iris b/iris
diff --git a/src/avcall/jinglertp.cpp b/src/avcall/jinglertp.cpp
@@ -601,7 +601,7 @@ class JingleRtpPrivate : public QObject {
                     iceA_status.remotePassword = audioContent->trans.pass;
                 }
 
-                printf("audio candidates=%d\n", audioContent->trans.candidates.count());
+                printf("audio candidates=%lld\n", audioContent->trans.candidates.count());
                 iceA_status.remoteCandidates += audioContent->trans.candidates;
             }
             if (videoContent) {
@@ -610,7 +610,7 @@ class JingleRtpPrivate : public QObject {
                     iceV_status.remotePassword = videoContent->trans.pass;
                 }
 
-                printf("video candidates=%d\n", videoContent->trans.candidates.count());
+                printf("video candidates=%lld\n", videoContent->trans.candidates.count());
                 iceV_status.remoteCandidates += videoContent->trans.candidates;
             }
 

diff --git a/src/coloropt.cpp b/src/coloropt.cpp
@@ -94,9 +94,9 @@ ColorOpt *ColorOpt::instance()
 {
     if (!instance_)
         instance_.reset(new ColorOpt());
-    return instance_.data();
+    return instance_.get();
 }
 
 void ColorOpt::reset() { instance_.reset(nullptr); }
 
-QScopedPointer<ColorOpt> ColorOpt::instance_;
+std::unique_ptr<ColorOpt> ColorOpt::instance_;
diff --git a/src/coloropt.h b/src/coloropt.h
@@ -52,6 +52,6 @@ private slots:
     void optionChanged(const QString &opt);
 
 private:
-    static QScopedPointer<ColorOpt> instance_;
-    QHash<QString, ColorData>       colors;
+    static std::unique_ptr<ColorOpt> instance_;
+    QHash<QString, ColorData>        colors;
 };
diff --git a/src/filesharingdownloader.cpp b/src/filesharingdownloader.cpp
@@ -400,7 +400,7 @@ class FileShareDownloader::Private : public QObject {
     Jingle::FileTransfer::File   file;
     QList<Jid>                   jids;
     QStringList                  uris; // sorted from low priority to high.
-    QScopedPointer<QFile>        tmpFile;
+    std::unique_ptr<QFile>       tmpFile;
     QString                      dstFileName;
     QString                      lastError;
     qint64                       rangeStart  = 0;

diff --git a/src/filesharingdownloader.h b/src/filesharingdownloader.h
@@ -71,5 +71,5 @@ class FileShareDownloader : public QIODevice {
 
 private:
     class Private;
-    QScopedPointer<Private> d;
+    std::unique_ptr<Private> d;
 };
diff --git a/src/filesharingmanager.h b/src/filesharingmanager.h
@@ -98,7 +98,7 @@ public slots:
 
 private:
     class Private;
-    QScopedPointer<Private> d;
+    std::unique_ptr<Private> d;
 };
 
 class FileSharingDeviceOpener : public ITEMediaOpener {

diff --git a/src/main.cpp b/src/main.cpp
@@ -204,9 +204,9 @@ void PsiMain::chooseProfile()
     PsiIconset::instance()->loadSystem();
 
     while (1) {
-        QScopedPointer<ProfileOpenDlg> w(new ProfileOpenDlg(lastProfile,
-                                                            TranslationManager::instance()->availableTranslations(),
-                                                            TranslationManager::instance()->currentLanguage()));
+        std::unique_ptr<ProfileOpenDlg> w(new ProfileOpenDlg(lastProfile,
+                                                             TranslationManager::instance()->availableTranslations(),
+                                                             TranslationManager::instance()->currentLanguage()));
         w->ck_auto->setChecked(autoOpen);
         int r = w->exec();
         // lang change

diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp
@@ -224,7 +224,8 @@ void MUCConfigDlg::apply()
 void MUCConfigDlg::destroy()
 {
     int i = QMessageBox::warning(this, tr("Destroy room"),
-                                 tr("Are you absolutely certain you want to destroy this room?"), tr("Yes"), tr("No"));
+                                 tr("Are you absolutely certain you want to destroy this room?"),
+                                 QMessageBox::Yes | QMessageBox::No);
     if (i == 0) {
         manager_->destroy();
     }

diff --git a/src/multifiletransferdelegate.cpp b/src/multifiletransferdelegate.cpp
@@ -312,7 +312,11 @@ bool MultiFileTransferDelegate::editorEvent(QEvent *event, QAbstractItemModel *m
             connect(menu->addAction(tr("Open Destination Folder")), &QAction::triggered, this,
                     [model, index]() { model->setData(index, 1, MultiFileTransferModel::OpenDirRole); });
         }
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         menu->popup(me->globalPos());
+#else
+        menu->popup(me->globalPosition().toPoint());
+#endif
         return true;
     }
     return false;

diff --git a/src/multifiletransferdlg.h b/src/multifiletransferdlg.h
@@ -21,7 +21,6 @@
 #define MULTIFILETRANSFERDLG_H
 
 #include <QDialog>
-#include <QScopedPointer>
 
 class MultiFileTransferItem;
 class PsiAccount;
@@ -83,7 +82,7 @@ class MultiFileTransferDlg : public QDialog {
 private:
     Ui::MultiFileTransferDlg *ui;
     class Private;
-    QScopedPointer<Private> d;
+    std::unique_ptr<Private> d;
 };
 
 #endif // MULTIFILETRANSFERDLG_H
diff --git a/src/multifiletransferitem.h b/src/multifiletransferitem.h
@@ -22,8 +22,6 @@
 
 #include "multifiletransfermodel.h"
 
-#include <QScopedPointer>
-
 class MultiFileTransferItem : public QObject {
     Q_OBJECT
 public:
@@ -71,7 +69,7 @@ public slots:
 private:
     friend class MultiFileTransferModel;
     struct Private;
-    QScopedPointer<Private> d;
+    std::unique_ptr<Private> d;
 };
 
 #endif // MULTIFILETRANSFERITEM_H
diff --git a/src/options/opt_appearance.cpp b/src/options/opt_appearance.cpp
@@ -27,7 +27,14 @@ class OptAppearanceUI : public QWidget, public Ui::OptAppearance {
 
 class OptAppearanceMiscUI : public QWidget, public Ui::OptAppearanceMisc {
 public:
-    OptAppearanceMiscUI() : QWidget() { setupUi(this); }
+    OptAppearanceMiscUI() : QWidget()
+    {
+        // we could do that in UI. but see https://bugreports.qt.io/browse/QTBUG-123373
+        QObject::connect(sl_rosterop, &QSlider::valueChanged, lb_rosterop_val, qOverload<int>(&QLabel::setNum));
+        QObject::connect(sl_chatdlgop, &QSlider::valueChanged, lb_chatdlgop_val, qOverload<int>(&QLabel::setNum));
+
+        setupUi(this);
+    }
 };
 
 //----------------------------------------------------------------------------

diff --git a/src/options/opt_appearance_misc.ui b/src/options/opt_appearance_misc.ui
@@ -1,49 +1,47 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>OptAppearanceMisc</class>
- <widget class="QWidget" name="OptAppearanceMisc" >
-  <property name="geometry" >
+ <widget class="QWidget" name="OptAppearanceMisc">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>354</width>
     <height>189</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>OptAppearanceMiscUI</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin" stdset="0">
+    <number>9</number>
+   </property>
    <item>
-    <widget class="QGroupBox" name="groupBox4" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox4">
+     <property name="title">
       <string>Headings</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin" stdset="0">
        <number>8</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="ck_newHeadings" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="ck_newHeadings">
+        <property name="text">
          <string>Slim group headings</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="ck_outlineHeadings" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="ck_outlineHeadings">
+        <property name="text">
          <string>Outline headings</string>
         </property>
        </widget>
@@ -52,85 +50,85 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="gb_opacity" >
-     <property name="title" >
+    <widget class="QGroupBox" name="gb_opacity">
+     <property name="title">
       <string>Opacity</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin" stdset="0">
        <number>8</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="1" >
-       <widget class="QSlider" name="sl_chatdlgop" >
-        <property name="minimum" >
+      <item row="1" column="1">
+       <widget class="QSlider" name="sl_chatdlgop">
+        <property name="minimum">
          <number>10</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QLabel" name="lb_chatdlgop_val" >
-        <property name="minimumSize" >
+      <item row="1" column="2">
+       <widget class="QLabel" name="lb_chatdlgop_val">
+        <property name="minimumSize">
          <size>
           <width>30</width>
           <height>0</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>100</string>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSlider" name="sl_rosterop" >
-        <property name="minimum" >
+      <item row="0" column="1">
+       <widget class="QSlider" name="sl_rosterop">
+        <property name="minimum">
          <number>10</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="lb_rosterop" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="lb_rosterop">
+        <property name="text">
          <string>Roster opacity:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="lb_rosterop_val" >
-        <property name="minimumSize" >
+      <item row="0" column="2">
+       <widget class="QLabel" name="lb_rosterop_val">
+        <property name="minimumSize">
          <size>
           <width>30</width>
           <height>0</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>100</string>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="lb_chatdlgop" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="lb_chatdlgop">
+        <property name="text">
          <string>Chat dialog opacity:</string>
         </property>
        </widget>
@@ -140,46 +138,13 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>ck_outlineHeadings</tabstop>
   <tabstop>ck_newHeadings</tabstop>
   <tabstop>sl_rosterop</tabstop>
   <tabstop>sl_chatdlgop</tabstop>
  </tabstops>
  <resources/>
- <connections>
-  <connection>
-   <sender>sl_rosterop</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>lb_rosterop_val</receiver>
-   <slot>setNum(int)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>208</x>
-     <y>134</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>320</x>
-     <y>134</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>sl_chatdlgop</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>lb_chatdlgop_val</receiver>
-   <slot>setNum(int)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>208</x>
-     <y>159</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>320</x>
-     <y>159</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
+4 −0		libqite/qite.cpp
+2 −2		libqite/qite.h
+16 −11		libqite/qiteaudio.cpp
+3 −3		libqite/qiteaudio.h
+20 −25		libqite/qiteaudiorecorder.cpp
+15 −16		libqite/qiteaudiorecorder.h
+1 −5		mainwindow.cpp
+3 −3		mainwindow.h
+5 −3		3rdparty/stringprep/stringprep.cpp
+12 −0		src/irisnet/corelib/objectsession.cpp
+1 −1		src/irisnet/noncore/cutestuff/httppoll.cpp
+3 −3		src/irisnet/noncore/ice176.cpp
+10 −10		src/irisnet/noncore/stunbinding.cpp
+1 −1		src/irisnet/noncore/stuntypes.cpp
+1 −1		src/irisnet/noncore/tcpportreserver.h
+2 −2		src/xmpp/jid/jid.cpp
+2 −3		src/xmpp/jid/jid.h
+3 −3		src/xmpp/xmpp-im/jingle-application.h
+1 −1		src/xmpp/xmpp-im/jingle-ft.h
+2 −2		src/xmpp/xmpp-im/jingle-ibb.h
+4 −7		src/xmpp/xmpp-im/jingle-ice.cpp
+2 −2		src/xmpp/xmpp-im/jingle-ice.h
+2 −2		src/xmpp/xmpp-im/jingle-s5b.h
+1 −2		src/xmpp/xmpp-im/jingle-sctp.h
+4 −4		src/xmpp/xmpp-im/jingle-session.cpp
+1 −1		src/xmpp/xmpp-im/jingle-session.h
+3 −3		src/xmpp/xmpp-im/jingle.cpp
+1 −1		src/xmpp/xmpp-im/jingle.h
+1 −1		src/xmpp/xmpp-im/s5b.cpp
+1 −1		src/xmpp/xmpp-im/s5b.h
+1 −1		src/xmpp/xmpp-im/xmpp_hash.cpp
+4 −0		src/xmpp/xmpp-im/xmpp_xmlcommon.cpp