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

Utils: Modernize

Browse Source 
range-based for, nullptr, member initializers, override.

Change-Id: I21ac5b23883c08dbd75819bb3298bc956cdb972c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-21 01:15:38 +03:00
committed by Orgad Shaneh
parent 9364e4b8ec
commit d88a0d8e68
10 changed files with 52 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/modelinglib/qmt/stereotype/toolbar.h
View File

@@ -54,7 +54,7 @@ public:
} }
Tool(const QString &name, const QString &elementType, Tool(const QString &name, const QString &elementType,
const QString &stereotype = QString::null) const QString &stereotype = QString())
: m_name(name), : m_name(name),
m_elementType(elementType), m_elementType(elementType),
m_stereotype(stereotype) m_stereotype(stereotype)

8
src/libs/utils/fancylineedit.cpp
View File

@@ -236,7 +236,7 @@ void FancyLineEdit::updateButtonPositions()
{ {
QRect contentRect = rect(); QRect contentRect = rect();
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
Side iconpos = (Side)i; Side iconpos = Side(i);
if (layoutDirection() == Qt::RightToLeft) if (layoutDirection() == Qt::RightToLeft)
iconpos = (iconpos == Left ? Right : Left); iconpos = (iconpos == Left ? Right : Left);
@@ -473,9 +473,9 @@ void FancyLineEdit::validate()
// Check buttons. // Check buttons.
if (d->m_oldText.isEmpty() || t.isEmpty()) { if (d->m_oldText.isEmpty() || t.isEmpty()) {
for (int i = 0; i < 2; ++i) { for (auto &button : qAsConst(d->m_iconbutton)) {
if (d->m_iconbutton[i]->hasAutoHide()) if (button->hasAutoHide())
d->m_iconbutton[i]->animateShow(!t.isEmpty()); button->animateShow(!t.isEmpty());
} }
d->m_oldText = t; d->m_oldText = t;
} }

2
src/libs/utils/mimetypes/mimedatabase_p.h
View File

@@ -99,7 +99,7 @@ public:
MimeType mimeTypeForName(const QString &nameOrAlias); MimeType mimeTypeForName(const QString &nameOrAlias);
MimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr); MimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr);
MimeType findByData(const QByteArray &data, int *priorityPtr); MimeType findByData(const QByteArray &data, int *priorityPtr);
QStringList mimeTypeForFileName(const QString &fileName, QString *foundSuffix = 0); QStringList mimeTypeForFileName(const QString &fileName, QString *foundSuffix = nullptr);
mutable MimeProviderBase *m_provider; mutable MimeProviderBase *m_provider;
const QString m_defaultMimeType; const QString m_defaultMimeType;

8
src/libs/utils/mimetypes/mimeglobpattern_p.h
View File

@@ -58,15 +58,11 @@ namespace Internal {
struct MimeGlobMatchResult struct MimeGlobMatchResult
{ {
MimeGlobMatchResult()
: m_weight(0), m_matchingPatternLength(0)
{}
void addMatch(const QString &mimeType, int weight, const QString &pattern); void addMatch(const QString &mimeType, int weight, const QString &pattern);
QStringList m_matchingMimeTypes; QStringList m_matchingMimeTypes;
int m_weight; int m_weight = 0;
int m_matchingPatternLength; int m_matchingPatternLength = 0;
QString m_foundSuffix; QString m_foundSuffix;
}; };

22
src/libs/utils/mimetypes/mimeprovider_p.h
View File

@@ -141,14 +141,14 @@ class MimeXMLProvider : public MimeProviderBase
public: public:
MimeXMLProvider(MimeDatabasePrivate *db); MimeXMLProvider(MimeDatabasePrivate *db);
virtual bool isValid(); bool isValid() override;
virtual MimeType mimeTypeForName(const QString &name); MimeType mimeTypeForName(const QString &name) override;
virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix); QStringList findByFileName(const QString &fileName, QString *foundSuffix) override;
virtual QStringList parents(const QString &mime); QStringList parents(const QString &mime) override;
virtual QString resolveAlias(const QString &name); QString resolveAlias(const QString &name) override;
virtual QStringList listAliases(const QString &name); QStringList listAliases(const QString &name) override;
virtual MimeType findByMagic(const QByteArray &data, int *accuracyPtr); MimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
virtual QList<MimeType> allMimeTypes(); QList<MimeType> allMimeTypes() override;
bool load(const QString &fileName, QString *errorMessage); bool load(const QString &fileName, QString *errorMessage);
@@ -161,9 +161,9 @@ public:
// Qt Creator additions // Qt Creator additions
void addData(const QString &id, const QByteArray &data); void addData(const QString &id, const QByteArray &data);
QMap<int, QList<MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType); QMap<int, QList<MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType) override;
void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns); void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns) override;
void setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules); void setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules) override;
private: private:
void ensureLoaded(); void ensureLoaded();

12
src/libs/utils/mimetypes/mimetypeparser_p.h
View File

@@ -101,22 +101,22 @@ public:
explicit MimeTypeParser(MimeXMLProvider &provider) : m_provider(provider) {} explicit MimeTypeParser(MimeXMLProvider &provider) : m_provider(provider) {}
protected: protected:
inline bool mimeTypeExists(const QString &mimeTypeName) inline bool mimeTypeExists(const QString &mimeTypeName) override
{ return m_provider.mimeTypeForName(mimeTypeName).isValid(); } { return m_provider.mimeTypeForName(mimeTypeName).isValid(); }
inline bool process(const MimeType &t, QString *) inline bool process(const MimeType &t, QString *) override
{ m_provider.addMimeType(t); return true; } { m_provider.addMimeType(t); return true; }
inline bool process(const MimeGlobPattern &glob, QString *) inline bool process(const MimeGlobPattern &glob, QString *) override
{ m_provider.addGlobPattern(glob); return true; } { m_provider.addGlobPattern(glob); return true; }
inline void processParent(const QString &child, const QString &parent) inline void processParent(const QString &child, const QString &parent) override
{ m_provider.addParent(child, parent); } { m_provider.addParent(child, parent); }
inline void processAlias(const QString &alias, const QString &name) inline void processAlias(const QString &alias, const QString &name) override
{ m_provider.addAlias(alias, name); } { m_provider.addAlias(alias, name); }
inline void processMagicMatcher(const MimeMagicRuleMatcher &matcher) inline void processMagicMatcher(const MimeMagicRuleMatcher &matcher) override
{ m_provider.addMagicMatcher(matcher); } { m_provider.addMagicMatcher(matcher); }
private: private:

8
src/libs/utils/outputformatter.cpp
View File

@@ -37,16 +37,12 @@ namespace Internal {
class OutputFormatterPrivate class OutputFormatterPrivate
{ {
public: public:
OutputFormatterPrivate() QPlainTextEdit *plainTextEdit = nullptr;
: plainTextEdit(nullptr), overwriteOutput(false)
{}
QPlainTextEdit *plainTextEdit;
QTextCharFormat formats[NumberOfFormats]; QTextCharFormat formats[NumberOfFormats];
QFont font; QFont font;
QTextCursor cursor; QTextCursor cursor;
AnsiEscapeCodeHandler escapeCodeHandler; AnsiEscapeCodeHandler escapeCodeHandler;
bool overwriteOutput; bool overwriteOutput = false;
}; };
} // namespace Internal } // namespace Internal

3
src/libs/utils/pathchooser.cpp
View File

@@ -167,7 +167,7 @@ public:
QHBoxLayout *m_hLayout = nullptr; QHBoxLayout *m_hLayout = nullptr;
FancyLineEdit *m_lineEdit = nullptr; FancyLineEdit *m_lineEdit = nullptr;
PathChooser::Kind m_acceptingKind; PathChooser::Kind m_acceptingKind = PathChooser::ExistingDirectory;
QString m_dialogTitleOverride; QString m_dialogTitleOverride;
QString m_dialogFilter; QString m_dialogFilter;
QString m_initialBrowsePathOverride; QString m_initialBrowsePathOverride;
@@ -181,7 +181,6 @@ public:
PathChooserPrivate::PathChooserPrivate() : PathChooserPrivate::PathChooserPrivate() :
m_hLayout(new QHBoxLayout), m_hLayout(new QHBoxLayout),
m_lineEdit(new FancyLineEdit), m_lineEdit(new FancyLineEdit),
m_acceptingKind(PathChooser::ExistingDirectory),
m_macroExpander(globalMacroExpander()) m_macroExpander(globalMacroExpander())
{ {
} }

9
src/libs/utils/projectintropage.cpp
View File

@@ -60,22 +60,19 @@ class ProjectIntroPagePrivate
public: public:
ProjectIntroPagePrivate(); ProjectIntroPagePrivate();
Ui::ProjectIntroPage m_ui; Ui::ProjectIntroPage m_ui;
bool m_complete; bool m_complete = false;
QRegularExpressionValidator m_projectNameValidator; QRegularExpressionValidator m_projectNameValidator;
// Status label style sheets // Status label style sheets
const QString m_errorStyleSheet; const QString m_errorStyleSheet;
const QString m_warningStyleSheet; const QString m_warningStyleSheet;
const QString m_hintStyleSheet; const QString m_hintStyleSheet;
bool m_forceSubProject; bool m_forceSubProject = false;
QStringList m_projectDirectories; QStringList m_projectDirectories;
}; };
ProjectIntroPagePrivate:: ProjectIntroPagePrivate() : ProjectIntroPagePrivate:: ProjectIntroPagePrivate() :
m_complete(false),
m_errorStyleSheet(QLatin1String("background : red;")), m_errorStyleSheet(QLatin1String("background : red;")),
m_warningStyleSheet(QLatin1String("background : yellow;")), m_warningStyleSheet(QLatin1String("background : yellow;"))
m_hintStyleSheet(),
m_forceSubProject(false)
{ {
} }

42
src/libs/utils/tooltip/tips.h
View File

@@ -63,14 +63,14 @@ class TextTip : public QTipLabel
public: public:
TextTip(QWidget *parent); TextTip(QWidget *parent);
virtual void setContent(const QVariant &content); void setContent(const QVariant &content) override;
virtual bool isInteractive() const; bool isInteractive() const override;
virtual void configure(const QPoint &pos, QWidget *w); void configure(const QPoint &pos, QWidget *w) override;
virtual bool canHandleContentReplacement(int typeId) const; bool canHandleContentReplacement(int typeId) const override;
virtual int showTime() const; int showTime() const override;
virtual bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const; bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const override;
virtual void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
virtual void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) override;
private: private:
QString m_text; QString m_text;
@@ -81,12 +81,12 @@ class ColorTip : public QTipLabel
public: public:
ColorTip(QWidget *parent); ColorTip(QWidget *parent);
virtual void setContent(const QVariant &content); void setContent(const QVariant &content) override;
virtual void configure(const QPoint &pos, QWidget *w); void configure(const QPoint &pos, QWidget *w) override;
virtual bool canHandleContentReplacement(int typeId) const; bool canHandleContentReplacement(int typeId) const override;
virtual int showTime() const { return 4000; } int showTime() const override { return 4000; }
virtual bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const; bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const override;
virtual void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
private: private:
QColor m_color; QColor m_color;
@@ -98,15 +98,15 @@ class WidgetTip : public QTipLabel
Q_OBJECT Q_OBJECT
public: public:
explicit WidgetTip(QWidget *parent = 0); explicit WidgetTip(QWidget *parent = nullptr);
void pinToolTipWidget(QWidget *parent); void pinToolTipWidget(QWidget *parent);
virtual void setContent(const QVariant &content); void setContent(const QVariant &content) override;
virtual void configure(const QPoint &pos, QWidget *w); void configure(const QPoint &pos, QWidget *w) override;
virtual bool canHandleContentReplacement(int typeId) const; bool canHandleContentReplacement(int typeId) const override;
virtual int showTime() const { return 30000; } int showTime() const override { return 30000; }
virtual bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const; bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const override;
virtual bool isInteractive() const { return true; } bool isInteractive() const override { return true; }
private: private:
QWidget *m_widget; QWidget *m_widget;