Skip to content

Commit

Permalink
QtJambi 6.8.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
omix committed Dec 4, 2024
1 parent c77b95f commit bfa9c31
Show file tree
Hide file tree
Showing 37 changed files with 2,428 additions and 1,036 deletions.
27 changes: 0 additions & 27 deletions src/cpp/QtJambi/fileengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,6 @@ class QClassPathEngine final : public QAbstractFileEngine {
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QStringList entryList(QDirListing::IteratorFlags filters, const QStringList& filterNames) const override;
IteratorPtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList& nameFilters) override;
IteratorPtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList& nameFilters) override;
#else
IteratorPtr beginEntryList(QDir::Filters filters, const QStringList& nameFilters) override;
#endif
Expand All @@ -945,7 +944,6 @@ class QClassPathEngine final : public QAbstractFileEngine {
class QClassPathEngineIterator final : public QAbstractFileEngineIterator{
public:
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QClassPathEngineIterator(const QString &path, const QStringList& entries, QDir::Filters filters, const QStringList &nameFilters);
QClassPathEngineIterator(const QString &path, const QStringList& entries, QDirListing::IteratorFlags filters, const QStringList &nameFilters);
bool advance() override;
#else
Expand All @@ -963,17 +961,6 @@ class QClassPathEngineIterator final : public QAbstractFileEngineIterator{
};

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QClassPathEngineIterator::QClassPathEngineIterator(const QString &path, const QStringList& entries, QDir::Filters filters, const QStringList &nameFilters)
: QAbstractFileEngineIterator(
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
path,
#endif
filters, nameFilters),
m_iterator(entries),
m_current(m_iterator.hasNext() ? m_iterator.peekNext() : QString())
{
}

QClassPathEngineIterator::QClassPathEngineIterator(const QString &path, const QStringList& entries, QDirListing::IteratorFlags filters, const QStringList &nameFilters)
: QAbstractFileEngineIterator(
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
Expand Down Expand Up @@ -1471,20 +1458,6 @@ QClassPathEngine::IteratorPtr QClassPathEngine::beginEntryList(const QString &pa
entries.removeDuplicates();
return QClassPathEngine::IteratorPtr(new QClassPathEngineIterator(path, entries, filters, nameFilters));
}

QClassPathEngine::IteratorPtr QClassPathEngine::beginEntryList(const QString &path, QDir::Filters filters, const QStringList& nameFilters){
QList<QAbstractFileEngine*> engines;
{
QMutexLocker locker(&m_mutex);
engines = m_engines;
}
QStringList entries(m_resourceEntries);
for (QAbstractFileEngine* engine : engines){
entries << engine->entryList(filters, nameFilters);
}
entries.removeDuplicates();
return QClassPathEngine::IteratorPtr(new QClassPathEngineIterator(path, entries, filters, nameFilters));
}
#else
QClassPathEngine::IteratorPtr QClassPathEngine::beginEntryList(QDir::Filters filters, const QStringList& nameFilters) {
QList<QAbstractFileEngine*> engines;
Expand Down
8 changes: 8 additions & 0 deletions src/cpp/QtJambi/java.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QCoreApplication,
QTJAMBI_REPOSITORY_DEFINE_STATIC_FIELD(__qt_isInitializing,Z)
)

QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method10,
QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
)

QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method9,
QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;)
)
Expand Down Expand Up @@ -281,6 +285,10 @@ QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Method0,
QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,()Ljava/lang/Object;)
)

QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot10,
QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
)

QTJAMBI_REPOSITORY_DEFINE_CLASS(io/qt/core,QMetaObject$Slot9,
QTJAMBI_REPOSITORY_DEFINE_METHOD(invoke,(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V)
)
Expand Down
22 changes: 13 additions & 9 deletions src/cpp/QtJambi/javaapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -510,25 +510,29 @@ namespace QtCore{
QTJAMBI_REPOSITORY_DECLARE_CLASS(QThread,
QTJAMBI_REPOSITORY_DECLARE_OBJECT_FIELD(javaThread))

QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method10,
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method9,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method8,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method7,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method6,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method5,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method4,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method3,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method2,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method1,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Method0,
QTJAMBI_REPOSITORY_DECLARE_OBJECT_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot10,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
QTJAMBI_REPOSITORY_DECLARE_CLASS(QMetaObject$Slot9,
QTJAMBI_REPOSITORY_DECLARE_VOID_METHOD(invoke))
Expand Down
Loading

0 comments on commit bfa9c31

Please sign in to comment.