Mercurial > octave
diff libgui/graphics/ListBoxControl.cc @ 25103:078b795c5219 stable
maint: style check C++ ahead of 4.4 release.
* ButtonGroup.cc, Canvas.cc, Figure.cc, GLCanvas.cc, GLCanvas.h,
ListBoxControl.cc, ObjectProxy.cc, QTerminal.h, dialog.cc, documentation.cc,
files-dock-widget.cc, history-dock-widget.cc, file-editor-tab.cc,
file-editor.h, find-dialog.cc, marker.h, octave-qscintilla.cc,
octave-qscintilla.h, main-window.cc, webinfo.cc, resource-manager.h,
settings-dialog.cc, shortcut-manager.cc, shortcut-manager.h,
variable-editor.cc, workspace-view.cc, build-env.in.cc, __ilu__.cc, cellfun.cc,
data.cc, dirfns.cc, dynamic-ld.h, environment.cc, error.cc, fcn-info.cc,
gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, help.cc,
interpreter.cc, load-path.cc, load-save.cc, ls-mat5.cc, mex.cc, oct-stream.cc,
oct-stream.h, qz.cc, sighandlers.cc, sparse-xpow.cc, svd.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, url-handle-manager.h, utils.cc, variables.cc,
__init_fltk__.cc, __ode15__.cc, gzip.cc, ov-base.cc, ov-builtin.h, ov-cell.cc,
ov-class.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-java.cc, ov-re-diag.cc,
op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc,
op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc,
op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc,
op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcs-fcm.cc, op-fcs-fcs.cc,
op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc,
op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc,
op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc,
op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc,
op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc,
op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc,
op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc,
op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc,
bp-table.cc, comment-list.h, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, lex.h,
parse.h, pt-binop.h, pt-decl.h, pt-eval.cc, pt-jit.cc, pt-jit.h, pt-misc.h,
token.h, CMatrix.cc, CMatrix.h, CSparse.cc, CSparse.h, dMatrix.h, fCMatrix.cc,
fCMatrix.h, fMatrix.h, Faddeeva.cc, gepbalance.cc, hess.cc, oct-fftw.cc,
oct-fftw.h, file-stat.cc, lo-sysinfo.cc, action-container.h, f77-fcn.h,
lo-regexp.cc, oct-mutex.h, oct-shlib.cc:
Use Octave coding conventions in C++ files.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 03 Apr 2018 13:52:07 -0700 |
| parents | 6652d3823428 |
| children | 00f796120a6d |
line wrap: on
line diff
--- a/libgui/graphics/ListBoxControl.cc Tue Apr 03 21:48:53 2018 +0200 +++ b/libgui/graphics/ListBoxControl.cc Tue Apr 03 13:52:07 2018 -0700 @@ -118,7 +118,7 @@ connect (list, SIGNAL (activated (const QModelIndex &)), SLOT (itemActivated (const QModelIndex &))); connect (list, SIGNAL (itemPressed (QListWidgetItem*)), - SLOT (itemPressed (QListWidgetItem*))); + SLOT (itemPressed (QListWidgetItem*))); } ListBoxControl::~ListBoxControl (void) @@ -179,7 +179,7 @@ gh_manager::post_callback (m_handle, "callback"); } - m_selectionChanged = false; + m_selectionChanged = false; } void @@ -208,14 +208,14 @@ { switch (e->type ()) { - case QEvent::KeyRelease: - if (m_selectionChanged) - sendSelectionChange (); - m_selectionChanged = false; - break; + case QEvent::KeyRelease: + if (m_selectionChanged) + sendSelectionChange (); + m_selectionChanged = false; + break; - default: - break; + default: + break; } return Object::eventFilter (watched, e); @@ -228,41 +228,41 @@ switch (e->type ()) { - case QEvent::MouseButtonPress: - { - QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); + case QEvent::MouseButtonPress: + { + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - if (m->button () & Qt::RightButton) - override_return = true; - else - { - if (! list->indexAt (m->pos ()).isValid ()) - override_return = true; - m_selectionChanged = true; - } - break; - } - case QEvent::MouseButtonRelease: - { - QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); + if (m->button () & Qt::RightButton) + override_return = true; + else + { + if (! list->indexAt (m->pos ()).isValid ()) + override_return = true; + m_selectionChanged = true; + } + break; + } + case QEvent::MouseButtonRelease: + { + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - if (m->button () & Qt::RightButton) - override_return = true; + if (m->button () & Qt::RightButton) + override_return = true; - else if (! list->indexAt (m->pos ()).isValid ()) - { - list->setCurrentRow (list->count () - 1); - override_return = true; - } + else if (! list->indexAt (m->pos ()).isValid ()) + { + list->setCurrentRow (list->count () - 1); + override_return = true; + } - if (m_selectionChanged) - sendSelectionChange (); - m_selectionChanged = false; + if (m_selectionChanged) + sendSelectionChange (); + m_selectionChanged = false; - break; - } - default: break; + } + default: + break; } return BaseControl::eventFilter (watched, e) || override_return;