Mercurial > octave

changeset 24396:c652f2637063

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use Qt::NoItemFlags instead of 0 or nullptr * variable-editor-model.cc (variable_editor_model::flags): Return Qt::NoItemFlags instead of 0. * workspace-model.cc (workspace_model::columnCount): Initialize return value to Qt::NoItemFlags instead of nullptr.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Dec 2017 09:08:34 -0500
parents 41cf6ee90cb6
children 08f19fd144f4
files libgui/src/variable-editor-model.cc libgui/src/workspace-model.cc
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/variable-editor-model.cc	Sun Dec 10 14:35:06 2017 +0100
+++ b/libgui/src/variable-editor-model.cc	Mon Dec 11 09:08:34 2017 -0500
@@ -427,7 +427,7 @@
       //return requires_sub_editor(idx) ?  QAbstractTableModel::flags (idx) : QAbstractTableModel::flags (idx) | Qt::ItemIsEditable;
     }
 
-  return 0;
+  return Qt::NoItemFlags;
 }
 
 // private slots
--- a/libgui/src/workspace-model.cc	Sun Dec 10 14:35:06 2017 +0100
+++ b/libgui/src/workspace-model.cc	Mon Dec 11 09:08:34 2017 -0500
@@ -97,7 +97,7 @@
 Qt::ItemFlags
 workspace_model::flags (const QModelIndex& idx) const
 {
-  Qt::ItemFlags retval = nullptr;
+  Qt::ItemFlags retval = Qt::NoItemFlags;
 
   if (idx.isValid ())
     {