diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-09-21 01:15:38 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2018-09-21 05:37:39 +0000 |
commit | d88a0d8e681ec18a98540fa0a77d589511083f1f (patch) | |
tree | e67c96a2e6beb2c51c3a8fd46c1ff517b557aa17 /src | |
parent | 9364e4b8ecbed6a555ba29d68678490d088c4c8d (diff) |
Utils: Modernize
range-based for, nullptr, member initializers, override.
Change-Id: I21ac5b23883c08dbd75819bb3298bc956cdb972c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/modelinglib/qmt/stereotype/toolbar.h | 2 | ||||
-rw-r--r-- | src/libs/utils/fancylineedit.cpp | 8 | ||||
-rw-r--r-- | src/libs/utils/mimetypes/mimedatabase_p.h | 2 | ||||
-rw-r--r-- | src/libs/utils/mimetypes/mimeglobpattern_p.h | 8 | ||||
-rw-r--r-- | src/libs/utils/mimetypes/mimeprovider_p.h | 22 | ||||
-rw-r--r-- | src/libs/utils/mimetypes/mimetypeparser_p.h | 12 | ||||
-rw-r--r-- | src/libs/utils/outputformatter.cpp | 8 | ||||
-rw-r--r-- | src/libs/utils/pathchooser.cpp | 3 | ||||
-rw-r--r-- | src/libs/utils/projectintropage.cpp | 9 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tips.h | 42 |
10 files changed, 52 insertions, 64 deletions
diff --git a/src/libs/modelinglib/qmt/stereotype/toolbar.h b/src/libs/modelinglib/qmt/stereotype/toolbar.h index ab3974ec2e..2f9be9188c 100644 --- a/src/libs/modelinglib/qmt/stereotype/toolbar.h +++ b/src/libs/modelinglib/qmt/stereotype/toolbar.h @@ -54,7 +54,7 @@ public: } Tool(const QString &name, const QString &elementType, - const QString &stereotype = QString::null) + const QString &stereotype = QString()) : m_name(name), m_elementType(elementType), m_stereotype(stereotype) diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 9efe74687e..55b4b12f7f 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -236,7 +236,7 @@ void FancyLineEdit::updateButtonPositions() { QRect contentRect = rect(); for (int i = 0; i < 2; ++i) { - Side iconpos = (Side)i; + Side iconpos = Side(i); if (layoutDirection() == Qt::RightToLeft) iconpos = (iconpos == Left ? Right : Left); @@ -473,9 +473,9 @@ void FancyLineEdit::validate() // Check buttons. if (d->m_oldText.isEmpty() || t.isEmpty()) { - for (int i = 0; i < 2; ++i) { - if (d->m_iconbutton[i]->hasAutoHide()) - d->m_iconbutton[i]->animateShow(!t.isEmpty()); + for (auto &button : qAsConst(d->m_iconbutton)) { + if (button->hasAutoHide()) + button->animateShow(!t.isEmpty()); } d->m_oldText = t; } diff --git a/src/libs/utils/mimetypes/mimedatabase_p.h b/src/libs/utils/mimetypes/mimedatabase_p.h index 1a464fb007..6f87b213f3 100644 --- a/src/libs/utils/mimetypes/mimedatabase_p.h +++ b/src/libs/utils/mimetypes/mimedatabase_p.h @@ -99,7 +99,7 @@ public: MimeType mimeTypeForName(const QString &nameOrAlias); MimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device, 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; const QString m_defaultMimeType; diff --git a/src/libs/utils/mimetypes/mimeglobpattern_p.h b/src/libs/utils/mimetypes/mimeglobpattern_p.h index 863c432653..accbab0646 100644 --- a/src/libs/utils/mimetypes/mimeglobpattern_p.h +++ b/src/libs/utils/mimetypes/mimeglobpattern_p.h @@ -58,15 +58,11 @@ namespace Internal { struct MimeGlobMatchResult { - MimeGlobMatchResult() - : m_weight(0), m_matchingPatternLength(0) - {} - void addMatch(const QString &mimeType, int weight, const QString &pattern); QStringList m_matchingMimeTypes; - int m_weight; - int m_matchingPatternLength; + int m_weight = 0; + int m_matchingPatternLength = 0; QString m_foundSuffix; }; diff --git a/src/libs/utils/mimetypes/mimeprovider_p.h b/src/libs/utils/mimetypes/mimeprovider_p.h index deda7b9645..b616d19879 100644 --- a/src/libs/utils/mimetypes/mimeprovider_p.h +++ b/src/libs/utils/mimetypes/mimeprovider_p.h @@ -141,14 +141,14 @@ class MimeXMLProvider : public MimeProviderBase public: MimeXMLProvider(MimeDatabasePrivate *db); - virtual bool isValid(); - virtual MimeType mimeTypeForName(const QString &name); - virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix); - virtual QStringList parents(const QString &mime); - virtual QString resolveAlias(const QString &name); - virtual QStringList listAliases(const QString &name); - virtual MimeType findByMagic(const QByteArray &data, int *accuracyPtr); - virtual QList<MimeType> allMimeTypes(); + bool isValid() override; + MimeType mimeTypeForName(const QString &name) override; + QStringList findByFileName(const QString &fileName, QString *foundSuffix) override; + QStringList parents(const QString &mime) override; + QString resolveAlias(const QString &name) override; + QStringList listAliases(const QString &name) override; + MimeType findByMagic(const QByteArray &data, int *accuracyPtr) override; + QList<MimeType> allMimeTypes() override; bool load(const QString &fileName, QString *errorMessage); @@ -161,9 +161,9 @@ public: // Qt Creator additions void addData(const QString &id, const QByteArray &data); - QMap<int, QList<MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType); - void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns); - void setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules); + QMap<int, QList<MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType) override; + void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns) override; + void setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules) override; private: void ensureLoaded(); diff --git a/src/libs/utils/mimetypes/mimetypeparser_p.h b/src/libs/utils/mimetypes/mimetypeparser_p.h index b37cec464d..8d70004bff 100644 --- a/src/libs/utils/mimetypes/mimetypeparser_p.h +++ b/src/libs/utils/mimetypes/mimetypeparser_p.h @@ -101,22 +101,22 @@ public: explicit MimeTypeParser(MimeXMLProvider &provider) : m_provider(provider) {} protected: - inline bool mimeTypeExists(const QString &mimeTypeName) + inline bool mimeTypeExists(const QString &mimeTypeName) override { 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; } - inline bool process(const MimeGlobPattern &glob, QString *) + inline bool process(const MimeGlobPattern &glob, QString *) override { 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); } - inline void processAlias(const QString &alias, const QString &name) + inline void processAlias(const QString &alias, const QString &name) override { m_provider.addAlias(alias, name); } - inline void processMagicMatcher(const MimeMagicRuleMatcher &matcher) + inline void processMagicMatcher(const MimeMagicRuleMatcher &matcher) override { m_provider.addMagicMatcher(matcher); } private: diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index de1e20d33f..ab47485e6e 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -37,16 +37,12 @@ namespace Internal { class OutputFormatterPrivate { public: - OutputFormatterPrivate() - : plainTextEdit(nullptr), overwriteOutput(false) - {} - - QPlainTextEdit *plainTextEdit; + QPlainTextEdit *plainTextEdit = nullptr; QTextCharFormat formats[NumberOfFormats]; QFont font; QTextCursor cursor; AnsiEscapeCodeHandler escapeCodeHandler; - bool overwriteOutput; + bool overwriteOutput = false; }; } // namespace Internal diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 0d0dab0e60..7efe61db63 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -167,7 +167,7 @@ public: QHBoxLayout *m_hLayout = nullptr; FancyLineEdit *m_lineEdit = nullptr; - PathChooser::Kind m_acceptingKind; + PathChooser::Kind m_acceptingKind = PathChooser::ExistingDirectory; QString m_dialogTitleOverride; QString m_dialogFilter; QString m_initialBrowsePathOverride; @@ -181,7 +181,6 @@ public: PathChooserPrivate::PathChooserPrivate() : m_hLayout(new QHBoxLayout), m_lineEdit(new FancyLineEdit), - m_acceptingKind(PathChooser::ExistingDirectory), m_macroExpander(globalMacroExpander()) { } diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp index 4aeabdaceb..a449fe1285 100644 --- a/src/libs/utils/projectintropage.cpp +++ b/src/libs/utils/projectintropage.cpp @@ -60,22 +60,19 @@ class ProjectIntroPagePrivate public: ProjectIntroPagePrivate(); Ui::ProjectIntroPage m_ui; - bool m_complete; + bool m_complete = false; QRegularExpressionValidator m_projectNameValidator; // Status label style sheets const QString m_errorStyleSheet; const QString m_warningStyleSheet; const QString m_hintStyleSheet; - bool m_forceSubProject; + bool m_forceSubProject = false; QStringList m_projectDirectories; }; ProjectIntroPagePrivate:: ProjectIntroPagePrivate() : - m_complete(false), m_errorStyleSheet(QLatin1String("background : red;")), - m_warningStyleSheet(QLatin1String("background : yellow;")), - m_hintStyleSheet(), - m_forceSubProject(false) + m_warningStyleSheet(QLatin1String("background : yellow;")) { } diff --git a/src/libs/utils/tooltip/tips.h b/src/libs/utils/tooltip/tips.h index fe1a8633d0..844848e796 100644 --- a/src/libs/utils/tooltip/tips.h +++ b/src/libs/utils/tooltip/tips.h @@ -63,14 +63,14 @@ class TextTip : public QTipLabel public: TextTip(QWidget *parent); - virtual void setContent(const QVariant &content); - virtual bool isInteractive() const; - virtual void configure(const QPoint &pos, QWidget *w); - virtual bool canHandleContentReplacement(int typeId) const; - virtual int showTime() const; - virtual bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const; - virtual void paintEvent(QPaintEvent *event); - virtual void resizeEvent(QResizeEvent *event); + void setContent(const QVariant &content) override; + bool isInteractive() const override; + void configure(const QPoint &pos, QWidget *w) override; + bool canHandleContentReplacement(int typeId) const override; + int showTime() const override; + bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const override; + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; private: QString m_text; @@ -81,12 +81,12 @@ class ColorTip : public QTipLabel public: ColorTip(QWidget *parent); - virtual void setContent(const QVariant &content); - virtual void configure(const QPoint &pos, QWidget *w); - virtual bool canHandleContentReplacement(int typeId) const; - virtual int showTime() const { return 4000; } - virtual bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const; - virtual void paintEvent(QPaintEvent *event); + void setContent(const QVariant &content) override; + void configure(const QPoint &pos, QWidget *w) override; + bool canHandleContentReplacement(int typeId) const override; + int showTime() const override { return 4000; } + bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const override; + void paintEvent(QPaintEvent *event) override; private: QColor m_color; @@ -98,15 +98,15 @@ class WidgetTip : public QTipLabel Q_OBJECT public: - explicit WidgetTip(QWidget *parent = 0); + explicit WidgetTip(QWidget *parent = nullptr); void pinToolTipWidget(QWidget *parent); - virtual void setContent(const QVariant &content); - virtual void configure(const QPoint &pos, QWidget *w); - virtual bool canHandleContentReplacement(int typeId) const; - virtual int showTime() const { return 30000; } - virtual bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const; - virtual bool isInteractive() const { return true; } + void setContent(const QVariant &content) override; + void configure(const QPoint &pos, QWidget *w) override; + bool canHandleContentReplacement(int typeId) const override; + int showTime() const override { return 30000; } + bool equals(int typeId, const QVariant &other, const QString &otherHelpId) const override; + bool isInteractive() const override { return true; } private: QWidget *m_widget; |