diff --git a/autotests/jobremotetest.cpp b/autotests/jobremotetest.cpp --- a/autotests/jobremotetest.cpp +++ b/autotests/jobremotetest.cpp @@ -67,7 +67,7 @@ static bool myExists(const QUrl &url) { - KIO::Job *job = KIO::statDetails(url, KIO::StatJob::DestinationSide, KIO::StatDetail::Basic, KIO::HideProgressInfo); + KIO::Job *job = KIO::statDetails(url, KIO::StatJob::DestinationSide, KIO::StatBasic, KIO::HideProgressInfo); job->setUiDelegate(nullptr); return job->exec(); } diff --git a/autotests/jobtest.cpp b/autotests/jobtest.cpp --- a/autotests/jobtest.cpp +++ b/autotests/jobtest.cpp @@ -1433,7 +1433,7 @@ const QString filePath = homeTmpDir() + "fileFromHome"; createTestFile(filePath); const QUrl url(QUrl::fromLocalFile(filePath)); - KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::SourceSide, KIO::StatDetail::Basic, KIO::HideProgressInfo); + KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::SourceSide, KIO::StatBasic, KIO::HideProgressInfo); QVERIFY(job); QVERIFY2(job->exec(), qPrintable(job->errorString())); // TODO set setSide @@ -1472,7 +1472,7 @@ createTestFile(filePath); const QUrl url(QUrl::fromLocalFile(filePath)); KIO::StatJob *job = KIO::stat(url); - job->setDetails(KIO::StatDetail::Basic); + job->setDetails(KIO::StatBasic); QVERIFY(job); QVERIFY2(job->exec(), qPrintable(job->errorString())); // TODO set setSide @@ -1517,7 +1517,7 @@ const QUrl url(QUrl::fromLocalFile(symlink)); KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::SourceSide, - KIO::StatDetail::Basic | KIO::StatDetail::ResolveSymlink | KIO::StatDetail::User | KIO::StatDetail::Time, + KIO::StatBasic | KIO::StatResolveSymlink | KIO::StatUser | KIO::StatTime, KIO::HideProgressInfo); QVERIFY(job); QVERIFY2(job->exec(), qPrintable(job->errorString())); diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp --- a/src/core/copyjob.cpp +++ b/src/core/copyjob.cpp @@ -363,7 +363,7 @@ // Stat the dest state = STATE_STATING; const QUrl dest = m_asMethod ? m_dest.adjusted(QUrl::RemoveFilename) : m_dest; - KIO::Job *job = KIO::statDetails(dest, StatJob::DestinationSide, KIO::StatDetail::StatDefaultDetails, KIO::HideProgressInfo); + KIO::Job *job = KIO::statDetails(dest, StatJob::DestinationSide, KIO::StatDefaultDetails, KIO::HideProgressInfo); qCDebug(KIO_COPYJOB_DEBUG) << "CopyJob: stating the dest" << m_dest; q->addSubjob(job); } @@ -908,7 +908,7 @@ } // Stat the next src url - Job *job = KIO::statDetails(m_currentSrcURL, StatJob::SourceSide, KIO::StatDetail::StatDefaultDetails, KIO::HideProgressInfo); + Job *job = KIO::statDetails(m_currentSrcURL, StatJob::SourceSide, KIO::StatDefaultDetails, KIO::HideProgressInfo); qCDebug(KIO_COPYJOB_DEBUG) << "KIO::stat on" << m_currentSrcURL; state = STATE_STATING; q->addSubjob(job); @@ -1139,7 +1139,7 @@ // We need to stat the existing dir, to get its last-modification time QUrl existingDest((*it).uDest); - SimpleJob *newJob = KIO::statDetails(existingDest, StatJob::DestinationSide, KIO::StatDetail::StatDefaultDetails, KIO::HideProgressInfo); + SimpleJob *newJob = KIO::statDetails(existingDest, StatJob::DestinationSide, KIO::StatDefaultDetails, KIO::HideProgressInfo); Scheduler::setJobPriority(newJob, 1); qCDebug(KIO_COPYJOB_DEBUG) << "KIO::stat for resolving conflict on" << existingDest; state = STATE_CONFLICT_CREATING_DIRS; @@ -1352,7 +1352,7 @@ Q_ASSERT(!q->hasSubjobs()); // We need to stat the existing file, to get its last-modification time QUrl existingFile((*it).uDest); - SimpleJob *newJob = KIO::statDetails(existingFile, StatJob::DestinationSide, KIO::StatDetail::StatDefaultDetails, KIO::HideProgressInfo); + SimpleJob *newJob = KIO::statDetails(existingFile, StatJob::DestinationSide, KIO::StatDefaultDetails, KIO::HideProgressInfo); Scheduler::setJobPriority(newJob, 1); qCDebug(KIO_COPYJOB_DEBUG) << "KIO::stat for resolving conflict on" << existingFile; state = STATE_CONFLICT_COPYING_FILES; diff --git a/src/core/deletejob.cpp b/src/core/deletejob.cpp --- a/src/core/deletejob.cpp +++ b/src/core/deletejob.cpp @@ -315,7 +315,7 @@ // Done, jump to the last else of this method statNextSrc(); } else { - KIO::SimpleJob *job = KIO::statDetails(m_currentURL, StatJob::SourceSide, KIO::StatDetail::Basic, KIO::HideProgressInfo); + KIO::SimpleJob *job = KIO::statDetails(m_currentURL, StatJob::SourceSide, KIO::StatBasic, KIO::HideProgressInfo); Scheduler::setJobPriority(job, 1); //qDebug() << "stat'ing" << m_currentURL; q->addSubjob(job); @@ -506,7 +506,7 @@ // TODO KF6: remove legacy details code path newjob->addMetaData(QStringLiteral("details"), QStringLiteral("0")); #endif - newjob->addMetaData(QStringLiteral("statDetails"), QString::number(KIO::Basic)); + newjob->addMetaData(QStringLiteral("statDetails"), QString::number(KIO::StatBasic)); newjob->setUnrestricted(true); // No KIOSK restrictions Scheduler::setJobPriority(newjob, 1); QObject::connect(newjob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), diff --git a/src/core/directorysizejob.cpp b/src/core/directorysizejob.cpp --- a/src/core/directorysizejob.cpp +++ b/src/core/directorysizejob.cpp @@ -140,7 +140,7 @@ listJob->addMetaData(QStringLiteral("details"), QStringLiteral("3")); #endif listJob->addMetaData(QStringLiteral("statDetails"), - QString::number(KIO::StatDetail::Basic | KIO::StatDetail::ResolveSymlink | KIO::StatDetail::Inode)); + QString::number(KIO::StatBasic | KIO::StatResolveSymlink | KIO::StatInode)); q->connect(listJob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), SLOT(slotEntries(KIO::Job*,KIO::UDSEntryList))); q->addSubjob(listJob); diff --git a/src/core/global.h b/src/core/global.h --- a/src/core/global.h +++ b/src/core/global.h @@ -319,22 +319,22 @@ */ enum StatDetail { /// No field returned, useful to check if a file exists - NoDetails = 0x0, + StatNoDetails = 0x0, /// Filename, access, type, size, linkdest - Basic = 0x1, + StatBasic = 0x1, /// uid, gid - User = 0x2, + StatUser = 0x2, /// atime, mtime, btime - Time = 0x4, + StatTime = 0x4, /// Resolve symlinks - ResolveSymlink = 0x8, + StatResolveSymlink = 0x8, /// acl Data - Acl = 0x10, + StatAcl = 0x10, /// dev, inode - Inode = 0x20, + StatInode = 0x20, /// Default value includes fields provided by other entries - StatDefaultDetails = Basic | User | Time | Acl | ResolveSymlink, + StatDefaultDetails = StatBasic | StatUser | StatTime | StatAcl | StatResolveSymlink, }; Q_DECLARE_FLAGS(StatDetails, StatDetail) diff --git a/src/core/statjob.h b/src/core/statjob.h --- a/src/core/statjob.h +++ b/src/core/statjob.h @@ -198,7 +198,7 @@ * @since 5.69 */ KIOCORE_EXPORT StatJob *statDetails(const QUrl &url, KIO::StatJob::StatSide side, - KIO::StatDetails details = KIO::StatDetail::StatDefaultDetails, JobFlags flags = DefaultFlags); + KIO::StatDetails details = KIO::StatDefaultDetails, JobFlags flags = DefaultFlags); #if KIOCORE_ENABLE_DEPRECATED_SINCE(5, 69) /** diff --git a/src/core/statjob.cpp b/src/core/statjob.cpp --- a/src/core/statjob.cpp +++ b/src/core/statjob.cpp @@ -103,15 +103,15 @@ KIO::StatDetails KIO::detailsToStatDetails(int details) { - KIO::StatDetails detailsFlag = KIO::StatDetail::Basic; + KIO::StatDetails detailsFlag = KIO::StatBasic; if (details > 0) { - detailsFlag |= KIO::StatDetail::User | KIO::StatDetail::Time; + detailsFlag |= KIO::StatUser | KIO::StatTime; } if (details > 1) { - detailsFlag |= KIO::StatDetail::ResolveSymlink | KIO::StatDetail::Acl; + detailsFlag |= KIO::StatResolveSymlink | KIO::StatAcl; } if (details > 2) { - detailsFlag |= KIO::StatDetail::Inode; + detailsFlag |= KIO::StatInode; } return detailsFlag; } diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp --- a/src/filewidgets/kdiroperator.cpp +++ b/src/filewidgets/kdiroperator.cpp @@ -742,7 +742,7 @@ } else { KIO::StatJob *job = KIO::stat(folderurl); KJobWidgets::setWindow(job, this); - job->setDetails(KIO::StatDetail::NoDetails); //We only want to know if it exists + job->setDetails(KIO::StatNoDetails); //We only want to know if it exists job->setSide(KIO::StatJob::DestinationSide); exists = job->exec(); } diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp --- a/src/ioslaves/file/file_unix.cpp +++ b/src/ioslaves/file/file_unix.cpp @@ -247,35 +247,35 @@ // statx syscall is available inline int LSTAT(const char* path, struct statx * buff, KIO::StatDetails details) { uint32_t mask = 0; - if (details & KIO::Basic) { + if (details & KIO::StatBasic) { // filename, access, type, size, linkdest mask |= STATX_SIZE | STATX_TYPE; } - if (details & KIO::User) { + if (details & KIO::StatUser) { // uid, gid mask |= STATX_UID | STATX_GID; } - if (details & KIO::Time) { + if (details & KIO::StatTime) { // atime, mtime, btime mask |= STATX_ATIME | STATX_MTIME | STATX_BTIME; } - if (details & KIO::Inode) { + if (details & KIO::StatInode) { // dev, inode mask |= STATX_INO; } return statx(AT_FDCWD, path, AT_SYMLINK_NOFOLLOW, mask, buff); } inline int STAT(const char* path, struct statx * buff, KIO::StatDetails details) { uint32_t mask = 0; - if (details & KIO::Basic) { + if (details & KIO::StatBasic) { // filename, access, type, size, linkdest mask |= STATX_SIZE | STATX_TYPE; } - if (details & KIO::User) { + if (details & KIO::StatUser) { // uid, gid mask |= STATX_UID | STATX_GID; } - if (details & KIO::Time) { + if (details & KIO::StatTime) { // atime, mtime, btime mask |= STATX_ATIME | STATX_MTIME | STATX_BTIME; } @@ -315,29 +315,29 @@ { assert(entry.count() == 0); // by contract :-) int entries = 0; - if (details & KIO::Basic) { + if (details & KIO::StatBasic) { // filename, access, type, size, linkdest entries += 5; } - if (details & KIO::User) { + if (details & KIO::StatUser) { // uid, gid entries += 2; } - if (details & KIO::Time) { + if (details & KIO::StatTime) { // atime, mtime, btime entries += 3; } - if (details & KIO::Acl) { + if (details & KIO::StatAcl) { // acl data entries += 3; } - if (details & KIO::Inode) { + if (details & KIO::StatInode) { // dev, inode entries += 2; } entry.reserve(entries); - if (details & KIO::Basic) { + if (details & KIO::StatBasic) { entry.fastInsert(KIO::UDSEntry::UDS_NAME, filename); } @@ -355,15 +355,15 @@ if (LSTAT(path.data(), &buff, details) == 0) { - if (details & KIO::Inode) { + if (details & KIO::StatInode) { entry.fastInsert(KIO::UDSEntry::UDS_DEVICE_ID, stat_dev(buff)); entry.fastInsert(KIO::UDSEntry::UDS_INODE, stat_ino(buff)); } if ((stat_mode(buff) & QT_STAT_MASK) == QT_STAT_LNK) { QByteArray linkTargetBuffer; - if (details & (KIO::Basic|KIO::ResolveSymlink)) { + if (details & (KIO::StatBasic|KIO::StatResolveSymlink)) { // Use readlink on Unix because symLinkTarget turns relative targets into absolute (#352927) #if HAVE_STATX @@ -403,7 +403,7 @@ } // A symlink - if (details & KIO::ResolveSymlink) { + if (details & KIO::StatResolveSymlink) { if (STAT(path.constData(), &buff, details) == -1) { isBrokenSymLink = true; } else { @@ -422,7 +422,7 @@ } mode_t type = 0; - if (details & KIO::Basic) { + if (details & KIO::StatBasic) { mode_t access; signed long long size; if (isBrokenSymLink) { @@ -450,12 +450,12 @@ } #endif - if (details & KIO::User) { + if (details & KIO::StatUser) { entry.fastInsert(KIO::UDSEntry::UDS_USER, getUserName(KUserId(stat_uid(buff)))); entry.fastInsert(KIO::UDSEntry::UDS_GROUP, getGroupName(KGroupId(stat_gid(buff)))); } - if (details & KIO::Time) { + if (details & KIO::StatTime) { entry.fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, stat_mtime(buff)); entry.fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, stat_atime(buff)); @@ -959,7 +959,7 @@ * for every entry thus becoming slower. * */ - if (details == KIO::Basic) { + if (details == KIO::StatBasic) { entry.fastInsert(KIO::UDSEntry::UDS_NAME, filename); #ifdef HAVE_DIRENT_D_TYPE entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp --- a/src/widgets/krun.cpp +++ b/src/widgets/krun.cpp @@ -893,7 +893,7 @@ // It may be a directory or a file, let's stat KIO::JobFlags flags = d->m_bProgressInfo ? KIO::DefaultFlags : KIO::HideProgressInfo; - KIO::StatJob *job = KIO::statDetails(d->m_strURL, KIO::StatJob::SourceSide, KIO::StatDetail::Basic, flags); + KIO::StatJob *job = KIO::statDetails(d->m_strURL, KIO::StatJob::SourceSide, KIO::StatBasic, flags); KJobWidgets::setWindow(job, d->m_window); connect(job, &KJob::result, this, &KRun::slotStatResult); diff --git a/src/widgets/paste.cpp b/src/widgets/paste.cpp --- a/src/widgets/paste.cpp +++ b/src/widgets/paste.cpp @@ -77,7 +77,7 @@ static QUrl getDestinationUrl(const QUrl &srcUrl, const QUrl &destUrl, QWidget *widget) { KIO::StatJob *job = KIO::stat(destUrl, destUrl.isLocalFile() ? KIO::HideProgressInfo : KIO::DefaultFlags); - job->setDetails(KIO::StatDetail::Basic); + job->setDetails(KIO::StatBasic); job->setSide(KIO::StatJob::DestinationSide); KJobWidgets::setWindow(job, widget);