Mercurial > octave-nkf

comparison libgui/graphics/PushButtonControl.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 fe0e34be5576
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
32 #include "QtHandlesUtils.h" 32 #include "QtHandlesUtils.h"
33 33
34 namespace QtHandles 34 namespace QtHandles
35 { 35 {
36 36
37 PushButtonControl* PushButtonControl::create (const graphics_object& go) 37 PushButtonControl*
38 PushButtonControl::create (const graphics_object& go)
38 { 39 {
39 Object* parent = Object::parentObject (go); 40 Object* parent = Object::parentObject (go);
40 41
41 if (parent) 42 if (parent)
42 { 43 {
47 } 48 }
48 49
49 return 0; 50 return 0;
50 } 51 }
51 52
52 PushButtonControl::PushButtonControl (const graphics_object& go, QPushButton* btn) 53 PushButtonControl::PushButtonControl (const graphics_object& go,
54 QPushButton* btn)
53 : ButtonControl (go, btn) 55 : ButtonControl (go, btn)
54 { 56 {
55 btn->setAutoFillBackground (true); 57 btn->setAutoFillBackground (true);
56 } 58 }
57 59
58 PushButtonControl::~PushButtonControl (void) 60 PushButtonControl::~PushButtonControl (void)
59 { 61 {
60 } 62 }
61 63
62 void PushButtonControl::update (int pId) 64 void
65 PushButtonControl::update (int pId)
63 { 66 {
64 uicontrol::properties& up = properties<uicontrol> (); 67 uicontrol::properties& up = properties<uicontrol> ();
65 QPushButton* btn = qWidget<QPushButton> (); 68 QPushButton* btn = qWidget<QPushButton> ();
66 69
67 switch (pId) 70 switch (pId)
68 { 71 {
69 case uicontrol::properties::ID_STRING: 72 case uicontrol::properties::ID_STRING:
70 btn->setText (Utils::fromStdString (up.get_string_string ())); 73 btn->setText (Utils::fromStdString (up.get_string_string ()));
71 break; 74 break;
75
72 default: 76 default:
73 BaseControl::update (pId); 77 BaseControl::update (pId);
74 break; 78 break;
75 } 79 }
76 } 80 }