Mercurial > octave-nkf

comparison libgui/graphics/__init_qt__.cc @ 20002:3cc0734283dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes in Qt graphics code * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc: Follow a few more Octave coding conventions.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Mar 2015 12:27:54 -0400
parents b6061813a693
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
41 namespace QtHandles 41 namespace QtHandles
42 { 42 {
43 43
44 static bool qtHandlesInitialized = false; 44 static bool qtHandlesInitialized = false;
45 45
46 bool __init__ (void) 46 bool
47 __init__ (void)
47 { 48 {
48 if (! qtHandlesInitialized) 49 if (! qtHandlesInitialized)
49 { 50 {
50 if (qApp) 51 if (qApp)
51 { 52 {
92 } 93 }
93 94
94 return false; 95 return false;
95 } 96 }
96 97
97 bool __shutdown__ (void) 98 bool
99 __shutdown__ (void)
98 { 100 {
99 if (qtHandlesInitialized) 101 if (qtHandlesInitialized)
100 { 102 {
101 gh_manager::auto_lock lock; 103 gh_manager::auto_lock lock;
102 104
140 "__init_qt__.cc", ""); 142 "__init_qt__.cc", "");
141 } 143 }
142 144
143 #if 0 145 #if 0
144 146
145 static QStringList makeFilterSpecs (const Cell& filters) 147 static QStringList
148 makeFilterSpecs (const Cell& filters)
146 { 149 {
147 using namespace QtHandles::Utils; 150 using namespace QtHandles::Utils;
148 151
149 QStringList filterSpecs; 152 QStringList filterSpecs;
150 QRegExp parenRe (" ?\\(.*\\)\\s*$"); 153 QRegExp parenRe (" ?\\(.*\\)\\s*$");
170 } 173 }
171 174
172 return filterSpecs; 175 return filterSpecs;
173 } 176 }
174 177
175 static QString appendDirSep (const QString& d) 178 static QString
179 appendDirSep (const QString& d)
176 { 180 {
177 if (! d.endsWith ("/") && ! d.endsWith (QDir::separator ())) 181 if (! d.endsWith ("/") && ! d.endsWith (QDir::separator ()))
178 return (d + "/"); 182 return (d + "/");
179 return d; 183 return d;
180 } 184 }