mirror of https://github.com/KLayout/klayout.git
Qt5 builds functional again, enabled QLatin1String for Qt5 and Qt4 too.
This commit is contained in:
parent
0e2ff48c14
commit
3bb46e2717
|
|
@ -226,6 +226,9 @@ drop_class "QVectorIterator"
|
|||
drop_class "QVectorTypedData"
|
||||
|
||||
drop_enum_const "QEvent", /CocoaRequestModal/ # not available on WIN
|
||||
|
||||
drop_method "QMetaType", /QMetaType::staticMetaObject/ # not available
|
||||
drop_method "QMetaType", /QMetaType::registerNormalizedType/ # needs function ptrs.
|
||||
drop_method "QCollator", /QCollator::compare\(.*QStringRef/ # clashes with QString version
|
||||
drop_method "QLocale", /QLocale::(toDouble|toFloat|toInt|toLongLong|toShort|quoteString|toUInt|toULongLong|toUShort)\(.*QStringRef/ # clashes with QString version
|
||||
drop_method "QRegularExpression", /QRegularExpression::(match|globalMatch)\(.*QStringRef/ # clashes with QString version
|
||||
|
|
@ -640,11 +643,11 @@ include "QVector3D", [ "<QVector3D>", "<QVector2D>", "<QMatrix4x4>" ]
|
|||
include "QVector4D", [ "<QVector4D>", "<QVector2D>", "<QMatrix4x4>" ]
|
||||
include "QAction", [ "<QAction>", "<QGraphicsWidget>", "<QMenu>" ]
|
||||
include "QCursor", [ "<QCursor>", "<QScreen>", "<QBitmap>" ]
|
||||
include "QGraphicsItem", [ "<QGraphicsItem>", "<QGraphicsTransform>", "<QGraphicsScene>", "<QStyleOptionGraphicsItem>", "<QGraphicsEffect>", "<QGraphicsWidget>", "<QGraphicsSceneContextMenuEvent>", "<QGraphicsSceneDragDropEvent>", "<QGraphicsSceneHoverEvent>", "<QGraphicsSceneMouseEvent>", "<QGraphicsSceneWheelEvent>" ]
|
||||
include "QGraphicsItem", [ "<QGraphicsItem>", "<QGraphicsTransform>", "<QGraphicsScene>", "<QStyleOptionGraphicsItem>", "<QGraphicsEffect>", "<QGraphicsWidget>", "<QGraphicsSceneContextMenuEvent>", "<QGraphicsSceneDragDropEvent>", "<QGraphicsSceneHoverEvent>", "<QGraphicsSceneMouseEvent>", "<QGraphicsSceneWheelEvent>", "<QPainter>" ]
|
||||
include "QGraphicsScene", [ "<QGraphicsScene>", "<QGraphicsView>", "<QGraphicsItem>", "<QGraphicsWidget>", "<QGraphicsEllipseItem>", "<QGraphicsLineItem>", "<QGraphicsPathItem>", "<QGraphicsPixmapItem>", "<QGraphicsPolygonItem>", "<QGraphicsRectItem>", "<QGraphicsSimpleTextItem>", "<QGraphicsTextItem>", "<QGraphicsProxyWidget>", "<QGraphicsItemGroup>", "<QStyle>", "<QGraphicsSceneContextMenuEvent>", "<QGraphicsSceneDragDropEvent>", "<QGraphicsSceneHelpEvent>", "<QGraphicsSceneMouseEvent>", "<QGraphicsSceneWheelEvent>" ]
|
||||
include "QGuiApplication", [ "<QGuiApplication>", "<QScreen>", "<QSessionManager>", "<QClipboard>", "<QWindow>", "<QStyleHints>" ]
|
||||
include "QGuiApplication", [ "<QGuiApplication>", "<QScreen>", "<QSessionManager>", "<QClipboard>", "<QWindow>", "<QStyleHints>", "<QFont>", "<QPalette>" ]
|
||||
include "QApplication", [ "<QApplication>", "<QSessionManager>", "<QDesktopWidget>", "<QStyle>", "<QWindow>", "<QScreen>" ]
|
||||
include "QWindow", [ "<QWindow>", "<QScreen>" ]
|
||||
include "QWindow", [ "<QWindow>", "<QScreen>", "<QAccessibleInterface>" ]
|
||||
include "QOffscreenSurface", [ "<QOffscreenSurface>", "<QScreen>" ]
|
||||
include "QScreenOrientationChangeEvent", [ "<QScreenOrientationChangeEvent>", "<QScreen>" ]
|
||||
|
||||
|
|
@ -864,7 +867,7 @@ no_copy_ctor "QIconEngine"
|
|||
# QtXml
|
||||
|
||||
include "QXmlFormatter", [ "<QXmlFormatter>", "<QXmlQuery>" ]
|
||||
include "QXmlSerializer", [ "<QXmlSerializer>", "<QXmlQuery>" ]
|
||||
include "QXmlSerializer", [ "<QXmlSerializer>", "<QXmlQuery>", "<QTextCodec>" ]
|
||||
|
||||
no_imports "QXmlStreamAttributes" # base class is a template.
|
||||
|
||||
|
|
@ -997,7 +1000,7 @@ final_class "QFormBuilder" # requires a lot of Dom* classes
|
|||
include "QCamera", [ "<QCamera>", "<QVideoWidget>", "<QGraphicsVideoItem>", "<QAbstractVideoSurface>", "<QCameraInfo>" ]
|
||||
include "QAudioBuffer", [ "<QAudioBuffer>" ]
|
||||
include "QBackingStore", [ "<QBackingStore>" ]
|
||||
include "QMediaPlayer", [ "<QMediaPlayer>", "<QVideoWidget>", "<QGraphicsVideoItem>", "<QMediaPlaylist>", "<QAbstractVideoSurface>" ]
|
||||
include "QMediaPlayer", [ "<QMediaPlayer>", "<QVideoWidget>", "<QGraphicsVideoItem>", "<QMediaPlaylist>", "<QAbstractVideoSurface>", "<QMediaService>" ]
|
||||
|
||||
drop_class "QAudioBuffer", /StereoFrameDefault/
|
||||
drop_class "QAudioBuffer", /StereoFrame/
|
||||
|
|
|
|||
|
|
@ -984,6 +984,8 @@ private:
|
|||
mutable QByteArray m_s_utf8;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Specialization for QLatin1String
|
||||
*/
|
||||
|
|
@ -1023,12 +1025,12 @@ public:
|
|||
|
||||
virtual size_t size () const
|
||||
{
|
||||
return mp_s->toString ().toUtf8 ().size ();
|
||||
return QString::fromLatin1 (mp_s->data (), mp_s->size ()).toUtf8 ().size ();
|
||||
}
|
||||
|
||||
virtual const char *c_str () const
|
||||
{
|
||||
m_s_utf8 = mp_s->toString ().toUtf8 ();
|
||||
m_s_utf8 = QString::fromLatin1 (mp_s->data (), mp_s->size ()).toUtf8 ();
|
||||
return m_s_utf8.constData ();
|
||||
}
|
||||
|
||||
|
|
@ -1050,8 +1052,6 @@ private:
|
|||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Specialization for std::string
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@
|
|||
#include <QSet>
|
||||
#include <QList>
|
||||
#include <QStringList>
|
||||
#include <QLatin1String>
|
||||
# if QT_VERSION >= 0x60000
|
||||
# include <QByteArrayView>
|
||||
# include <QLatin1String>
|
||||
# include <QStringView>
|
||||
# endif
|
||||
#endif
|
||||
|
|
@ -449,9 +449,9 @@ template <> struct type_traits<QByteArray> : generic_type_trait
|
|||
template <> struct type_traits<std::vector<char> > : generic_type_traits<byte_array_tag, StringAdaptor, T_byte_array> { };
|
||||
template <> struct type_traits<QVariant> : generic_type_traits<var_tag, VariantAdaptor, T_var> { };
|
||||
template <typename T> struct type_traits<QPointer<T> > : generic_type_traits<var_tag, VariantAdaptor, T_var> { };
|
||||
template <> struct type_traits<QLatin1String> : generic_type_traits<string_tag, StringAdaptor, T_string> { };
|
||||
#if QT_VERSION >= 0x60000
|
||||
template <> struct type_traits<QStringView> : generic_type_traits<string_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<QLatin1String> : generic_type_traits<string_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<QByteArrayView> : generic_type_traits<byte_array_tag, StringAdaptor, T_byte_array> { };
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -491,9 +491,9 @@ template <> struct type_traits<const QByteArray &> : generic_type_trait
|
|||
template <> struct type_traits<const std::vector<char> &> : generic_type_traits<byte_array_cref_tag, StringAdaptor, T_byte_array> { };
|
||||
template <> struct type_traits<const QVariant &> : generic_type_traits<var_cref_tag, VariantAdaptor, T_var> { };
|
||||
template <typename T> struct type_traits<const QPointer<T> &> : generic_type_traits<var_cref_tag, VariantAdaptor, T_var> { };
|
||||
template <> struct type_traits<const QLatin1String &> : generic_type_traits<string_cref_tag, StringAdaptor, T_string> { };
|
||||
#if QT_VERSION >= 0x60000
|
||||
template <> struct type_traits<const QStringView &> : generic_type_traits<string_cref_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<const QLatin1String &> : generic_type_traits<string_cref_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<const QByteArrayView &> : generic_type_traits<byte_array_cref_tag, StringAdaptor, T_byte_array> { };
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -530,9 +530,9 @@ template <> struct type_traits<QByteArray &> : generic_type_trait
|
|||
template <> struct type_traits<std::vector<char> &> : generic_type_traits<byte_array_ref_tag, StringAdaptor, T_byte_array> { };
|
||||
template <> struct type_traits<QVariant &> : generic_type_traits<var_ref_tag, VariantAdaptor, T_var> { };
|
||||
template <typename T> struct type_traits<QPointer<T> &> : generic_type_traits<var_ref_tag, VariantAdaptor, T_var> { };
|
||||
template <> struct type_traits<QLatin1String &> : generic_type_traits<string_ref_tag, StringAdaptor, T_string> { };
|
||||
#if QT_VERSION >= 0x60000
|
||||
template <> struct type_traits<QStringView &> : generic_type_traits<string_ref_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<QLatin1String &> : generic_type_traits<string_ref_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<QByteArrayView &> : generic_type_traits<byte_array_ref_tag, StringAdaptor, T_byte_array> { };
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -570,9 +570,9 @@ template <> struct type_traits<const QByteArray *> : generic_type_trait
|
|||
template <> struct type_traits<const std::vector<char> *> : generic_type_traits<byte_array_cptr_tag, StringAdaptor, T_byte_array> { };
|
||||
template <> struct type_traits<const QVariant *> : generic_type_traits<var_cptr_tag, VariantAdaptor, T_var> { };
|
||||
template <typename T> struct type_traits<const QPointer<T> *> : generic_type_traits<var_cptr_tag, VariantAdaptor, T_var> { };
|
||||
template <> struct type_traits<const QLatin1String *> : generic_type_traits<string_cptr_tag, StringAdaptor, T_string> { };
|
||||
#if QT_VERSION >= 0x60000
|
||||
template <> struct type_traits<const QStringView *> : generic_type_traits<string_cptr_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<const QLatin1String *> : generic_type_traits<string_cptr_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<const QByteArrayView *> : generic_type_traits<byte_array_cptr_tag, StringAdaptor, T_byte_array> { };
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -610,9 +610,9 @@ template <> struct type_traits<QByteArray *> : generic_type_trait
|
|||
template <> struct type_traits<std::vector<char> *> : generic_type_traits<byte_array_ptr_tag, StringAdaptor, T_byte_array> { };
|
||||
template <> struct type_traits<QVariant *> : generic_type_traits<var_ptr_tag, VariantAdaptor, T_var> { };
|
||||
template <typename T> struct type_traits<QPointer<T> *> : generic_type_traits<var_ptr_tag, VariantAdaptor, T_var> { };
|
||||
template <> struct type_traits<QLatin1String *> : generic_type_traits<string_ptr_tag, StringAdaptor, T_string> { };
|
||||
#if QT_VERSION >= 0x60000
|
||||
template <> struct type_traits<QStringView *> : generic_type_traits<string_ptr_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<QLatin1String *> : generic_type_traits<string_ptr_tag, StringAdaptor, T_string> { };
|
||||
template <> struct type_traits<QByteArrayView *> : generic_type_traits<byte_array_ptr_tag, StringAdaptor, T_byte_array> { };
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ SOURCES += \
|
|||
$$PWD/gsiDeclQMetaObject.cc \
|
||||
$$PWD/gsiDeclQMetaObject_Connection.cc \
|
||||
$$PWD/gsiDeclQMetaProperty.cc \
|
||||
$$PWD/gsiDeclQMetaType.cc \
|
||||
$$PWD/gsiDeclQMimeData.cc \
|
||||
$$PWD/gsiDeclQMimeDatabase.cc \
|
||||
$$PWD/gsiDeclQMimeType.cc \
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QAbstractEventDispatcher>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QAbstractNativeEventFilter>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QAssociativeIterable>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QBasicMutex>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <QThread>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QByteArrayDataPtr>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QByteArrayMatcher>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QLocale>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QCollatorSortKey>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QCommandLineOption>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QCoreApplication>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QTranslator>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QIODevice>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QIODevice>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
@ -113,25 +112,25 @@
|
|||
return v;
|
||||
}
|
||||
|
||||
static qt_gsi::Converter<class QChar>::target_type f_QDataStream_read_qchar(QDataStream *s)
|
||||
static qt_gsi::Converter<QChar>::target_type f_QDataStream_read_qchar(QDataStream *s)
|
||||
{
|
||||
QChar v = 0;
|
||||
QChar v = QChar (0);
|
||||
*s >> v;
|
||||
return qt_gsi::Converter<class QChar>::toc (v);
|
||||
return qt_gsi::Converter<QChar>::toc (v);
|
||||
}
|
||||
|
||||
static qt_gsi::Converter<class QList<int> >::target_type f_QDataStream_read_int_list(QDataStream *s)
|
||||
static qt_gsi::Converter<QList<int> >::target_type f_QDataStream_read_int_list(QDataStream *s)
|
||||
{
|
||||
QList<int> v;
|
||||
*s >> v;
|
||||
return qt_gsi::Converter<class QList<int> >::toc (v);
|
||||
return qt_gsi::Converter<QList<int> >::toc (v);
|
||||
}
|
||||
|
||||
static qt_gsi::Converter<class QVector<int> >::target_type f_QDataStream_read_int_vector(QDataStream *s)
|
||||
static qt_gsi::Converter<QVector<int> >::target_type f_QDataStream_read_int_vector(QDataStream *s)
|
||||
{
|
||||
QVector<int> v;
|
||||
*s >> v;
|
||||
return qt_gsi::Converter<class QVector<int> >::toc (v);
|
||||
return qt_gsi::Converter<QVector<int> >::toc (v);
|
||||
}
|
||||
|
||||
static QString f_QDataStream_read_string(QDataStream *s)
|
||||
|
|
@ -214,21 +213,21 @@
|
|||
return s;
|
||||
}
|
||||
|
||||
static QDataStream *f_QDataStream_put_qchar(QDataStream *s, const qt_gsi::Converter<class QChar>::target_type &v)
|
||||
static QDataStream *f_QDataStream_put_qchar(QDataStream *s, const qt_gsi::Converter<QChar>::target_type &v)
|
||||
{
|
||||
*s << qt_gsi::Converter<class QChar>::toq (v);
|
||||
*s << qt_gsi::Converter<QChar>::toq (v);
|
||||
return s;
|
||||
}
|
||||
|
||||
static QDataStream *f_QDataStream_put_int_list(QDataStream *s, const qt_gsi::Converter<class QList<int> >::target_type &v)
|
||||
static QDataStream *f_QDataStream_put_int_list(QDataStream *s, const qt_gsi::Converter<QList<int> >::target_type &v)
|
||||
{
|
||||
*s << qt_gsi::Converter<class QList<int> >::toq (v);
|
||||
*s << qt_gsi::Converter<QList<int> >::toq (v);
|
||||
return s;
|
||||
}
|
||||
|
||||
static QDataStream *f_QDataStream_put_int_vector(QDataStream *s, const qt_gsi::Converter<class QVector<int> >::target_type &v)
|
||||
static QDataStream *f_QDataStream_put_int_vector(QDataStream *s, const qt_gsi::Converter<QVector<int> >::target_type &v)
|
||||
{
|
||||
*s << qt_gsi::Converter<class QVector<int> >::toq (v);
|
||||
*s << qt_gsi::Converter<QVector<int> >::toq (v);
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QDate>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QTimeZone>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QIODevice>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QDebug>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QFileInfo>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QFileInfo>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QPointF>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QElapsedTimer>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QThread>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QFactoryInterface>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <QThread>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QFile>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <QUrl>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <QThread>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QModelIndex>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QPersistentModelIndex>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QJsonValueRef>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonValuePtr>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonValueRefPtr>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonParseError>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QJsonValueRef>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonValuePtr>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonValueRefPtr>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QJsonParseError>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QJsonObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QJsonValue>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonValue>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QJsonValueRef>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QDate>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QPoint>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <QPointF>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QTime>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QLockFile>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QLoggingCategory>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QMapNodeBase>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QMapNodeBase>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QMargins>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QMargins>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QIODevice>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QMessageLogContext>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QNoDebug>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QMetaObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QMetaObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QMetaObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#include <QObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QMetaObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <QObject>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <QUrl>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <QUrl>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QMimeType>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <QAbstractItemModel>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QMutex>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <QNoDebug>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,15 +32,21 @@
|
|||
#include <QModelIndex>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// class QPersistentModelIndex
|
||||
#if QT_VERSION < 0x60000
|
||||
static const QModelIndex &castToQModelIndex(const QPersistentModelIndex *m)
|
||||
{
|
||||
return m->operator const QModelIndex &();
|
||||
}
|
||||
#else
|
||||
static QModelIndex castToQModelIndex(const QPersistentModelIndex *m)
|
||||
{
|
||||
return m->operator QModelIndex();
|
||||
}
|
||||
#endif
|
||||
|
||||
// Constructor QPersistentModelIndex::QPersistentModelIndex()
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include <QTimerEvent>
|
||||
#include "gsiQt.h"
|
||||
#include "gsiQtCoreCommon.h"
|
||||
#include "gsiDeclQtCoreTypeTraits.h"
|
||||
#include <memory>
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue