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

TextEditor: Modernize SnippetsCollection

Browse Source 
More FilePath use, foreach, less .h exposure.

Change-Id: Ie24324b33333733736f0cd12c7637798fc88aa34
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-08-13 17:05:12 +02:00
parent 026b4ddcda
commit 285ec1476e
3 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,8 @@
#include "snippet.h"
#include <utils/filepath.h>
#include <QVector>
#include <QStringList>
#include <QHash>
@@ -104,26 +106,16 @@ private:
void updateActiveSnippetsEnd(int groupIndex);
QList<Snippet> readXML(const QString &fileName, const QString &snippetId = QString()) const;
QList<Snippet> readXML(const Utils::FilePath &fileName, const QString &snippetId = {}) const;
void writeSnippetXML(const Snippet &snippet, QXmlStreamWriter *writer) const;
QList<Snippet> allBuiltInSnippets() const;
static const QLatin1String kSnippet;
static const QLatin1String kSnippets;
static const QLatin1String kTrigger;
static const QLatin1String kId;
static const QLatin1String kComplement;
static const QLatin1String kGroup;
static const QLatin1String kRemoved;
static const QLatin1String kModified;
// Built-in snippets are specified in XMLs distributed in a system's folder. Snippets
// created or modified/removed (if they are built-ins) by the user are stored in user's
// folder.
QString m_userSnippetsPath;
QString m_userSnippetsFile;
QStringList m_builtInSnippetsFiles;
const Utils::FilePath m_userSnippetsFile;
const Utils::FilePaths m_builtInSnippetsFiles;
// Snippets for each group are kept in a list. However, not all of them are necessarily
// active. Specifically, removed built-in snippets are kept as the last ones (for each