From f5eb41e2a13bc996df7a1229c9264eca9cc762d1 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 13 Aug 2020 12:02:38 -0400
Subject: [PATCH] misc: remove Qt version macros wrapping metatype declarations
We've committed to Qt 5.15 as a minumum requirement for this client
for now.
Gitlab: #581
Change-Id: If3fd6a7bcb4a02dec31ad4e26b41f7650230cc28
---
src/accountadapter.h | 2 --
src/clientwrapper.h | 2 --
src/lrcinstance.h | 2 --
src/rendermanager.h | 2 --
src/settingsadaptor.h | 2 --
src/utils.h | 2 --
6 files changed, 12 deletions(-)
diff --git a/src/accountadapter.h b/src/accountadapter.h
index 7ebc19a6c..10e4fa9f6 100644
--- a/src/accountadapter.h
+++ b/src/accountadapter.h
@@ -123,6 +123,4 @@ private:
QMetaObject::Connection contactAddedConnection_;
QMetaObject::Connection addedToConferenceConnection_;
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(AccountAdapter *)
-#endif
diff --git a/src/clientwrapper.h b/src/clientwrapper.h
index 681c35eee..0ca94f1d9 100644
--- a/src/clientwrapper.h
+++ b/src/clientwrapper.h
@@ -94,6 +94,4 @@ signals:
void contactModelChanged();
void deviceModelChanged();
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(ClientWrapper *)
-#endif
diff --git a/src/lrcinstance.h b/src/lrcinstance.h
index 262bb1401..a6594d926 100644
--- a/src/lrcinstance.h
+++ b/src/lrcinstance.h
@@ -472,6 +472,4 @@ private:
MapStringString contentDrafts_;
MapStringString lastConferencees_;
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(LRCInstance *)
-#endif
diff --git a/src/rendermanager.h b/src/rendermanager.h
index edb6017e9..c3c3f1642 100644
--- a/src/rendermanager.h
+++ b/src/rendermanager.h
@@ -277,6 +277,4 @@ private:
*/
AVModel &avModel_;
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(RenderManager *)
-#endif
diff --git a/src/settingsadaptor.h b/src/settingsadaptor.h
index 38a655f54..b342b9bfd 100644
--- a/src/settingsadaptor.h
+++ b/src/settingsadaptor.h
@@ -238,6 +238,4 @@ public:
Q_INVOKABLE void set_FileUserCert(QString text);
Q_INVOKABLE void set_FilePrivateKey(QString text);
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(SettingsAdaptor *)
-#endif
diff --git a/src/utils.h b/src/utils.h
index 28f3ef01e..f97d0d61c 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -560,6 +560,4 @@ public:
private:
QClipboard *clipboard_;
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(UtilsAdapter *)
-#endif
--
GitLab