Qt5 compatibility fixed

psi-im · Mar 15, 2024 · c40fe52 · c40fe52
1 parent bc0af92
commit c40fe52
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 2 deletions.
diff --git a/src/contactlistmodel.cpp b/src/contactlistmodel.cpp
@@ -290,7 +290,11 @@ void ContactListModel::Private::clear()
 
     operationQueue.clear();
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QHashIterator<PsiContact *, QPersistentModelIndex> it(monitoredContacts);
+#else
     QMultiHashIterator<PsiContact *, QPersistentModelIndex> it(monitoredContacts);
+#endif
     while (it.hasNext()) {
         it.next();
         disconnect(it.key(), nullptr, this, nullptr);

diff --git a/src/pluginhost.cpp b/src/pluginhost.cpp
@@ -610,7 +610,11 @@ bool PluginHost::incomingXml(int account, const QDomElement &e)
             }
 
             // regex filters
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            QMapIterator<QRegularExpression, IqNamespaceFilter *> i(iqNsxFilters_);
+#else
             QMultiMapIterator<QRegularExpression, IqNamespaceFilter *> i(iqNsxFilters_);
+#endif
             while (!handled && i.hasNext()) {
                 if (i.key().match(ns).hasMatch() && (i.value()->*handler)(account, e)) {
                     handled = true;

diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
@@ -1055,7 +1055,11 @@ QString PluginManager::installChatLogJSDataFilter(const QString &js, PsiPlugin::
 
 void PluginManager::uninstallChatLogJSDataFilter(const QString &id)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QMutableMapIterator<PsiPlugin::Priority, std::pair<QString, QString>> it(_messageViewJSFilters);
+#else
     QMutableMultiMapIterator<PsiPlugin::Priority, std::pair<QString, QString>> it(_messageViewJSFilters);
+#endif
 
     while (it.hasNext()) {
         if (it.next().value().first == id) {

diff --git a/src/psicontactlistview.cpp b/src/psicontactlistview.cpp
@@ -34,6 +34,7 @@
 #include <QHelpEvent>
 #include <QLayout>
 #include <QMimeData>
+#include <QScreen>
 #include <QTimer>
 
 static const int           recalculateTimerTimeout = 500;

diff --git a/src/tabs/tabdlg.cpp b/src/tabs/tabdlg.cpp
@@ -39,6 +39,7 @@
 #include <QSignalMapper>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QVariant>
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
@@ -254,7 +255,11 @@ void TabDlg::tab_aboutToShowMenu(QMenu *menu)
     int tabDlgMetaType = qRegisterMetaType<TabDlg *>("TabDlg*");
     for (TabDlg *tabSet : tabManager_->tabSets()) {
         QAction *act = sendTo->addAction(tabSet->desiredCaption());
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+        act->setData(QVariant(tabDlgMetaType, &tabSet));
+#else
         act->setData(QVariant(QMetaType(tabDlgMetaType), &tabSet));
+#endif
         act->setEnabled(tabSet != this);
     }
     connect(sendTo, SIGNAL(triggered(QAction *)), SLOT(menu_sendTabTo(QAction *)));

diff --git a/src/widgets/emojidb.cpp b/src/widgets/emojidb.cpp
@@ -1,5 +1,8 @@
 // This is a generated file. See emoji.py for details
 // clang-format off
+#include "qglobal.h"
+#include "emojiregistry.h"
+#include <vector>
 static std::vector<EmojiRegistry::Group> db = {
     {
         QT_TR_NOOP("Smileys & Emotion"),

diff --git a/src/x11windowsystem.cpp b/src/x11windowsystem.cpp
@@ -16,7 +16,7 @@ namespace {
 bool isPlatformX11()
 {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    return QX11Info::isPlatformX11());
+    return QX11Info::isPlatformX11();
 #else
     auto x11app = qApp->nativeInterface<QNativeInterface::QX11Application>();
     return !!x11app;
@@ -73,7 +73,7 @@ static bool getCardinal32Prop(Display *display, Window win, char *propName, long
 auto getDisplay()
 {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    return QX11Info::display());
+    return QX11Info::display();
 #else
     auto x11app = qApp->nativeInterface<QNativeInterface::QX11Application>();
     return x11app->display();