diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KIOConfigVersion.cmake" SOVERSION 5) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") + option(KIOCORE_ONLY "Only compile KIOCore, not KIOWidgets or anything that depends on it. This will disable support for cookies and passwordhandling (prompting and storing)." OFF) option(KIO_FORK_SLAVES "If set we start the slaves via QProcess. It's also possible to change this by setting the environment variable KDE_FORK_SLAVES." OFF) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -12,6 +12,11 @@ find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.65.0) + set(ktcpsockettest_SRC ktcpsockettest.cpp) +endif() + ecm_add_tests( kacltest.cpp listdirtest.cpp @@ -22,7 +27,7 @@ jobremotetest.cpp kfileitemtest.cpp kprotocolinfotest.cpp - ktcpsockettest.cpp + ${ktcpsockettest_SRC} globaltest.cpp mkpathjobtest.cpp threadtest.cpp @@ -83,6 +88,11 @@ endif() if (TARGET KF5::KIOWidgets) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.4.0) + set(jobguitest_SRC jobguitest.cpp) +endif() + ecm_add_tests( clipboardupdatertest.cpp dropjobtest.cpp @@ -94,7 +104,7 @@ fileundomanagertest.cpp kurifiltertest.cpp kurlcompletiontest.cpp - jobguitest.cpp + ${jobguitest_SRC} pastetest.cpp accessmanagertest.cpp kurifiltersearchprovideractionstest.cpp diff --git a/autotests/clipboardupdatertest.cpp b/autotests/clipboardupdatertest.cpp --- a/autotests/clipboardupdatertest.cpp +++ b/autotests/clipboardupdatertest.cpp @@ -124,7 +124,7 @@ const QString pasteDir = dir.path() + QLatin1String("/pastedir"); createTestDirectory(pasteDir, NoSymlink); - KIO::Job *job = KIO::pasteClipboard(QUrl::fromLocalFile(pasteDir), nullptr); + KIO::Job *job = KIO::paste(clipboard->mimeData(), QUrl::fromLocalFile(pasteDir)); QVERIFY(job->exec()); QCOMPARE(job->error(), 0); } @@ -146,7 +146,7 @@ const QString pasteDir = dir.path() + QLatin1String("/pastedir"); createTestDirectory(pasteDir, NoSymlink); - KIO::Job *job = KIO::pasteClipboard(QUrl::fromLocalFile(pasteDir), nullptr); + KIO::Job *job = KIO::paste(clipboard->mimeData(), QUrl::fromLocalFile(pasteDir), nullptr); QVERIFY(!job); } @@ -167,7 +167,7 @@ const QString pasteDir = dir.path() + QLatin1String("/pastedir"); createTestDirectory(pasteDir, NoSymlink); - KIO::Job *job = KIO::pasteClipboard(QUrl::fromLocalFile(pasteDir), nullptr); + KIO::Job *job = KIO::paste(clipboard->mimeData(), QUrl::fromLocalFile(pasteDir), nullptr); QVERIFY(!job); } diff --git a/autotests/kfilewidgettest.cpp b/autotests/kfilewidgettest.cpp --- a/autotests/kfilewidgettest.cpp +++ b/autotests/kfilewidgettest.cpp @@ -218,6 +218,7 @@ QTest::newRow("filename") << baseDir << fileName << baseDir << fileName; } +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(5, 33) void testSetSelection() { // GIVEN @@ -243,6 +244,7 @@ //} QCOMPARE(fw.locationEdit()->currentText(), expectedCurrentText); } +#endif void testSetSelectedUrl_data() { diff --git a/autotests/krununittest.h b/autotests/krununittest.h --- a/autotests/krununittest.h +++ b/autotests/krununittest.h @@ -22,6 +22,7 @@ #include #include +#include "kiowidgets_export.h" class KRunUnitTest : public QObject { @@ -42,8 +43,10 @@ void testMimeTypeBrokenLink(); void testMimeTypeDoesNotExist(); +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) void KRunRunService_data(); void KRunRunService(); +#endif private: QString createTempService(); diff --git a/autotests/krununittest.cpp b/autotests/krununittest.cpp --- a/autotests/krununittest.cpp +++ b/autotests/krununittest.cpp @@ -368,6 +368,7 @@ srcFile.write("Hello world\n"); } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) void KRunUnitTest::KRunRunService_data() { QTest::addColumn("tempFile"); @@ -378,6 +379,9 @@ QTest::newRow("runApp") << false << true; QTest::newRow("runApp_tempfile") << true << true; } +#endif + +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) void KRunUnitTest::KRunRunService() { QFETCH(bool, tempFile); @@ -413,6 +417,7 @@ ::kill(pid, SIGTERM); #endif } +#endif QString KRunUnitTest::createTempService() { diff --git a/autotests/kurlnavigatortest.h b/autotests/kurlnavigatortest.h --- a/autotests/kurlnavigatortest.h +++ b/autotests/kurlnavigatortest.h @@ -21,6 +21,7 @@ #define URLNAVIGATORTEST_H #include +#include class KUrlNavigator; class KUrlNavigatorTest : public QObject @@ -41,8 +42,10 @@ void testUrlParsing_data(); void testUrlParsing(); +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) void testButtonUrl_data(); void testButtonUrl(); +#endif void testButtonText(); void testInitWithRedundantPathSeparators(); diff --git a/autotests/kurlnavigatortest.cpp b/autotests/kurlnavigatortest.cpp --- a/autotests/kurlnavigatortest.cpp +++ b/autotests/kurlnavigatortest.cpp @@ -222,6 +222,7 @@ QCOMPARE(m_navigator->locationUrl(), url); } +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) void KUrlNavigatorTest::testButtonUrl_data() { QTest::addColumn("locationUrl"); @@ -258,6 +259,7 @@ // THEN QCOMPARE(buttonUrl, expectedButtonUrl); } +#endif void KUrlNavigatorTest::testButtonText() { @@ -278,7 +280,7 @@ { KUrlNavigator temp_nav(nullptr, QUrl::fromLocalFile(QStringLiteral("/home/foo///test")), nullptr); - const QUrl buttonUrl = temp_nav.url(3); + const QUrl buttonUrl = temp_nav.locationUrl(); QCOMPARE(buttonUrl, QUrl::fromLocalFile(QStringLiteral("/home/foo/test"))); } diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -166,6 +166,7 @@ VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 3.0 3.1 3.4 4.0 4.3 4.5 4.6 5.0 5.2 5.8 5.24 5.45 5.48 5.63 5.61 5.64 5.65 5.66 5.69 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) # TODO: add support for EXCLUDE_DEPRECATED_BEFORE_AND_AT to all KIO libs # needs fixing of undeprecated API being still implemented using own deprecated API diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp --- a/src/core/copyjob.cpp +++ b/src/core/copyjob.cpp @@ -947,12 +947,14 @@ return; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 2) if (!dirs.isEmpty()) { emit q->aboutToCreate(q, dirs); } if (!files.isEmpty()) { emit q->aboutToCreate(q, files); } +#endif // Check if we are copying a single file m_bSingleFileCopy = (files.count() == 1 && dirs.isEmpty()); // Then start copying things @@ -988,9 +990,11 @@ info.size = (KIO::filesize_t) - 1; info.uSource = m_currentSrcURL; info.uDest = dest; +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 2) QList files; files.append(info); emit q->aboutToCreate(q, files); +#endif KIO_ARGS << m_currentSrcURL << dest << (qint8) false /*no overwrite*/; SimpleJob *newJob = SimpleJobPrivate::newJobNoUi(slave_url, CMD_RENAME, packedArgs); @@ -1102,12 +1106,14 @@ (*renamefileit).uDest.setPath(n, QUrl::DecodedMode); } } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 2) if (!dirs.isEmpty()) { emit q->aboutToCreate(q, dirs); } if (!files.isEmpty()) { emit q->aboutToCreate(q, files); } +#endif } void CopyJobPrivate::slotResultCreatingDirs(KJob *job) @@ -1356,9 +1362,11 @@ emit q->renamed(q, (*it).uDest, newDest); // for e.g. kpropsdlg (*it).uDest = newDest; +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 2) QList files; files.append(*it); emit q->aboutToCreate(q, files); +#endif } else { if (!q->uiDelegateExtension()) { q->Job::slotResult(job); // will set the error and emit result(this) @@ -1542,9 +1550,11 @@ (*it).uDest = newUrl; m_bURLDirty = true; +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 2) QList files; files.append(*it); emit q->aboutToCreate(q, files); +#endif } break; case Result_AutoSkip: diff --git a/src/core/global.cpp b/src/core/global.cpp --- a/src/core/global.cpp +++ b/src/core/global.cpp @@ -96,6 +96,7 @@ } } +#if KIOCORE_BUILD_DEPRECATED_SINCE(3, 4) KIOCORE_EXPORT QTime KIO::calculateRemaining(KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed) { QTime remainingTime; @@ -119,6 +120,7 @@ return remainingTime; } +#endif KIOCORE_EXPORT QString KIO::itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize) { @@ -289,7 +291,9 @@ return u.adjusted(QUrl::RemoveFilename); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 61) QString KIO::suggestName(const QUrl &baseURL, const QString &oldName) { return KFileUtils::suggestName(baseURL, oldName); } +#endif diff --git a/src/core/idleslave.cpp b/src/core/idleslave.cpp --- a/src/core/idleslave.cpp +++ b/src/core/idleslave.cpp @@ -67,7 +67,11 @@ deleteLater(); } else if (cmd == MSG_SLAVE_ACK) { deleteLater(); - } else if (cmd != MSG_SLAVE_STATUS_V2 && cmd != MSG_SLAVE_STATUS) { + } else if (cmd != MSG_SLAVE_STATUS_V2 +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 45) + && cmd != MSG_SLAVE_STATUS +#endif + ) { qCritical() << "Unexpected data from KIO slave."; deleteLater(); } else { diff --git a/src/core/job.cpp b/src/core/job.cpp --- a/src/core/job.cpp +++ b/src/core/job.cpp @@ -53,11 +53,12 @@ delete d_ptr; } -// Exists for historical reasons only +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) KJobUiDelegate *Job::ui() const { return uiDelegate(); } +#endif JobUiDelegateExtension *Job::uiDelegateExtension() const { diff --git a/src/core/kfileitem.cpp b/src/core/kfileitem.cpp --- a/src/core/kfileitem.cpp +++ b/src/core/kfileitem.cpp @@ -529,11 +529,13 @@ { } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) KFileItem::KFileItem(mode_t mode, mode_t permissions, const QUrl &url, bool delayedMimeTypes) : d(new KFileItemPrivate(KIO::UDSEntry(), mode, permissions, url, false, delayedMimeTypes, KFileItem::NormalMimeTypeDetermination)) { } +#endif KFileItem::KFileItem(const QUrl &url, const QString &mimeType, mode_t mode) : d(new KFileItemPrivate(KIO::UDSEntry(), mode, KFileItem::Unknown, @@ -1264,6 +1266,7 @@ return !isDir(); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 0) bool KFileItem::acceptsDrops() const { // A directory ? @@ -1287,6 +1290,7 @@ return false; } +#endif QString KFileItem::getStatusBarInfo() const { @@ -1394,6 +1398,7 @@ return d->time(which).toString(); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 0) QString KFileItem::timeString(unsigned int which) const { if (!d) { @@ -1410,11 +1415,14 @@ return timeString(ModificationTime); } } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 0) void KFileItem::assign(const KFileItem &item) { *this = item; } +#endif QUrl KFileItem::mostLocalUrl(bool *local) const { diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp --- a/src/core/ksambashare.cpp +++ b/src/core/ksambashare.cpp @@ -55,12 +55,13 @@ KSambaSharePrivate::KSambaSharePrivate(KSambaShare *parent) : q_ptr(parent) , data() - , smbConf() , userSharePath() , skipUserShare(false) { setUserSharePath(); +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 6) findSmbConf(); +#endif data = parse(getNetUserShareInfo()); } @@ -80,6 +81,7 @@ return false; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 6) // Try to find the samba config file path // in several well-known paths bool KSambaSharePrivate::findSmbConf() @@ -96,6 +98,7 @@ return false; } +#endif void KSambaSharePrivate::setUserSharePath() { @@ -488,11 +491,13 @@ delete d_ptr; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 6) QString KSambaShare::smbConfPath() const { Q_D(const KSambaShare); return d->smbConf; } +#endif bool KSambaShare::isDirectoryShared(const QString &path) const { diff --git a/src/core/ksambashare_p.h b/src/core/ksambashare_p.h --- a/src/core/ksambashare_p.h +++ b/src/core/ksambashare_p.h @@ -36,7 +36,9 @@ ~KSambaSharePrivate(); static bool isSambaInstalled(); +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 6) bool findSmbConf(); +#endif void setUserSharePath(); static int runProcess(const QString &progName, const QStringList &args, diff --git a/src/core/ksslcertificatemanager.h b/src/core/ksslcertificatemanager.h --- a/src/core/ksslcertificatemanager.h +++ b/src/core/ksslcertificatemanager.h @@ -79,7 +79,11 @@ * @since 5.64 */ void setIgnoredErrors(const QList &errors); - QList ignoredErrors() const; // TODO KF6 return QSslError::SslError list +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) + QList ignoredErrors() const; +#else + QList ignoredErrors() const; +#endif #if KIOCORE_ENABLE_DEPRECATED_SINCE(5, 64) /** @deprecated since 5.64, use the QSslError variant. */ KIOCORE_DEPRECATED_VERSION(5, 64, "Use KSslCertificateRule::filterErrors(const QList &)") diff --git a/src/core/ksslcertificatemanager.cpp b/src/core/ksslcertificatemanager.cpp --- a/src/core/ksslcertificatemanager.cpp +++ b/src/core/ksslcertificatemanager.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include "kssld_interface.h" @@ -112,16 +113,19 @@ return d->isRejected; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) bool KSslCertificateRule::isErrorIgnored(KSslError::Error error) const { return d->ignoredErrors.contains(KSslErrorPrivate::errorFromKSslError(error)); } +#endif bool KSslCertificateRule::isErrorIgnored(QSslError::SslError error) const { return d->ignoredErrors.contains(error); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) void KSslCertificateRule::setIgnoredErrors(const QList &errors) { d->ignoredErrors.clear(); @@ -133,7 +137,9 @@ } } } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) void KSslCertificateRule::setIgnoredErrors(const QList &errors) { QList el; @@ -143,6 +149,7 @@ } setIgnoredErrors(el); } +#endif void KSslCertificateRule::setIgnoredErrors(const QList &errors) { @@ -164,16 +171,23 @@ } } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) QList KSslCertificateRule::ignoredErrors() const { - // TODO KF6: return d->ignoredErrors - // return d->ignoredErrors; + // KF6: replace by QList below QList errors; errors.reserve(d->ignoredErrors.size()); std::transform(d->ignoredErrors.cbegin(), d->ignoredErrors.cend(), std::back_inserter(errors), KSslErrorPrivate::errorFromQSslError); return errors; } +#else +QList KSslCertificateRule::ignoredErrors() const +{ + return d->ignoredErrors; +} +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) QList KSslCertificateRule::filterErrors(const QList &errors) const { QList ret; @@ -184,7 +198,9 @@ } return ret; } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) QList KSslCertificateRule::filterErrors(const QList &errors) const { QList ret; @@ -195,6 +211,7 @@ } return ret; } +#endif QList KSslCertificateRule::filterErrors(const QList &errors) const { @@ -501,6 +518,7 @@ return d->defaultCaCertificates; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) //static QList KSslCertificateManager::nonIgnorableErrors(const QList &errors) { @@ -511,7 +529,9 @@ }); return ret; } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) //static QList KSslCertificateManager::nonIgnorableErrors(const QList &errors) { @@ -522,6 +542,7 @@ }); return ret; } +#endif QList KSslCertificateManager::nonIgnorableErrors(const QList &errors) { diff --git a/src/core/ksslcertificatemanager_p.h b/src/core/ksslcertificatemanager_p.h --- a/src/core/ksslcertificatemanager_p.h +++ b/src/core/ksslcertificatemanager_p.h @@ -22,6 +22,8 @@ #define KSSLCERTIFICATEMANAGER_P_H #include +#include +#include #include "kconfig.h" diff --git a/src/core/ksslerror_p.h b/src/core/ksslerror_p.h --- a/src/core/ksslerror_p.h +++ b/src/core/ksslerror_p.h @@ -24,13 +24,15 @@ #include "kiocore_export.h" #include "ktcpsocket.h" +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 65) class KSslErrorPrivate { public: KIOCORE_EXPORT static KSslError::Error errorFromQSslError(QSslError::SslError e); KIOCORE_EXPORT static QSslError::SslError errorFromKSslError(KSslError::Error e); QSslError error; }; +#endif #endif diff --git a/src/core/ksslerroruidata.cpp b/src/core/ksslerroruidata.cpp --- a/src/core/ksslerroruidata.cpp +++ b/src/core/ksslerroruidata.cpp @@ -32,6 +32,7 @@ d->bits = 0; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 65) KSslErrorUiData::KSslErrorUiData(const KTcpSocket *socket) : d(new Private()) { @@ -48,6 +49,7 @@ d->usedBits = socket->sessionCipher().usedBits(); d->bits = socket->sessionCipher().supportedBits(); } +#endif KSslErrorUiData::KSslErrorUiData(const QSslSocket *socket) : d(new Private()) diff --git a/src/core/ktcpsocket.cpp b/src/core/ktcpsocket.cpp --- a/src/core/ktcpsocket.cpp +++ b/src/core/ktcpsocket.cpp @@ -31,6 +31,8 @@ #include #include +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 65) + static KTcpSocket::SslVersion kSslVersionFromQ(QSsl::SslProtocol protocol) { switch (protocol) { @@ -140,6 +142,7 @@ QHash allCiphers; }; +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 65) KSslError::Error KSslErrorPrivate::errorFromQSslError(QSslError::SslError e) { switch (e) { @@ -269,6 +272,7 @@ { return d->error; } +#endif class KTcpSocketPrivate { @@ -1059,3 +1063,5 @@ } #include "moc_ktcpsocket.cpp" + +#endif diff --git a/src/core/scheduler.cpp b/src/core/scheduler.cpp --- a/src/core/scheduler.cpp +++ b/src/core/scheduler.cpp @@ -697,7 +697,9 @@ SessionData sessionData; void doJob(SimpleJob *job); +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 5) void scheduleJob(SimpleJob *job); +#endif void setJobPriority(SimpleJob *job, int priority); void cancelJob(SimpleJob *job); void jobFinished(KIO::SimpleJob *job, KIO::Slave *slave); @@ -810,10 +812,12 @@ schedulerPrivate()->doJob(job); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 5) void Scheduler::scheduleJob(SimpleJob *job) { schedulerPrivate()->scheduleJob(job); } +#endif void Scheduler::setJobPriority(SimpleJob *job, int priority) { @@ -979,11 +983,13 @@ proto->queueJob(job); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 5) void SchedulerPrivate::scheduleJob(SimpleJob *job) { //qDebug() << job; setJobPriority(job, 1); } +#endif void SchedulerPrivate::setJobPriority(SimpleJob *job, int priority) { diff --git a/src/core/slavebase.cpp b/src/core/slavebase.cpp --- a/src/core/slavebase.cpp +++ b/src/core/slavebase.cpp @@ -753,6 +753,7 @@ send(INF_INFOMESSAGE, data); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) bool SlaveBase::requestNetwork(const QString &host) { KIO_DATA << host << d->slaveid; @@ -767,19 +768,23 @@ return false; } } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) void SlaveBase::dropNetwork(const QString &host) { KIO_DATA << host << d->slaveid; send(MSG_NET_DROP, data); } +#endif void SlaveBase::statEntry(const UDSEntry &entry) { KIO_DATA << entry; send(MSG_STAT_ENTRY, data); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) void SlaveBase::listEntry(const UDSEntry &entry, bool _ready) { if (_ready) { @@ -794,6 +799,7 @@ listEntry(entry); } } +#endif void SlaveBase::listEntry(const UDSEntry &entry) { @@ -998,11 +1004,13 @@ d->remotefile = nullptr; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 24) bool SlaveBase::openPasswordDialog(AuthInfo &info, const QString &errorMsg) { const int errorCode = openPasswordDialogV2(info, errorMsg); return errorCode == KJob::NoError; } +#endif int SlaveBase::openPasswordDialogV2(AuthInfo &info, const QString &errorMsg) { diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp --- a/src/core/slaveinterface.cpp +++ b/src/core/slaveinterface.cpp @@ -50,17 +50,21 @@ delete d_ptr; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) void SlaveInterface::setConnection(Connection *connection) { Q_D(SlaveInterface); d->connection = connection; } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 0) Connection *SlaveInterface::connection() const { const Q_D(SlaveInterface); return d->connection; } +#endif static KIO::filesize_t readFilesize_t(QDataStream &stream) { @@ -187,7 +191,9 @@ //qDebug() << "error " << i << " " << str1; emit error(i, str1); break; +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 45) case MSG_SLAVE_STATUS: +#endif case MSG_SLAVE_STATUS_V2: { qint64 pid; QByteArray protocol; @@ -238,8 +244,10 @@ d->speed_timer.stop(); emit speed(ul); break; +#if KIOCORE_BUILD_DEPRECATED_SINCE(3, 0) case INF_GETTING_FILE: break; +#endif case INF_ERROR_PAGE: emit errorPage(); break; diff --git a/src/core/statjob.cpp b/src/core/statjob.cpp --- a/src/core/statjob.cpp +++ b/src/core/statjob.cpp @@ -74,10 +74,12 @@ { } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 0) void StatJob::setSide(bool source) { d_func()->m_bSource = source; } +#endif void StatJob::setSide(StatSide side) { @@ -217,6 +219,7 @@ return job; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 0) StatJob *KIO::stat(const QUrl &url, bool sideIsSource, short int details, JobFlags flags) { //qCDebug(KIO_CORE) << "stat" << url; @@ -226,6 +229,7 @@ job->setDetails(details); return job; } +#endif StatJob *KIO::statDetails(const QUrl &url, KIO::StatJob::StatSide side, KIO::StatDetails details, JobFlags flags) { @@ -238,6 +242,7 @@ return job; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 69) StatJob *KIO::stat(const QUrl &url, KIO::StatJob::StatSide side, short int details, JobFlags flags) { //qCDebug(KIO_CORE) << "stat" << url; @@ -247,5 +252,6 @@ job->setDetails(details); return job; } +#endif #include "moc_statjob.cpp" diff --git a/src/core/transferjob.cpp b/src/core/transferjob.cpp --- a/src/core/transferjob.cpp +++ b/src/core/transferjob.cpp @@ -197,6 +197,7 @@ d->m_extraFlags &= ~JobPrivate::EF_TransferJobNeedData; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 3) void TransferJob::setReportDataSent(bool enabled) { Q_D(TransferJob); @@ -206,11 +207,14 @@ d->m_extraFlags &= ~JobPrivate::EF_TransferJobDataSent; } } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(4, 3) bool TransferJob::reportDataSent() const { return (d_func()->m_extraFlags & JobPrivate::EF_TransferJobDataSent); } +#endif QString TransferJob::mimetype() const { diff --git a/src/core/udsentry.cpp b/src/core/udsentry.cpp --- a/src/core/udsentry.cpp +++ b/src/core/udsentry.cpp @@ -46,7 +46,9 @@ int count() const; QString stringValue(uint udsField) const; long long numberValue(uint udsField, long long defaultValue = -1) const; +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 8) QList listFields() const; +#endif QVector fields() const; bool contains(uint udsField) const; void clear(); @@ -143,6 +145,7 @@ return defaultValue; } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 8) QList UDSEntryPrivate::listFields() const { QList res; @@ -152,6 +155,7 @@ } return res; } +#endif QVector UDSEntryPrivate::fields() const { @@ -393,15 +397,19 @@ d->insert(field, value); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 48) void UDSEntry::insert(uint field, const QString &value) { d->replace(field, value); } +#endif +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 48) void UDSEntry::insert(uint field, long long value) { d->replace(field, value); } +#endif void UDSEntry::replace(uint field, const QString &value) { @@ -413,10 +421,12 @@ d->replace(field, value); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 8) QList UDSEntry::listFields() const { return d->listFields(); } +#endif QVector UDSEntry::fields() const { diff --git a/src/filewidgets/CMakeLists.txt b/src/filewidgets/CMakeLists.txt --- a/src/filewidgets/CMakeLists.txt +++ b/src/filewidgets/CMakeLists.txt @@ -70,6 +70,7 @@ VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 4.3 4.5 5.0 5.33 5.66 5.70 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) # TODO: add support for EXCLUDE_DEPRECATED_BEFORE_AND_AT to all KIO libs # needs fixing of undeprecated API being still implemented using own deprecated API diff --git a/src/filewidgets/kfilepreviewgenerator.cpp b/src/filewidgets/kfilepreviewgenerator.cpp --- a/src/filewidgets/kfilepreviewgenerator.cpp +++ b/src/filewidgets/kfilepreviewgenerator.cpp @@ -1246,11 +1246,12 @@ return d->m_previewShown; } -// deprecated (use updateIcons() instead) +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 3) void KFilePreviewGenerator::updatePreviews() { updateIcons(); } +#endif void KFilePreviewGenerator::updateIcons() { diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp --- a/src/filewidgets/kfilewidget.cpp +++ b/src/filewidgets/kfilewidget.cpp @@ -1600,6 +1600,7 @@ return true; } +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(5, 33) void KFileWidget::setSelection(const QString &url) { // qDebug() << "setSelection " << url; @@ -1617,6 +1618,7 @@ setSelectedUrl(urlFromString(url)); } +#endif void KFileWidget::setSelectedUrl(const QUrl &url) { diff --git a/src/filewidgets/kurlnavigator.cpp b/src/filewidgets/kurlnavigator.cpp --- a/src/filewidgets/kurlnavigator.cpp +++ b/src/filewidgets/kurlnavigator.cpp @@ -1138,23 +1138,29 @@ } } +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) void KUrlNavigator::setUrl(const QUrl &url) { // deprecated setLocationUrl(url); } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) void KUrlNavigator::saveRootUrl(const QUrl &url) { // deprecated d->m_history[d->m_historyIndex].rootUrl = url; } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) void KUrlNavigator::savePosition(int x, int y) { // deprecated d->m_history[d->m_historyIndex].pos = QPoint(x, y); } +#endif void KUrlNavigator::keyPressEvent(QKeyEvent *event) { @@ -1266,6 +1272,7 @@ return d->m_dropWidget; } +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) const QUrl &KUrlNavigator::url() const { // deprecated @@ -1276,19 +1283,25 @@ url = locationUrl(); return url; } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) QUrl KUrlNavigator::url(int index) const { // deprecated return d->buttonUrl(index); } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) QUrl KUrlNavigator::historyUrl(int historyIndex) const { // deprecated return locationUrl(historyIndex); } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) const QUrl &KUrlNavigator::savedRootUrl() const { // deprecated @@ -1299,17 +1312,22 @@ rootUrl = d->m_history[d->m_historyIndex].rootUrl; return rootUrl; } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) QPoint KUrlNavigator::savedPosition() const { // deprecated return d->m_history[d->m_historyIndex].pos; } +#endif +#if KIOFILEWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) void KUrlNavigator::setHomeUrl(const QString &homeUrl) { // deprecated setLocationUrl(QUrl::fromUserInput(homeUrl)); } +#endif #include "moc_kurlnavigator.cpp" diff --git a/src/kssld/kssld.cpp b/src/kssld/kssld.cpp --- a/src/kssld/kssld.cpp +++ b/src/kssld/kssld.cpp @@ -114,7 +114,12 @@ if (rule.isRejected()) { sl.append(QStringLiteral("Reject")); } else { - foreach (QSslError::SslError e, rule.d->ignoredErrors) { // TODO KF6 call ignoredErrors() method instead +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) + foreach (QSslError::SslError e, rule.d->ignoredErrors) { +#else + const auto ignoredErrors = rule.ignoredErrors(); + for (QSslError::SslError e : ignoredErrors) { +#endif sl.append(d->sslErrorToString.value(e)); } } diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -106,6 +106,7 @@ VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 4.0 4.1 4.3 4.4 4.5 4.6 4.7 5.0 5.4 5.6 5.25 5.31 5.32 5.64 5.66 5.71 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) # TODO: add support for EXCLUDE_DEPRECATED_BEFORE_AND_AT to all KIO libs # needs fixing of undeprecated API being still implemented using own deprecated API diff --git a/src/widgets/accessmanager.cpp b/src/widgets/accessmanager.cpp --- a/src/widgets/accessmanager.cpp +++ b/src/widgets/accessmanager.cpp @@ -128,6 +128,7 @@ return d->externalContentAllowed; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) void AccessManager::setCookieJarWindowId(WId id) { QWidget *window = QWidget::find(id); @@ -142,6 +143,7 @@ d->window = window->isWindow() ? window : window->window(); } +#endif void AccessManager::setWindow(QWidget *widget) { @@ -161,6 +163,7 @@ } } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) WId AccessManager::cookieJarWindowid() const { KIO::Integration::CookieJar *jar = qobject_cast (cookieJar()); @@ -170,6 +173,7 @@ return 0; } +#endif QWidget *AccessManager::window() const { diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp --- a/src/widgets/kdirmodel.cpp +++ b/src/widgets/kdirmodel.cpp @@ -1134,12 +1134,14 @@ } } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 0) QModelIndex KDirModel::indexForItem(const KFileItem *item) const { // Note that we can only use the URL here, not the pointer. // KFileItems can be copied. return indexForUrl(item->url()); // O(n) } +#endif QModelIndex KDirModel::indexForItem(const KFileItem &item) const { diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp --- a/src/widgets/kpropertiesdialog.cpp +++ b/src/widgets/kpropertiesdialog.cpp @@ -713,10 +713,12 @@ delete d; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 1) bool KPropertiesDialogPlugin::isDesktopFile(const KFileItem &_item) { return _item.isDesktopFile(); } +#endif void KPropertiesDialogPlugin::setDirty(bool b) { diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp --- a/src/widgets/krun.cpp +++ b/src/widgets/krun.cpp @@ -165,6 +165,7 @@ } } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 31) bool KRun::runUrl(const QUrl &url, const QString &mimetype, QWidget *window, bool tempFile, bool runExecutables, const QString &suggestedFileName, const QByteArray &asn) { RunFlags flags = tempFile ? KRun::DeleteTemporaryFiles : RunFlags(); @@ -174,7 +175,9 @@ return runUrl(url, mimetype, window, flags, suggestedFileName, asn); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) // This is called by foundMimeType, since it knows the mimetype of the URL bool KRun::runUrl(const QUrl &u, const QString &_mimetype, QWidget *window, RunFlags flags, const QString &suggestedFileName, const QByteArray &asn) { @@ -190,6 +193,7 @@ job->start(); return true; } +#endif bool KRun::displayOpenWithDialog(const QList &lst, QWidget *window, bool tempFiles, const QString &suggestedFileName, const QByteArray &asn) @@ -224,6 +228,7 @@ return false; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 0) void KRun::shellQuote(QString &_str) { // Credits to Walter, says Bernd G. :) @@ -233,19 +238,24 @@ const QChar q = QLatin1Char('\''); _str.replace(q, QLatin1String("'\\''")).prepend(q).append(q); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) QStringList KRun::processDesktopExec(const KService &_service, const QList &_urls, bool tempFiles, const QString &suggestedFileName) { KIO::DesktopExecParser parser(_service, _urls); parser.setUrlsAreTempFiles(tempFiles); parser.setSuggestedFileName(suggestedFileName); return parser.resultingArguments(); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) QString KRun::binaryName(const QString &execLine, bool removePath) { return removePath ? KIO::DesktopExecParser::executableName(execLine) : KIO::DesktopExecParser::executablePath(execLine); } +#endif // This code is also used in klauncher. // TODO: port klauncher to KIOGuiPrivate::checkStartupNotify once this lands @@ -255,13 +265,16 @@ return KIOGuiPrivate::checkStartupNotify(service, silent_arg, wmclass_arg); } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 6) bool KRun::run(const KService &_service, const QList &_urls, QWidget *window, bool tempFiles, const QString &suggestedFileName, const QByteArray &asn) { const RunFlags flags = tempFiles ? KRun::DeleteTemporaryFiles : RunFlags(); return runApplication(_service, _urls, window, flags, suggestedFileName, asn) != 0; } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) qint64 KRun::runApplication(const KService &service, const QList &urls, QWidget *window, RunFlags flags, const QString &suggestedFileName, const QByteArray &asn) @@ -286,7 +299,9 @@ job->waitForStarted(); return job->error() ? 0 : job->pid(); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) qint64 KRun::runService(const KService &_service, const QList &_urls, QWidget *window, bool tempFiles, const QString &suggestedFileName, const QByteArray &asn) { @@ -297,15 +312,19 @@ suggestedFileName, asn); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) bool KRun::run(const QString &_exec, const QList &_urls, QWidget *window, const QString &_name, const QString &_icon, const QByteArray &asn) { KService::Ptr service(new KService(_name, _exec, _icon)); return runApplication(*service, _urls, window, RunFlags{}, QString(), asn); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) bool KRun::runCommand(const QString &cmd, QWidget *window, const QString &workingDirectory) { if (cmd.isEmpty()) { @@ -322,12 +341,16 @@ const QString &bin = args.first(); return KRun::runCommand(cmd, bin, bin /*iconName*/, window, QByteArray(), workingDirectory); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) bool KRun::runCommand(const QString &cmd, const QString &execName, const QString &iconName, QWidget *window, const QByteArray &asn) { return runCommand(cmd, execName, iconName, window, asn, QString()); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 71) bool KRun::runCommand(const QString &cmd, const QString &execName, const QString &iconName, QWidget *window, const QByteArray &asn, const QString &workingDirectory) { @@ -342,6 +365,7 @@ } return KRunPrivate::runCommandLauncherJob(job, window); } +#endif KRun::KRun(const QUrl &url, QWidget *window, bool showProgressInfo, const QByteArray &asn) @@ -1010,40 +1034,52 @@ return d->m_job; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 4) QTimer &KRun::timer() { return *d->m_timer; } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 1) void KRun::setDoScanFile(bool scanFile) { d->m_bScanFile = scanFile; } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 1) bool KRun::doScanFile() const { return d->m_bScanFile; } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 1) void KRun::setIsDirecory(bool isDirectory) { d->m_bIsDirectory = isDirectory; } +#endif bool KRun::isDirectory() const { return d->m_bIsDirectory; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 1) void KRun::setInitializeNextAction(bool initialize) { d->m_bInit = initialize; } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 1) bool KRun::initializeNextAction() const { return d->m_bInit; } +#endif bool KRun::isLocalFile() const { diff --git a/src/widgets/ksslinfodialog.h b/src/widgets/ksslinfodialog.h --- a/src/widgets/ksslinfodialog.h +++ b/src/widgets/ksslinfodialog.h @@ -23,6 +23,7 @@ #define _KSSLINFODIALOG_H #include +#include #include "kiowidgets_export.h" #include "ktcpsocket.h" // TODO KF6 remove this include diff --git a/src/widgets/ksslinfodialog.cpp b/src/widgets/ksslinfodialog.cpp --- a/src/widgets/ksslinfodialog.cpp +++ b/src/widgets/ksslinfodialog.cpp @@ -122,6 +122,7 @@ } } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 64) void KSslInfoDialog::setSslInfo(const QList &certificateChain, const QString &ip, const QString &host, const QString &sslProtocol, const QString &cipher, @@ -140,6 +141,7 @@ } setSslInfo(certificateChain, ip, host, sslProtocol, cipher, usedBits, bits, qValidationErrors); } +#endif void KSslInfoDialog::setSslInfo(const QList &certificateChain, const QString &ip, const QString &host, @@ -229,6 +231,7 @@ d->issuer->setCertificate(cert, KSslCertificateBox::Issuer); } +#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 65) //static QList > KSslInfoDialog::errorsFromString(const QString &es) { @@ -257,6 +260,7 @@ } return ret; } +#endif //static QList> KSslInfoDialog::certificateErrorsFromString(const QString &errorsString) diff --git a/src/widgets/kurifilter.cpp b/src/widgets/kurifilter.cpp --- a/src/widgets/kurifilter.cpp +++ b/src/widgets/kurifilter.cpp @@ -636,10 +636,12 @@ return data.uri().toString(); } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 6) bool KUriFilter::filterSearchUri(KUriFilterData &data) { return filterSearchUri(data, (NormalTextFilter | WebShortcutFilter)); } +#endif bool KUriFilter::filterSearchUri(KUriFilterData &data, SearchFilterTypes types) { diff --git a/src/widgets/kurlrequester.h b/src/widgets/kurlrequester.h --- a/src/widgets/kurlrequester.h +++ b/src/widgets/kurlrequester.h @@ -64,8 +64,10 @@ Q_PROPERTY(QString filter READ filter WRITE setFilter) Q_PROPERTY(KFile::Modes mode READ mode WRITE setMode) Q_PROPERTY(QFileDialog::AcceptMode acceptMode READ acceptMode WRITE setAcceptMode) +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) /// @deprecated Since 5.0, use placeholderText Q_PROPERTY(QString clickMessage READ clickMessage WRITE setClickMessage) +#endif Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(Qt::WindowModality fileDialogModality READ fileDialogModality WRITE setFileDialogModality) diff --git a/src/widgets/kurlrequester.cpp b/src/widgets/kurlrequester.cpp --- a/src/widgets/kurlrequester.cpp +++ b/src/widgets/kurlrequester.cpp @@ -387,10 +387,12 @@ d->setText(url.toDisplayString(QUrl::PreferLocalFile)); } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 3) void KUrlRequester::setPath(const QString &path) { d->setText(path); } +#endif void KUrlRequester::setText(const QString &text) { @@ -645,22 +647,26 @@ return d->myCompletion; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) void KUrlRequester::setClickMessage(const QString &msg) { setPlaceholderText(msg); } +#endif void KUrlRequester::setPlaceholderText(const QString &msg) { if (d->edit) { d->edit->setPlaceholderText(msg); } } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) QString KUrlRequester::clickMessage() const { return placeholderText(); } +#endif QString KUrlRequester::placeholderText() const { diff --git a/src/widgets/kurlrequesterdialog.cpp b/src/widgets/kurlrequesterdialog.cpp --- a/src/widgets/kurlrequesterdialog.cpp +++ b/src/widgets/kurlrequesterdialog.cpp @@ -127,10 +127,12 @@ return url; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) QFileDialog *KUrlRequesterDialog::fileDialog() { return d->urlRequester->fileDialog(); } +#endif KUrlRequester *KUrlRequesterDialog::urlRequester() { diff --git a/src/widgets/paste.cpp b/src/widgets/paste.cpp --- a/src/widgets/paste.cpp +++ b/src/widgets/paste.cpp @@ -45,6 +45,7 @@ #include #include +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 4) // This could be made a public method, if there's a need for pasting only urls // and not random data. /** @@ -73,6 +74,7 @@ } return nullptr; } +#endif static QUrl getDestinationUrl(const QUrl &srcUrl, const QUrl &destUrl, QWidget *widget) { @@ -266,6 +268,7 @@ return putDataAsyncTo(newUrl, ba, widget, KIO::Overwrite); } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 4) // The main method for pasting KIOWIDGETS_EXPORT KIO::Job *KIO::pasteClipboard(const QUrl &destUrl, QWidget *widget, bool move) { @@ -292,7 +295,9 @@ return pasteMimeDataImpl(mimeData, destUrl, QString(), widget, true /*clipboard*/); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 4) QString KIO::pasteActionText() { const QMimeData *mimeData = QApplication::clipboard()->mimeData(); @@ -309,6 +314,7 @@ return QString(); } } +#endif KIOWIDGETS_EXPORT QString KIO::pasteActionText(const QMimeData *mimeData, bool *enable, const KFileItem &destItem) { @@ -353,12 +359,14 @@ } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 4) // The [new] main method for dropping KIOWIDGETS_EXPORT KIO::Job *KIO::pasteMimeData(const QMimeData *mimeData, const QUrl &destUrl, const QString &dialogText, QWidget *widget) { return pasteMimeDataImpl(mimeData, destUrl, dialogText, widget, false /*not clipboard*/); } +#endif KIOWIDGETS_EXPORT void KIO::setClipboardDataCut(QMimeData* mimeData, bool cut) { diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp --- a/src/widgets/previewjob.cpp +++ b/src/widgets/previewjob.cpp @@ -164,6 +164,7 @@ Q_DECLARE_PUBLIC(PreviewJob) }; +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 7) PreviewJob::PreviewJob(const KFileItemList &items, int width, int height, int iconSize, int iconAlpha, bool scale, bool save, const QStringList *enabledPlugins) @@ -179,6 +180,7 @@ // Return to event loop first, determineNextFile() might delete this; QTimer::singleShot(0, this, SLOT(startPreview())); } +#endif PreviewJob::PreviewJob(const KFileItemList &items, const QSize &size, @@ -784,14 +786,17 @@ return result; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 7) PreviewJob *KIO::filePreview(const KFileItemList &items, int width, int height, int iconSize, int iconAlpha, bool scale, bool save, const QStringList *enabledPlugins) { return new PreviewJob(items, width, height, iconSize, iconAlpha, scale, save, enabledPlugins); } +#endif +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 7) PreviewJob *KIO::filePreview(const QList &items, int width, int height, int iconSize, int iconAlpha, bool scale, bool save, const QStringList *enabledPlugins) @@ -805,16 +810,19 @@ return new PreviewJob(fileItems, width, height, iconSize, iconAlpha, scale, save, enabledPlugins); } +#endif PreviewJob *KIO::filePreview(const KFileItemList &items, const QSize &size, const QStringList *enabledPlugins) { return new PreviewJob(items, size, enabledPlugins); } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(4, 5) KIO::filesize_t PreviewJob::maximumFileSize() { KConfigGroup cg(KSharedConfig::openConfig(), "PreviewSettings"); return cg.readEntry("MaximumSize", 5 * 1024 * 1024LL /* 5MB */); } +#endif #include "moc_previewjob.cpp" diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp --- a/src/widgets/renamedialog.cpp +++ b/src/widgets/renamedialog.cpp @@ -476,10 +476,12 @@ } } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) QString RenameDialog::suggestName(const QUrl &baseURL, const QString &oldName) { return KFileUtils::suggestName(baseURL, oldName); } +#endif // Propose button clicked void RenameDialog::suggestNewNamePressed() diff --git a/src/widgets/sslui.cpp b/src/widgets/sslui.cpp --- a/src/widgets/sslui.cpp +++ b/src/widgets/sslui.cpp @@ -26,11 +26,13 @@ #include #include +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 64) bool KIO::SslUi::askIgnoreSslErrors(const KTcpSocket *socket, RulesStorage storedRules) { KSslErrorUiData uiData(socket); return askIgnoreSslErrors(uiData, storedRules); } +#endif bool KIO::SslUi::askIgnoreSslErrors(const KSslErrorUiData &uiData, RulesStorage storedRules) { diff --git a/src/widgets/thumbcreator.cpp b/src/widgets/thumbcreator.cpp --- a/src/widgets/thumbcreator.cpp +++ b/src/widgets/thumbcreator.cpp @@ -30,9 +30,11 @@ return None; } +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 0) ThumbCreatorV2::~ThumbCreatorV2() { } +#endif QWidget *ThumbCreator::createConfigurationWidget() { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,6 +19,11 @@ endforeach() endmacro(KIOWIDGETS_EXECUTABLE_TESTS) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.71.0) + set(runapplication_EXE runapplication) +endif() + KIOWIDGETS_EXECUTABLE_TESTS( getalltest kruntest @@ -41,5 +46,5 @@ kprotocolinfo_dumper kfilewidgettest_gui kfilewidgettest_saving_gui - runapplication + ${runapplication_EXE} )