GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r285:d6942e8f24d6

Centralization of qregistermetatype management

Alexandre Leroux -

r285:d6942e8f24d6

parent child

Context file:

r285:d6942e8f24d6

core/include/Common/MetaTypes.h created 644 +46 0

@@ -0,0 +1,46
	1	#ifndef SCIQLOP_METATYPES_H
	2	#define SCIQLOP_METATYPES_H
	3
	4	#include <QMetaType>
	5
	6	/**
	7	* Struct used to create an instance that registers a type in Qt for signals / slots mechanism
	8	* @tparam T the type to register
	9	*/
	10	template <typename T>
	11	struct MetaTypeRegistry {
	12	explicit MetaTypeRegistry() { qRegisterMetaType<T>(); }
	13	};
	14
	15	/**
	16	* This macro can be used to :
	17	* - declare a type as a Qt meta type
	18	* - and register it (through a static instance) at the launch of SciQlop, so it can be passed in
	19	* Qt signals/slots
	20	*
	21	* It can be used both in .h or in .cpp files
	22	*
	23	* @param NAME name of the instance under which the type will be registered (in uppercase)
	24	* @param TYPE type to register
	25	*
	26	* Example:
	27	* ~~~cpp
	28	* // The following macro :
	29	* // - declares std::shared_ptr<Variable> as a Qt meta type
	30	* // - registers it through an instance named VAR_SHARED_PTR
	31	* SCIQLOP_REGISTER_META_TYPE(VAR_SHARED_PTR, std::shared_ptr<Variable>)
	32	*
	33	* // The following macro :
	34	* // - declares a raw pointer of Variable as a Qt meta type
	35	* // - registers it through an instance named VAR_RAW_PTR
	36	* SCIQLOP_REGISTER_META_TYPE(VAR_RAW_PTR, Variable*)
	37	* ~~~
	38	*
	39	*/
	40	// clang-format off
	41	#define SCIQLOP_REGISTER_META_TYPE(NAME, TYPE) \
	42	Q_DECLARE_METATYPE(TYPE) \
	43	const auto NAME = MetaTypeRegistry<TYPE>{}; \
	44	// clang-format on
	45
	46	#endif // SCIQLOP_METATYPES_H

app/src/MainWindow.cpp 0 -2

                 connect(timeWidget, SIGNAL(timeUpdated(SqpDateTime)), &sqpApp->timeController(),
                         SLOT(onTimeToUpdate(SqpDateTime)));
-                qRegisterMetaType<SqpDateTime>();
                 connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpDateTime)),
                         &sqpApp->variableController(), SLOT(onDateTimeOnSelection(SqpDateTime)));
                 // Widgets / widgets connections
-                qRegisterMetaType<std::shared_ptr<Variable> >();
                 // For the following connections, we use DirectConnection to allow each widget that can
                 // potentially attach a menu to the variable's menu to do so before this menu is displayed.

core/include/Data/IDataProvider.h +4 -1

             #include <QObject>
+            #include <Common/MetaTypes.h>
             #include <Data/SqpDateTime.h>
             class DataProviderParameters;
             signals:
                 void dataProvided(std::shared_ptr<IDataSeries> dateSerie, const SqpDateTime &dateTime);
             };
             // Required for using shared_ptr in signals/slots
-            Q_DECLARE_METATYPE(std::shared_ptr<IDataProvider>)
+            SCIQLOP_REGISTER_META_TYPE(IDATAPROVIDER_PTR_REGISTRY, std::shared_ptr<IDataProvider>)
             #endif // SCIQLOP_IDATAPROVIDER_H

core/include/Data/IDataSeries.h +2 -2

             #ifndef SCIQLOP_IDATASERIES_H
             #define SCIQLOP_IDATASERIES_H
+            #include <Common/MetaTypes.h>
             #include <memory>
-            #include <QObject>
             #include <QString>
             template <int Dim>
             };
             // Required for using shared_ptr in signals/slots
-            Q_DECLARE_METATYPE(std::shared_ptr<IDataSeries>)
+            SCIQLOP_REGISTER_META_TYPE(IDATASERIES_PTR_REGISTRY, std::shared_ptr<IDataSeries>)
             #endif // SCIQLOP_IDATASERIES_H

core/include/Data/SqpDateTime.h +3 -1

             #include <QDateTime>
             #include <QDebug>
+            #include <Common/MetaTypes.h>
             /**
              * @brief The SqpDateTime struct holds the information of time parameters
              */
             }
             // Required for using shared_ptr in signals/slots
-            Q_DECLARE_METATYPE(SqpDateTime)
+            SCIQLOP_REGISTER_META_TYPE(SQPDATETIME_REGISTRY, SqpDateTime)
             #endif // SCIQLOP_SQPDATETIME_H

core/include/Variable/Variable.h +2 -2

             #include <Data/SqpDateTime.h>
             #include <QLoggingCategory>
             #include <QObject>
+            #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
             };
             // Required for using shared_ptr in signals/slots
-            Q_DECLARE_METATYPE(std::shared_ptr<Variable>)
+            SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>)
             #endif // SCIQLOP_VARIABLE_H

core/src/Variable/VariableController.cpp 0 -2

                     // store the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
-                    qRegisterMetaType<std::shared_ptr<IDataSeries> >();
-                    qRegisterMetaType<SqpDateTime>();
                     connect(provider.get(), &IDataProvider::dataProvided, newVariable.get(),
                             &Variable::onAddDataSeries);

gui/src/SqpApplication.cpp 0 -2

                     // /////////////////////////////// //
                     // VariableController <-> DataSourceController
-                    qRegisterMetaType<std::shared_ptr<IDataProvider> >();
                     connect(m_DataSourceController.get(),
                             SIGNAL(variableCreationRequested(const QString &, std::shared_ptr<IDataProvider>)),
                             m_VariableController.get(),
                             SLOT(createVariable(const QString &, std::shared_ptr<IDataProvider>)));
                     // VariableController <-> VisualizationController
-                    qRegisterMetaType<std::shared_ptr<Variable> >();
                     connect(m_VariableController.get(), SIGNAL(variableCreated(std::shared_ptr<Variable>)),
                             m_VisualizationController.get(),
                             SIGNAL(variableCreated(std::shared_ptr<Variable>)));

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages