From ba0cd9ba655c6543d2f9c2a46a3ecf0b6da98f1d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 26 Jul 2018 17:15:55 +0200
Subject: Cleanup code style (C++11, casts, etc)

---
 src/sessiontreemodel.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/sessiontreemodel.cpp')

diff --git a/src/sessiontreemodel.cpp b/src/sessiontreemodel.cpp
index ac60ee9..bb96f0e 100644
--- a/src/sessiontreemodel.cpp
+++ b/src/sessiontreemodel.cpp
@@ -13,7 +13,7 @@
 
 SessionTreeModel::SessionTreeModel(QObject *parent)
     : QAbstractItemModel(parent) {
-    root_ = new SessionTreeItem(SECTION_NULL);
+    root_ = new SessionTreeItem(SECTION_nullptr);
 }
 
 SessionTreeModel::~SessionTreeModel() {
@@ -70,7 +70,7 @@ QVariant SessionTreeModel::data(const QModelIndex &index, int role) const {
 
 Qt::ItemFlags SessionTreeModel::flags(const QModelIndex &index) const {
     if (!index.isValid()) {
-        return 0;
+        return Qt::NoItemFlags;
     }
 
     SessionTreeItem* item =
@@ -128,22 +128,19 @@ QModelIndex SessionTreeModel::parent(const QModelIndex &index) const {
 }
 
 void SessionTreeModel::addItems(const QList<Session*>& sessions) {
-   SessionTreeItem* parentItem;
-
     foreach (Session* s, sessions) {
-        bool sectionExists = false;
+        SessionTreeItem* parentItem = nullptr;
         SectionType section = s->section();
 
         for (int i = 0; i < root_->childCount(); ++i) {
             SessionTreeItem* item = root_->child(i);
             if (item->sectionType() == section) {
                 parentItem = item;
-                sectionExists = true;
                 break;
             }
         }
 
-        if (!sectionExists) {
+        if (parentItem == nullptr) {
             parentItem = new SessionTreeItem(section, root_);
             root_->appendChild(parentItem);
         }
@@ -168,7 +165,7 @@ void SessionTreeModel::removeItem(const QString& name) {
 static void lookDeeper(QList<Session*>& result, QList<QString>& items, SessionTreeItem* root) {
     for (int i = 0; i < root->childCount(); ++i) {
         SessionTreeItem* item = root->child(i);
-        if (item->session() != NULL && item->session()->containsKeywords(items)) {
+        if (item->session() != nullptr && item->session()->containsKeywords(items)) {
             result.append(const_cast<Session*>(item->session()));
         }
         lookDeeper(result, items, item);
@@ -198,7 +195,7 @@ QList<Session*> SessionTreeModel::lookForItem(const QString& label) {
 QModelIndex SessionTreeModel::getSection(const SectionType type) {
     for (int i = 0; i < root_->childCount(); ++i) {
         SessionTreeItem* item = root_->child(i);
-        if (item->sectionType() == type && item->session() == NULL) {
+        if (item->sectionType() == type && item->session() == nullptr) {
             return createIndex(i, 0, item);
         }
     }
-- 
cgit v1.2.3-55-g7522