mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-03 20:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmake-gui: Replace obsolete QDirModel with QFileSystemModel

Browse Source
This commit is contained in:
Sankhesh Jhaveri
2020-12-17 18:28:24 -05:00
committed by Brad King
parent 684dcdbc5b
commit 020b2766f3
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/QtDialog/QCMakeWidgets.cxx
View File

@@ -1,17 +1,13 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
// FIXME: Port to QFileSystemModel from the deprecated QDirModel.
// Be sure completion works when incrementally editing existing paths.
#define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION_CHECK(5, 14, 0)
#include "QCMakeWidgets.h"
#include <utility>
#include <QDirModel>
#include <QFileDialog>
#include <QFileInfo>
#include <QFileSystemModel>
#include <QResizeEvent>
#include <QToolButton>
@@ -93,20 +89,20 @@ void QCMakePathEditor::chooseFile()
}
}
// use same QDirModel for all completers
static QDirModel* fileDirModel()
// use same QFileSystemModel for all completers
static QFileSystemModel* fileDirModel()
{
static QDirModel* m = nullptr;
static QFileSystemModel* m = nullptr;
if (!m) {
m = new QDirModel();
m = new QFileSystemModel();
}
return m;
}
static QDirModel* pathDirModel()
static QFileSystemModel* pathDirModel()
{
static QDirModel* m = nullptr;
static QFileSystemModel* m = nullptr;
if (!m) {
m = new QDirModel();
m = new QFileSystemModel();
m->setFilter(QDir::AllDirs | QDir::Drives | QDir::NoDotAndDotDot);
}
return m;
@@ -115,8 +111,9 @@ static QDirModel* pathDirModel()
QCMakeFileCompleter::QCMakeFileCompleter(QObject* o, bool dirs)
: QCompleter(o)
{
QDirModel* m = dirs ? pathDirModel() : fileDirModel();
QFileSystemModel* m = dirs ? pathDirModel() : fileDirModel();
this->setModel(m);
m->setRootPath(QString());
}
QString QCMakeFileCompleter::pathFromIndex(const QModelIndex& idx) const