feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AdvandedDockingSystem: Fix deprecation warnings

Browse Source 
Change-Id: I21193c2b275f9c11d25eef11bdbe2931ad2ea4ff
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-02-21 10:45:31 +01:00
parent 8d71943cfa
commit 21ab7e59d7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/advanceddockingsystem/dockmanager.cpp
View File

@@ -46,6 +46,7 @@
#include "workspacedialog.h" #include "workspacedialog.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <algorithm> #include <algorithm>
@@ -613,7 +614,7 @@ namespace ADS
QStringList DockManager::workspaces() QStringList DockManager::workspaces()
{ {
if (d->m_workspaces.isEmpty() || d->m_workspaceListDirty) { if (d->m_workspaces.isEmpty() || d->m_workspaceListDirty) {
auto tmp = QSet<QString>::fromList(d->m_workspaces); auto tmp = Utils::toSet(d->m_workspaces);
QTC_ASSERT(d->m_settings, return {}); QTC_ASSERT(d->m_settings, return {});
QDir workspaceDir(QFileInfo(d->m_settings->fileName()).path() + QLatin1Char('/') QDir workspaceDir(QFileInfo(d->m_settings->fileName()).path() + QLatin1Char('/')
@@ -632,7 +633,7 @@ namespace ADS
//d->m_workspaces.prepend(QLatin1String(Constants::DEFAULT_NAME)); //d->m_workspaces.prepend(QLatin1String(Constants::DEFAULT_NAME));
d->m_workspaceListDirty = false; d->m_workspaceListDirty = false;
d->m_workspaces = tmp.toList(); d->m_workspaces = Utils::toList(tmp);
} }
return d->m_workspaces; return d->m_workspaces;
} }