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

Squash more deprecation warnings

Browse Source 
What a pain.

Change-Id: I257e06c647933cc0b752c3c7a83a925b8b627e59
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-02-26 17:48:18 +01:00
parent a2d9acb6ec
commit 8e6ac695a8
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/tracing/tracestashfile.h
View File

@@ -153,7 +153,7 @@ public:
void clear() void clear()
{ {
file.remove(); file.remove();
stream.unsetDevice(); stream.setDevice(nullptr);
} }
bool flush() bool flush()

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -676,7 +676,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)
QTC_ASSERT(m_psIsAlive, return); QTC_ASSERT(m_psIsAlive, return);
m_psIsAlive->setObjectName("IsAliveProcess"); m_psIsAlive->setObjectName("IsAliveProcess");
m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels); m_psIsAlive->setProcessChannelMode(QProcess::MergedChannels);
connect(m_psIsAlive.get(), static_cast<void(QProcess::*)(int)>(&QProcess::finished), connect(m_psIsAlive.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, bind(&AndroidRunnerWorker::onProcessIdChanged, this, -1)); this, bind(&AndroidRunnerWorker::onProcessIdChanged, this, -1));
} }
} }

2
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -213,7 +213,7 @@ void GerritDialog::refresh()
const QString &query = m_ui->queryLineEdit->text().trimmed(); const QString &query = m_ui->queryLineEdit->text().trimmed();
updateCompletions(query); updateCompletions(query);
m_model->refresh(m_server, query); m_model->refresh(m_server, query);
m_ui->treeView->sortByColumn(-1); m_ui->treeView->sortByColumn(-1, Qt::DescendingOrder);
} }
void GerritDialog::scheduleUpdateRemotes() void GerritDialog::scheduleUpdateRemotes()

6
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -323,7 +323,7 @@ CallgrindTool::CallgrindTool()
m_callersView->setObjectName("Valgrind.CallgrindTool.CallersView"); m_callersView->setObjectName("Valgrind.CallgrindTool.CallersView");
m_callersView->setWindowTitle(tr("Callers")); m_callersView->setWindowTitle(tr("Callers"));
m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView"); m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView");
m_callersView->sortByColumn(CallModel::CostColumn); m_callersView->sortByColumn(CallModel::CostColumn, Qt::DescendingOrder);
m_callersView->setFrameStyle(QFrame::NoFrame); m_callersView->setFrameStyle(QFrame::NoFrame);
// enable sorting // enable sorting
m_callersProxy.setSourceModel(&m_callersModel); m_callersProxy.setSourceModel(&m_callersModel);
@@ -336,7 +336,7 @@ CallgrindTool::CallgrindTool()
m_calleesView->setObjectName("Valgrind.CallgrindTool.CalleesView"); m_calleesView->setObjectName("Valgrind.CallgrindTool.CalleesView");
m_calleesView->setWindowTitle(tr("Callees")); m_calleesView->setWindowTitle(tr("Callees"));
m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView"); m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView");
m_calleesView->sortByColumn(CallModel::CostColumn); m_calleesView->sortByColumn(CallModel::CostColumn, Qt::DescendingOrder);
m_calleesView->setFrameStyle(QFrame::NoFrame); m_calleesView->setFrameStyle(QFrame::NoFrame);
// enable sorting // enable sorting
m_calleesProxy.setSourceModel(&m_calleesModel); m_calleesProxy.setSourceModel(&m_calleesModel);
@@ -349,7 +349,7 @@ CallgrindTool::CallgrindTool()
m_flatView->setObjectName("Valgrind.CallgrindTool.FlatView"); m_flatView->setObjectName("Valgrind.CallgrindTool.FlatView");
m_flatView->setWindowTitle(tr("Functions")); m_flatView->setWindowTitle(tr("Functions"));
m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView"); m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView");
m_flatView->sortByColumn(DataModel::SelfCostColumn); m_flatView->sortByColumn(DataModel::SelfCostColumn, Qt::DescendingOrder);
m_flatView->setFrameStyle(QFrame::NoFrame); m_flatView->setFrameStyle(QFrame::NoFrame);
m_flatView->setAttribute(Qt::WA_MacShowFocusRect, false); m_flatView->setAttribute(Qt::WA_MacShowFocusRect, false);
m_flatView->setModel(&m_proxyModel); m_flatView->setModel(&m_proxyModel);