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

TextEditor: Pass dialogParent where needed

Browse Source 
Change-Id: I57c41d0e8e37472a1a5070ea082b4c2e1ff6d287
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 01:36:38 +03:00
committed by Orgad Shaneh
parent 8a472bb0ad
commit 1156646ce2
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/texteditor/snippets/snippetssettingspage.cpp
View File

@@ -131,7 +131,8 @@ bool SnippetsTableModel::setData(const QModelIndex &modelIndex, const QVariant &
if (modelIndex.column() == 0) {
const QString &s = value.toString();
if (!isValidTrigger(s)) {
QMessageBox::critical(0, tr("Error"), tr("Not a valid trigger."));
QMessageBox::critical(Core::ICore::dialogParent(), tr("Error"),
tr("Not a valid trigger."));
if (snippet.trigger().isEmpty())
removeSnippet(modelIndex);
return false;
@@ -207,7 +208,8 @@ void SnippetsTableModel::revertBuitInSnippet(const QModelIndex &modelIndex)
{
const Snippet &snippet = m_collection->revertedSnippet(modelIndex.row(), m_activeGroupId);
if (snippet.id().isEmpty()) {
QMessageBox::critical(0, tr("Error"), tr("Error reverting snippet."));
QMessageBox::critical(Core::ICore::dialogParent(), tr("Error"),
tr("Error reverting snippet."));
return;
}
replaceSnippet(snippet, modelIndex);
@@ -391,11 +393,12 @@ void SnippetsSettingsPagePrivate::apply()
if (m_snippetsCollectionChanged) {
QString errorString;
if (SnippetsCollection::instance()->synchronize(&errorString))
if (SnippetsCollection::instance()->synchronize(&errorString)) {
m_snippetsCollectionChanged = false;
else
QMessageBox::critical(Core::ICore::mainWindow(),
tr("Error While Saving Snippet Collection"), errorString);
} else {
QMessageBox::critical(Core::ICore::dialogParent(),
tr("Error While Saving Snippet Collection"), errorString);
}
}
}
@@ -466,7 +469,7 @@ void SnippetsSettingsPagePrivate::removeSnippet()
{
const QModelIndex &modelIndex = m_ui.snippetsTable->selectionModel()->currentIndex();
if (!modelIndex.isValid()) {
QMessageBox::critical(0, tr("Error"), tr("No snippet selected."));
QMessageBox::critical(Core::ICore::dialogParent(), tr("Error"), tr("No snippet selected."));
return;
}
m_model->removeSnippet(modelIndex);