Mercurial > octave

diff libgui/src/workspace-model.cc @ 17790:86c6ae5f969e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libgui/ * libgui/qterminal/libqterminal/QTerminal.h, libgui/src/color-picker.cc, libgui/src/color-picker.h, libgui/src/dialog.cc, libgui/src/dialog.h, libgui/src/documentation-dock-widget.cc, libgui/src/files-dock-widget.cc, libgui/src/files-dock-widget.h, libgui/src/find-files-dialog.cc, libgui/src/find-files-dialog.h, libgui/src/find-files-model.cc, libgui/src/find-files-model.h, libgui/src/history-dock-widget.cc, libgui/src/history-dock-widget.h, libgui/src/m-editor/file-editor-interface.h, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor-tab.h, libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/find-dialog.cc, libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/main-window.cc, libgui/src/main-window.h, libgui/src/news-dock-widget.h, libgui/src/octave-dock-widget.cc, libgui/src/octave-dock-widget.h, libgui/src/octave-gui.cc, libgui/src/octave-qt-link.cc, libgui/src/octave-qt-link.h, libgui/src/qtinfo/parser.cc, libgui/src/qtinfo/parser.h, libgui/src/qtinfo/webinfo.cc, libgui/src/qtinfo/webinfo.h, libgui/src/resource-manager.cc, libgui/src/settings-dialog.cc, libgui/src/settings-dialog.h, libgui/src/terminal-dock-widget.cc, libgui/src/welcome-wizard.cc, libgui/src/workspace-model.cc, libgui/src/workspace-model.h, libgui/src/workspace-view.cc, libgui/src/workspace-view.h: Use GNU style coding conventions for code in libgui/
author Rik <rik@octave.org>
date Tue, 29 Oct 2013 09:54:40 -0700
parents d63878346099
children 86e8dbccf7c7
line wrap: on
line diff
--- a/libgui/src/workspace-model.cc	Mon Oct 28 20:49:13 2013 -0700
+++ b/libgui/src/workspace-model.cc	Tue Oct 29 09:54:40 2013 -0700
@@ -118,7 +118,7 @@
   if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
     return _columnNames[section];
   else
-    return QVariant();
+    return QVariant ();
 }
 
 QVariant
@@ -131,7 +131,8 @@
       if (role == Qt::BackgroundColorRole)
         {
           QString class_chars = resource_manager::storage_class_chars ();
-          int actual_class = class_chars.indexOf (_scopes[idx.row()].toAscii ());
+          int actual_class
+            = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
           if (actual_class >= 0)
             return QVariant (_storage_class_colors.at (actual_class));
           else
@@ -146,36 +147,39 @@
             {
             case 0:
               if (role == Qt::ToolTipRole)
-                retval = QVariant (tr ("Right click to copy, rename, or display"));
+                retval
+                  = QVariant (tr ("Right click to copy, rename, or display"));
               else
-                retval = QVariant (_symbols[idx.row()]);
+                retval = QVariant (_symbols[idx.row ()]);
               break;
 
             case 1:
-              retval = QVariant (_class_names[idx.row()]);
+              retval = QVariant (_class_names[idx.row ()]);
               break;
 
             case 2:
-              retval = QVariant (_dimensions[idx.row()]);
+              retval = QVariant (_dimensions[idx.row ()]);
               break;
 
             case 3:
-              retval = QVariant (_values[idx.row()]);
+              retval = QVariant (_values[idx.row ()]);
               break;
 
             case 4:
               retval = QVariant ();
               QString class_chars = resource_manager::storage_class_chars ();
-              int actual_class = class_chars.indexOf (_scopes[idx.row()].toAscii ());
+              int actual_class
+                = class_chars.indexOf (_scopes[idx.row ()].toAscii ());
               if (actual_class >= 0)
                 {
-                  QStringList class_names = resource_manager::storage_class_names ();
+                  QStringList class_names
+                    = resource_manager::storage_class_names ();
                   retval = QVariant (class_names.at (actual_class));
                 }
               break;
 
-          }
-      }
+            }
+        }
     }
 
   return retval;
@@ -189,7 +193,7 @@
 
   if (idx.column () == 0 && role == Qt::EditRole)
     {
-      QString qold_name = _symbols[idx.row()];
+      QString qold_name = _symbols[idx.row ()];
 
       QString qnew_name = value.toString ();
 
@@ -250,7 +254,7 @@
 void
 workspace_model::update_table (void)
 {
-  beginResetModel();
+  beginResetModel ();
 
   // Nothing to do except tell the world to recalc.
 
@@ -262,14 +266,16 @@
 void
 workspace_model::notice_settings (const QSettings *settings)
 {
-  QList<QColor> default_colors = resource_manager::storage_class_default_colors ();
+  QList<QColor> default_colors =
+    resource_manager::storage_class_default_colors ();
   QString class_chars = resource_manager::storage_class_chars ();
 
   for (int i = 0; i < class_chars.length (); i++)
     {
       QVariant default_var = default_colors.at (i);
-      QColor setting_color = settings->value ("workspaceview/color_"+class_chars.mid (i,1),
-                                             default_var).value<QColor> ();
+      QColor setting_color = settings->value ("workspaceview/color_"
+                                              + class_chars.mid (i,1),
+                                              default_var).value<QColor> ();
       _storage_class_colors.replace (i,setting_color);
     }
 }