Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support Qt 6.8 #438

Merged
merged 1 commit into from
Oct 22, 2024
Merged

feat: support Qt 6.8 #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/dci/private/ddcifileengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,25 @@
#define DCI_FILE_SCHEME "dci:"
#define DCI_FILE_SUFFIX ".dci"

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
std::unique_ptr<QAbstractFileEngine> DDciFileEngineHandler::create(const QString &fileName) const
#else
QAbstractFileEngine *DDciFileEngineHandler::create(const QString &fileName) const
#endif
{
if (!fileName.startsWith(QStringLiteral(DCI_FILE_SCHEME)))
return nullptr;

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
std::unique_ptr<DDciFileEngine> engine(new DDciFileEngine(fileName));
#else
DDciFileEngine *engine = new DDciFileEngine(fileName);
#endif

if (!engine->isValid()) {
#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
delete engine;
#endif
return nullptr;
}

Expand Down Expand Up @@ -66,18 +77,26 @@
}

DDciFileEngineIterator::DDciFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters)
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
: QAbstractFileEngineIterator(nullptr, filters, nameFilters)
#else
: QAbstractFileEngineIterator(filters, nameFilters)
#endif
{

}

#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
QString DDciFileEngineIterator::next()
{
current = nextValid;
return DDciFileEngineIterator::currentFileName();
}

bool DDciFileEngineIterator::hasNext() const
#else
bool DDciFileEngineIterator::advance()

Check warning on line 98 in src/dci/private/ddcifileengine.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'advance' is never used.
#endif
{
if (!file) {
const auto paths = DDciFileEngine::resolvePath(path());
Expand Down Expand Up @@ -111,6 +130,9 @@
continue;

nextValid = i;
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
current = nextValid;
#endif
return true;
}

Expand Down Expand Up @@ -543,12 +565,24 @@
}
#endif

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames)
#else
DDciFileEngine::Iterator *DDciFileEngine::beginEntryList(QDir::Filters filters, const QStringList &filterNames)
#endif
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
return QAbstractFileEngine::IteratorUniquePtr(new DDciFileEngineIterator(filters, filterNames));
#else
return new DDciFileEngineIterator(filters, filterNames);
#endif
}

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::endEntryList()
#else
DDciFileEngine::Iterator *DDciFileEngine::endEntryList()

Check warning on line 584 in src/dci/private/ddcifileengine.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'endEntryList' is never used.
#endif
{
return nullptr;
}
Expand Down
14 changes: 14 additions & 0 deletions src/dci/private/ddcifileengine_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ DCORE_BEGIN_NAMESPACE
class DDciFileEngineHandler : public QAbstractFileEngineHandler
{
public:
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override;
#else
QAbstractFileEngine *create(const QString &fileName) const override;
#endif
};

class DDciFile;
Expand All @@ -35,8 +39,12 @@ class DDciFileEngineIterator : public QAbstractFileEngineIterator
public:
DDciFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters);

#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
QString next() override;
bool hasNext() const override;
#else
bool advance() override;
#endif

QString currentFileName() const override;

Expand Down Expand Up @@ -102,8 +110,14 @@ class DDciFileEngine : public QAbstractFileEngine
#endif

typedef DDciFileEngineIterator Iterator;

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames) override;
IteratorUniquePtr endEntryList() override;
#else
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
Iterator *endEntryList() override;
#endif

qint64 read(char *data, qint64 maxlen) override;
qint64 write(const char *data, qint64 len) override;
Expand Down
18 changes: 18 additions & 0 deletions src/filesystem/dcapfsfileengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DCORE_BEGIN_NAMESPACE
extern QString _d_cleanPath(const QString &path);
extern bool _d_isSubFileOf(const QString &filePath, const QString &directoryPath);

#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
static bool capDirIteraterHasNext(QAbstractFileEngineIterator *it)
{
const QStringList &paths = DCapManager::instance()->paths();
Expand All @@ -28,10 +29,19 @@ static bool capDirIteraterHasNext(QAbstractFileEngineIterator *it)
return ret;
return DVtableHook::callOriginalFun(it, &QAbstractFileEngineIterator::hasNext);
}
#endif

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
std::unique_ptr<QAbstractFileEngine> DCapFSFileEngineHandler::create(const QString &fileName) const
#else
QAbstractFileEngine *DCapFSFileEngineHandler::create(const QString &fileName) const
#endif
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
return std::unique_ptr<QAbstractFileEngine>(new DCapFSFileEngine(fileName));
#else
return new DCapFSFileEngine(fileName);
#endif
}


Expand Down Expand Up @@ -210,10 +220,18 @@ QStringList DCapFSFileEngine::entryList(QDir::Filters filters, const QStringList
return QFSFileEngine::entryList(filters, filterNames);
}

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QAbstractFileEngine::IteratorUniquePtr DCapFSFileEngine::beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames)
#else
QAbstractFileEngine::Iterator *DCapFSFileEngine::beginEntryList(QDir::Filters filters, const QStringList &filterNames)
#endif
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
auto ret = QFSFileEngine::beginEntryList(path, filters, filterNames);
#else
auto ret = QFSFileEngine::beginEntryList(filters, filterNames);
DVtableHook::overrideVfptrFun(ret, &QAbstractFileEngineIterator::hasNext, &capDirIteraterHasNext);
#endif
return ret;
}

Expand Down
8 changes: 8 additions & 0 deletions src/filesystem/private/dcapfsfileengine_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ DCORE_BEGIN_NAMESPACE
class DCapFSFileEngineHandler : public QAbstractFileEngineHandler
{
public:
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override;
#else
QAbstractFileEngine *create(const QString &fileName) const override;
#endif
};

class DCapFSFileEnginePrivate;
Expand Down Expand Up @@ -47,7 +51,11 @@ class DCapFSFileEngine : public QFSFileEngine, public DObject
bool cloneTo(QAbstractFileEngine *target) override;
bool setSize(qint64 size) override;
QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames) override;
#else
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
#endif

bool canReadWrite(const QString &path) const;
};
Expand Down
Loading