1 files changed, 31 insertions, 31 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 1ee95f4ab68..d926159ff63 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -107,9 +107,9 @@ class BreakpointItem : public QObject, public TypedTreeItem<LocationItem>
     Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::BreakHandler)
 
 public:
-    ~BreakpointItem();
+    ~BreakpointItem() override;
 
-    QVariant data(int column, int role) const;
+    QVariant data(int column, int role) const override;
 
     QIcon icon() const;
 
@@ -168,28 +168,28 @@ public:
         setIcon(b->icon());
     }
 
-    void removedFromEditor()
+    void removedFromEditor() override
     {
         if (m_bp)
             m_bp->removeBreakpoint();
     }
 
-    void updateLineNumber(int lineNumber)
+    void updateLineNumber(int lineNumber) override
     {
         TextMark::updateLineNumber(lineNumber);
         m_bp->updateLineNumberFromMarker(lineNumber);
     }
 
-    void updateFileName(const FileName &fileName)
+    void updateFileName(const FileName &fileName) override
     {
         TextMark::updateFileName(fileName);
         m_bp->updateFileNameFromMarker(fileName.toString());
     }
 
-    bool isDraggable() const { return true; }
-    void dragToLine(int line) { m_bp->changeLineNumberFromMarker(line); }
-    bool isClickable() const { return true; }
-    void clicked() { m_bp->removeBreakpoint(); }
+    bool isDraggable() const override { return true; }
+    void dragToLine(int line) override { m_bp->changeLineNumberFromMarker(line); }
+    bool isClickable() const override { return true; }
+    void clicked() override { m_bp->removeBreakpoint(); }
 
 public:
     BreakpointItem *m_bp;
@@ -269,7 +269,7 @@ static QString typeToString(BreakpointType type)
 class LeftElideDelegate : public QStyledItemDelegate
 {
 public:
-    LeftElideDelegate() {}
+    LeftElideDelegate() = default;
 
     void paint(QPainter *pain, const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
@@ -283,8 +283,8 @@ class SmallTextEdit : public QTextEdit
 {
 public:
     explicit SmallTextEdit(QWidget *parent) : QTextEdit(parent) {}
-    QSize sizeHint() const { return QSize(QTextEdit::sizeHint().width(), 100); }
-    QSize minimumSizeHint() const { return sizeHint(); }
+    QSize sizeHint() const override { return QSize(QTextEdit::sizeHint().width(), 100); }
+    QSize minimumSizeHint() const override { return sizeHint(); }
 };
 
 ///////////////////////////////////////////////////////////////////////
@@ -669,7 +669,7 @@ void BreakpointDialog::getParts(unsigned partsMask, BreakpointParameters *data)
         data->functionName = m_lineEditFunction->text();
 
     if (partsMask & AddressPart)
-        data->address = m_lineEditAddress->text().toULongLong(0, 0);
+        data->address = m_lineEditAddress->text().toULongLong(nullptr, 0);
     if (partsMask & ExpressionPart)
         data->expression = m_lineEditExpression->text();
 
@@ -1064,9 +1064,9 @@ void BreakHandler::saveBreakpoints()
 
 void BreakHandler::loadBreakpoints()
 {
-    QVariant value = sessionValue("Breakpoints");
-    QList<QVariant> list = value.toList();
-    foreach (const QVariant &var, list) {
+    const QVariant value = sessionValue("Breakpoints");
+    const QList<QVariant> list = value.toList();
+    for (const QVariant &var : list) {
         const QMap<QString, QVariant> map = var.toMap();
         BreakpointParameters params(BreakpointByFileAndLine);
         QVariant v = map.value("filename");
@@ -1137,7 +1137,7 @@ Breakpoint BreakHandler::findBreakpointByIndex(const QModelIndex &index) const
 Breakpoints BreakHandler::findBreakpointsByIndex(const QList<QModelIndex> &list) const
 {
     QSet<Breakpoint> ids;
-    foreach (const QModelIndex &index, list) {
+    for (const QModelIndex &index : list) {
         if (Breakpoint b = findBreakpointByIndex(index))
             ids.insert(b);
     }
@@ -1378,7 +1378,7 @@ QIcon Breakpoint::icon() const { return b ? b->icon() : QIcon(); }
 
 DebuggerEngine *Breakpoint::engine() const
 {
-    return b ? b->m_engine : 0;
+    return b ? b->m_engine : nullptr;
 }
 
 const BreakpointResponse &Breakpoint::response() const
@@ -1610,7 +1610,7 @@ void Breakpoint::notifyBreakpointReleased()
     b->removeChildren();
     //QTC_ASSERT(b->m_state == BreakpointChangeProceeding, qDebug() << b->m_state);
     b->m_state = BreakpointNew;
-    b->m_engine = 0;
+    b->m_engine = nullptr;
     b->m_response = BreakpointResponse();
     b->destroyMarker();
     b->updateMarker();
@@ -1673,7 +1673,7 @@ void BreakHandler::appendBreakpointInternal(const BreakpointParameters &params)
         return;
     }
 
-    BreakpointItem *b = new BreakpointItem(this);
+    auto b = new BreakpointItem(this);
     b->m_params = params;
     b->updateMarker();
     rootItem()->appendChild(b);
@@ -1830,19 +1830,19 @@ void BreakHandler::changeLineNumberFromMarkerHelper(BreakpointModelId id)
     appendBreakpoint(params);
 }
 
-Breakpoints BreakHandler::allBreakpoints() const
+const Breakpoints BreakHandler::allBreakpoints() const
 {
     Breakpoints items;
     forItemsAtLevel<1>([&items](BreakpointItem *b) { items.append(Breakpoint(b)); });
     return items;
 }
 
-Breakpoints BreakHandler::unclaimedBreakpoints() const
+const Breakpoints BreakHandler::unclaimedBreakpoints() const
 {
-    return engineBreakpoints(0);
+    return engineBreakpoints(nullptr);
 }
 
-Breakpoints BreakHandler::engineBreakpoints(DebuggerEngine *engine) const
+const Breakpoints BreakHandler::engineBreakpoints(DebuggerEngine *engine) const
 {
     Breakpoints items;
     forItemsAtLevel<1>([&items, engine](BreakpointItem *b) {
@@ -1930,7 +1930,7 @@ bool BreakHandler::setData(const QModelIndex &idx, const QVariant &value, int ro
                     const bool isEnabled = items.isEmpty() || items.at(0).isEnabled();
                     setBreakpointsEnabled(items, !isEnabled);
 // FIXME
-//                    foreach (const QModelIndex &id, selectedIds)
+//                    for (const QModelIndex &id : selectedIds)
 //                        update(id);
                     return true;
                 }
@@ -2069,7 +2069,7 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev)
 
 void BreakHandler::setBreakpointsEnabled(const Breakpoints &bps, bool enabled)
 {
-    foreach (Breakpoint b, bps)
+    for (Breakpoint b : bps)
         b.setEnabled(enabled);
 }
 
@@ -2088,7 +2088,7 @@ void BreakHandler::deleteAllBreakpoints()
 
 void BreakHandler::deleteBreakpoints(const Breakpoints &bps)
 {
-    foreach (Breakpoint bp, bps)
+    for (Breakpoint bp : bps)
         bp.removeBreakpoint();
 }
 
@@ -2141,7 +2141,7 @@ void BreakHandler::editBreakpoints(const Breakpoints &bps, QWidget *parent)
     const int newIgnoreCount = dialog.ignoreCount();
     const int newThreadSpec = dialog.threadSpec();
 
-    foreach (Breakpoint bp, bps) {
+    for (Breakpoint bp : bps) {
         if (bp) {
             bp.setCondition(newCondition);
             bp.setIgnoreCount(newIgnoreCount);
@@ -2161,7 +2161,7 @@ void BreakHandler::editBreakpoints(const Breakpoints &bps, QWidget *parent)
 static int currentId = 0;
 
 BreakpointItem::BreakpointItem(BreakHandler *handler)
-    : m_handler(handler), m_id(++currentId), m_state(BreakpointNew), m_engine(0), m_marker(0)
+    : m_handler(handler), m_id(++currentId), m_state(BreakpointNew), m_engine(nullptr), m_marker(nullptr)
 {}
 
 BreakpointItem::~BreakpointItem()
@@ -2173,8 +2173,8 @@ void BreakpointItem::destroyMarker()
 {
     if (m_marker) {
         BreakpointMarker *m = m_marker;
-        m->m_bp = 0;
-        m_marker = 0;
+        m->m_bp = nullptr;
+        m_marker = nullptr;
         delete m;
     }
 }