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

TextEditor: Modernize

Browse Source 
override, auto, nullptr, member initializers.

Change-Id: I04c6ebb683849568973bd7782fb5a3279267141e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 01:16:01 +03:00
committed by Orgad Shaneh
parent 439bc225e1
commit 41dee83bec
63 changed files with 261 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/snippets/snippet.cpp
View File

@@ -222,7 +222,7 @@ Snippet::ParsedSnippet Snippet::parse(const QString &snippet)
} else {
int length = result.text.count() - start;
result.ranges << ParsedSnippet::Range(start, length, mangler);
mangler = 0;
mangler = nullptr;
start = -1;
}
continue;

2
src/plugins/texteditor/snippets/snippetassistcollector.cpp
View File

@@ -41,7 +41,7 @@ static void appendSnippets(QList<AssistProposalItemInterface *> *items,
const int size = collection->totalActiveSnippets(groupId);
for (int i = 0; i < size; ++i) {
const Snippet &snippet = collection->snippet(i, groupId);
AssistProposalItem *item = new AssistProposalItem;
auto item = new AssistProposalItem;
item->setText(snippet.trigger() + QLatin1Char(' ') + snippet.complement());
item->setData(snippet.content());
item->setDetail(snippet.generateTip());

2
src/plugins/texteditor/snippets/snippetscollection.h
View File

@@ -48,7 +48,7 @@ class SnippetsCollection : public QObject
{
Q_OBJECT
public:
virtual ~SnippetsCollection();
~SnippetsCollection() override;
static SnippetsCollection *instance();

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

@@ -54,16 +54,16 @@ class SnippetsTableModel : public QAbstractTableModel
Q_OBJECT
public:
SnippetsTableModel(QObject *parent);
virtual ~SnippetsTableModel() {}
~SnippetsTableModel() override {}
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
virtual Qt::ItemFlags flags(const QModelIndex &modelIndex) const;
virtual QVariant data(const QModelIndex &modelIndex, int role = Qt::DisplayRole) const;
virtual bool setData(const QModelIndex &modelIndex, const QVariant &value,
int role = Qt::EditRole);
virtual QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex &modelIndex) const override;
QVariant data(const QModelIndex &modelIndex, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &modelIndex, const QVariant &value,
int role = Qt::EditRole) override;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const override;
QList<QString> groupIds() const;
void load(const QString &groupId);
@@ -267,7 +267,7 @@ class SnippetsSettingsPagePrivate : public QObject
Q_OBJECT
public:
SnippetsSettingsPagePrivate(Core::Id id);
~SnippetsSettingsPagePrivate() { delete m_model; }
~SnippetsSettingsPagePrivate() override { delete m_model; }
Core::Id id() const { return m_id; }
const QString &displayName() const { return m_displayName; }
@@ -312,7 +312,7 @@ SnippetsSettingsPagePrivate::SnippetsSettingsPagePrivate(Core::Id id) :
m_id(id),
m_displayName(tr("Snippets")),
m_settingsPrefix(QLatin1String("Text")),
m_model(new SnippetsTableModel(0)),
m_model(new SnippetsTableModel(nullptr)),
m_snippetsCollectionChanged(false)
{}
@@ -332,7 +332,7 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
for (const SnippetProvider &provider : SnippetProvider::snippetProviders()) {
m_ui.groupCombo->addItem(provider.displayName(), provider.groupId());
SnippetEditorWidget *snippetEditor = new SnippetEditorWidget(w);
auto snippetEditor = new SnippetEditorWidget(w);
SnippetProvider::decorateEditor(snippetEditor, provider.groupId());
m_ui.snippetsEditorStack->insertWidget(m_ui.groupCombo->count() - 1, snippetEditor);
connect(snippetEditor, &SnippetEditorWidget::snippetContentChanged,
@@ -409,7 +409,7 @@ void SnippetsSettingsPagePrivate::finish()
m_snippetsCollectionChanged = false;
}
disconnect(TextEditorSettings::instance(), 0, this, 0);
disconnect(TextEditorSettings::instance(), nullptr, this, nullptr);
}
void SnippetsSettingsPagePrivate::loadSettings()