diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 17545f32e..98d2a7d2a 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -549,8 +549,13 @@ bool MainWindow::queryClose() // Check what processes are running, excluding the shell QStringList processesRunning; - // Once Qt5.14+ is the mininum, change to use range constructors - const auto uniqueSessions = QSet::fromList(_viewManager->sessions()); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + // Need to make a local copy so the begin() and end() point to the same QList + const QList sessionList = _viewManager->sessions(); + const QSet uniqueSessions(sessionList.begin(), sessionList.end()); +#else + const QSet uniqueSessions = QSet::fromList(_viewManager->sessions()); +#endif for (Session *session : uniqueSessions) { if ((session == nullptr) || !session->isForegroundProcessActive()) { diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp index 7196dc1f3..aa61a41fa 100644 --- a/src/ProcessInfo.cpp +++ b/src/ProcessInfo.cpp @@ -131,8 +131,13 @@ QSet ProcessInfo::commonDirNames() if (forTheFirstTime) { const KSharedConfigPtr &config = KSharedConfig::openConfig(); const KConfigGroup &configGroup = config->group("ProcessInfo"); - // Once Qt5.14+ is the mininum, change to use range constructors +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + // Need to make a local copy so the begin() and end() point to the same QList + const QStringList commonDirsList = configGroup.readEntry("CommonDirNames", QStringList()); + _commonDirNames = QSet(commonDirsList.begin(), commonDirsList.end()); +#else _commonDirNames = QSet::fromList(configGroup.readEntry("CommonDirNames", QStringList())); +#endif forTheFirstTime = false; } diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp index db7f8b192..bde6e6b45 100644 --- a/src/ProfileManager.cpp +++ b/src/ProfileManager.cpp @@ -309,8 +309,7 @@ void ProfileManager::saveSettings() QList ProfileManager::sortedFavorites() { - // Once Qt5.14+ is the mininum, change to use range constructors - QList favorites = findFavorites().toList(); + QList favorites = findFavorites().values(); sortProfiles(favorites); return favorites; @@ -320,14 +319,12 @@ QList ProfileManager::allProfiles() { loadAllProfiles(); - // Once Qt5.14+ is the mininum, change to use range constructors - return _profiles.toList(); + return _profiles.values(); } QList ProfileManager::loadedProfiles() const { - // Once Qt5.14+ is the mininum, change to use range constructors - return _profiles.toList(); + return _profiles.values(); } Profile::Ptr ProfileManager::defaultProfile() const @@ -643,9 +640,12 @@ void ProfileManager::loadFavorites() QSet favoriteSet; if (favoriteGroup.hasKey("Favorites")) { - QStringList list = favoriteGroup.readEntry("Favorites", QStringList()); - // Once Qt5.14+ is the mininum, change to use range constructors + const QStringList list = favoriteGroup.readEntry("Favorites", QStringList()); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + favoriteSet = QSet(list.begin(), list.end()); +#else favoriteSet = QSet::fromList(list); +#endif } // look for favorites among those already loaded diff --git a/src/SessionController.cpp b/src/SessionController.cpp index c78b60f76..c97b20e7c 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -1058,9 +1058,12 @@ void SessionController::copyInputToAllTabs() // Find our window ... const KXmlGuiWindow* myWindow = findWindow(_view); - // Once Qt5.14+ is the mininum, change to use range constructors - QSet group = - QSet::fromList(SessionManager::instance()->sessions()); + const QList sessionsList = SessionManager::instance()->sessions(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + QSet group(sessionsList.begin(), sessionsList.end()); +#else + QSet group = QSet::fromList(sessionsList); +#endif for (auto session : group) { // First, ensure that the session is removed // (necessary to avoid duplicates on addSession()!) @@ -1090,8 +1093,13 @@ void SessionController::copyInputToSelectedTabs() QPointer dialog = new CopyInputDialog(_view); dialog->setMasterSession(_session); - // Once Qt5.14+ is the mininum, change to use range constructors - QSet currentGroup = QSet::fromList(_copyToGroup->sessions()); + const QList sessionsList = _copyToGroup->sessions(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + QSet currentGroup(sessionsList.begin(), sessionsList.end()); +#else + QSet currentGroup = QSet::fromList(sessionsList); +#endif + currentGroup.remove(_session); dialog->setChosenSessions(currentGroup); @@ -1129,8 +1137,13 @@ void SessionController::copyInputToNone() } // Once Qt5.14+ is the mininum, change to use range constructors - QSet group = - QSet::fromList(SessionManager::instance()->sessions()); + const QList groupList = SessionManager::instance()->sessions(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + QSet group(groupList.begin(), groupList.end()); +#else + QSet group = QSet::fromList(groupList); +#endif + for (auto iterator : group) { Session* session = iterator; diff --git a/src/ViewSplitter.cpp b/src/ViewSplitter.cpp index ea208aef0..40bc0c482 100644 --- a/src/ViewSplitter.cpp +++ b/src/ViewSplitter.cpp @@ -88,7 +88,6 @@ ViewSplitter *ViewSplitter::activeSplitter() void ViewSplitter::updateSizes() { const int space = (orientation() == Qt::Horizontal ? width() : height()) / count(); - // Once Qt5.14+ is the mininum, change to use range constructors setSizes(QVector(count(), space).toList()); }