Mercurial > octave-nkf

comparison libgui/graphics/ObjectProxy.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 35bca657d74d
children f0e61a67ad9f
comparison
equal deleted inserted replaced
20001:40b2c4323c16 20002:3cc0734283dc
38 : QObject (), m_object (0) 38 : QObject (), m_object (0)
39 { 39 {
40 init (obj); 40 init (obj);
41 } 41 }
42 42
43 void ObjectProxy::init (Object* obj) 43 void
44 ObjectProxy::init (Object* obj)
44 { 45 {
45 if (obj != m_object) 46 if (obj != m_object)
46 { 47 {
47 if (m_object) 48 if (m_object)
48 { 49 {
70 m_object, SLOT (slotPrint (const QString&, const QString&))); 71 m_object, SLOT (slotPrint (const QString&, const QString&)));
71 } 72 }
72 } 73 }
73 } 74 }
74 75
75 void ObjectProxy::setObject (Object* obj) 76 void
77 ObjectProxy::setObject (Object* obj)
76 { 78 {
77 emit sendFinalize (); 79 emit sendFinalize ();
78 init (obj); 80 init (obj);
79 } 81 }
80 82
81 void ObjectProxy::update (int pId) 83 void
84 ObjectProxy::update (int pId)
82 { 85 {
83 if (octave_thread::is_octave_thread ()) 86 if (octave_thread::is_octave_thread ())
84 emit sendUpdate (pId); 87 emit sendUpdate (pId);
85 else 88 else
86 m_object->slotUpdate (pId); 89 m_object->slotUpdate (pId);
87 } 90 }
88 91
89 void ObjectProxy::finalize (void) 92 void
93 ObjectProxy::finalize (void)
90 { 94 {
91 emit sendFinalize (); 95 emit sendFinalize ();
92 init (0); 96 init (0);
93 } 97 }
94 98
95 void ObjectProxy::redraw (void) 99 void
100 ObjectProxy::redraw (void)
96 { 101 {
97 emit sendRedraw (); 102 emit sendRedraw ();
98 } 103 }
99 104
100 void ObjectProxy::print (const QString& file_cmd, const QString& term) 105 void
106 ObjectProxy::print (const QString& file_cmd, const QString& term)
101 { 107 {
102 emit sendPrint (file_cmd, term); 108 emit sendPrint (file_cmd, term);
103 } 109 }
104 110
105 }; 111 };