--- a/libgui/src/find-files-model.cc	Sat Feb 10 23:32:04 2018 -0500
+++ b/libgui/src/find-files-model.cc	Sun Feb 11 09:20:36 2018 -0500
@@ -29,187 +29,182 @@
 
 #include "find-files-model.h"
 
-class find_file_less_than
+namespace octave
 {
-public:
-
-  find_file_less_than (int ord) { m_sortorder = ord; }
-
-  QVariant getValue (const QFileInfo& f) const
+  class find_file_less_than
   {
-    QVariant val;
-
-    int col = (m_sortorder > 0) ? m_sortorder : -m_sortorder;
+  public:
 
-    switch (col-1)
-      {
-      case 0:
-        val = QVariant (f.fileName ());
-        break;
+    find_file_less_than (int ord) { m_sortorder = ord; }
 
-      case 1:
-        val = QVariant (f.absolutePath ());
-        break;
+    QVariant getValue (const QFileInfo& f) const
+    {
+      QVariant val;
 
-      default:
-        break;
-      }
-
-    return val;
-  }
+      int col = (m_sortorder > 0) ? m_sortorder : -m_sortorder;
 
-  bool lessThan (const QVariant& left, const QVariant& right) const
-  {
-    return
-      left.toString ().compare (right.toString (), Qt::CaseInsensitive) < 0;
-  }
-
-  bool operator () (const QFileInfo& left, const QFileInfo& right) const
-  {
-    QVariant leftval = getValue (left);
-    QVariant rightval = getValue (right);
+      switch (col-1)
+        {
+        case 0:
+          val = QVariant (f.fileName ());
+          break;
 
-    if (m_sortorder > 0)
-      return lessThan (leftval, rightval);
-    else
-      return ! lessThan (leftval, rightval);
-  }
-
-private:
+        case 1:
+          val = QVariant (f.absolutePath ());
+          break;
 
-  int m_sortorder;
-};
+        default:
+          break;
+        }
 
-find_files_model::find_files_model (QObject *p)
-  : QAbstractListModel (p)
-{
-  m_columnNames.append (tr ("Filename"));
-  m_columnNames.append (tr ("Directory"));
-  m_sortorder = 0;
-}
+      return val;
+    }
 
-void
-find_files_model::clear (void)
-{
-  beginResetModel ();
-
-  m_files.clear ();
-
-  endResetModel ();
-}
+    bool lessThan (const QVariant& left, const QVariant& right) const
+    {
+      return
+        left.toString ().compare (right.toString (), Qt::CaseInsensitive) < 0;
+    }
 
-void
-find_files_model::addFile (const QFileInfo& info)
-{
-  beginInsertRows (QModelIndex (), m_files.size (), m_files.size ());
+    bool operator () (const QFileInfo& left, const QFileInfo& right) const
+    {
+      QVariant leftval = getValue (left);
+      QVariant rightval = getValue (right);
 
-  QList<QFileInfo>::Iterator it;
-  find_file_less_than less_than (m_sortorder);
-
-  for (it = m_files.begin (); it != m_files.end (); it++)
-    {
-      if (less_than (info, *it))
-        break;
+      if (m_sortorder > 0)
+        return lessThan (leftval, rightval);
+      else
+        return ! lessThan (leftval, rightval);
     }
 
-  m_files.insert (it, info);
+  private:
 
-  endInsertRows ();
-}
+    int m_sortorder;
+  };
 
-int
-find_files_model::rowCount (const QModelIndex &) const
-{
-  return m_files.size ();
-}
+  find_files_model::find_files_model (QObject *p)
+    : QAbstractListModel (p)
+  {
+    m_columnNames.append (tr ("Filename"));
+    m_columnNames.append (tr ("Directory"));
+    m_sortorder = 0;
+  }
 
-int
-find_files_model::columnCount (const QModelIndex &) const
-{
-  return m_columnNames.size ();
-}
+  void find_files_model::clear (void)
+  {
+    beginResetModel ();
+
+    m_files.clear ();
 
-QVariant
-find_files_model::data (const QModelIndex& idx, int role) const
-{
-  QVariant retval;
+    endResetModel ();
+  }
+
+  void find_files_model::addFile (const QFileInfo& info)
+  {
+    beginInsertRows (QModelIndex (), m_files.size (), m_files.size ());
+
+    QList<QFileInfo>::Iterator it;
+    find_file_less_than less_than (m_sortorder);
 
-  if (idx.isValid ())
-    {
-      if (role == Qt::DisplayRole)
-        {
-          switch (idx.column ())
-            {
-            case 0:
-              retval = QVariant (m_files[idx.row ()].fileName ());
-              break;
+    for (it = m_files.begin (); it != m_files.end (); it++)
+      {
+        if (less_than (info, *it))
+          break;
+      }
+
+    m_files.insert (it, info);
+
+    endInsertRows ();
+  }
+
+  int find_files_model::rowCount (const QModelIndex &) const
+  {
+    return m_files.size ();
+  }
 
-            case 1:
-              retval = QVariant (m_files[idx.row ()].absolutePath ());
-              break;
+  int find_files_model::columnCount (const QModelIndex &) const
+  {
+    return m_columnNames.size ();
+  }
+
+  QVariant find_files_model::data (const QModelIndex& idx, int role) const
+  {
+    QVariant retval;
 
-            default:
-              break;
-            }
-        }
-      else if (role == Qt::DecorationRole)
-        {
-          switch (idx.column ())
-            {
-            case 0:
-              retval = fileIcon (idx);
+    if (idx.isValid ())
+      {
+        if (role == Qt::DisplayRole)
+          {
+            switch (idx.column ())
+              {
+              case 0:
+                retval = QVariant (m_files[idx.row ()].fileName ());
+                break;
 
-            default:
-              break;
-            }
-        }
-    }
+              case 1:
+                retval = QVariant (m_files[idx.row ()].absolutePath ());
+                break;
+
+              default:
+                break;
+              }
+          }
+        else if (role == Qt::DecorationRole)
+          {
+            switch (idx.column ())
+              {
+              case 0:
+                retval = fileIcon (idx);
 
-  return retval;
-}
+              default:
+                break;
+              }
+          }
+      }
 
-QVariant
-find_files_model::headerData (int section, Qt::Orientation orientation,
-                              int role) const
-{
-  return ((orientation == Qt::Horizontal && role == Qt::DisplayRole)
-          ? m_columnNames[section] : QVariant ());
-}
+    return retval;
+  }
+
+  QVariant find_files_model::headerData (int section,
+                                         Qt::Orientation orientation,
+                                         int role) const
+  {
+    return ((orientation == Qt::Horizontal && role == Qt::DisplayRole)
+            ? m_columnNames[section] : QVariant ());
+  }
 
-void
-find_files_model::sort (int column, Qt::SortOrder order)
-{
-  if (column >= 0)
-    {
-      if (order == Qt::DescendingOrder)
-        m_sortorder = -(column+1);
-      else
-        m_sortorder = column+1;
-    }
-  else
-    m_sortorder = 0;
+  void find_files_model::sort (int column, Qt::SortOrder order)
+  {
+    if (column >= 0)
+      {
+        if (order == Qt::DescendingOrder)
+          m_sortorder = -(column+1);
+        else
+          m_sortorder = column+1;
+      }
+    else
+      m_sortorder = 0;
 
-  if (m_sortorder != 0)
-    {
-      beginResetModel ();
+    if (m_sortorder != 0)
+      {
+        beginResetModel ();
 
-      qSort (m_files.begin (), m_files.end (),
-             find_file_less_than (m_sortorder));
+        qSort (m_files.begin (), m_files.end (),
+               find_file_less_than (m_sortorder));
 
-      endResetModel ();
-    }
-}
+        endResetModel ();
+      }
+  }
 
-QFileInfo
-find_files_model::fileInfo (const QModelIndex & p) const
-{
-  return p.isValid () ? m_files[p.row ()] : QFileInfo ();
-}
+  QFileInfo find_files_model::fileInfo (const QModelIndex & p) const
+  {
+    return p.isValid () ? m_files[p.row ()] : QFileInfo ();
+  }
 
-QIcon
-find_files_model::fileIcon (const QModelIndex& p) const
-{
-  QFileIconProvider icon_provider;
+  QIcon find_files_model::fileIcon (const QModelIndex& p) const
+  {
+    QFileIconProvider icon_provider;
 
-  return p.isValid () ? icon_provider.icon (m_files[p.row ()]) : QIcon ();
+    return p.isValid () ? icon_provider.icon (m_files[p.row ()]) : QIcon ();
+  }
 }