Mercurial > octave-nkf
diff libgui/graphics/Backend.cc @ 19655:af0399a5aae0 gui-release
untabify QtHandles source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 23 Jan 2015 16:24:46 -0500 |
parents | 4c1f638a381e |
children | 2f4406e9dad6 |
line wrap: on
line diff
--- a/libgui/graphics/Backend.cc Fri Jan 23 16:09:35 2015 -0500 +++ b/libgui/graphics/Backend.cc Fri Jan 23 16:24:46 2015 -0500 @@ -53,16 +53,16 @@ if (go.isa ("figure")) return std::string ("__plot_stream__"); else if (go.isa ("uicontrol") - || go.isa ("uipanel") - || go.isa ("uimenu") - || go.isa ("uicontextmenu") - || go.isa ("uitoolbar") - || go.isa ("uipushtool") - || go.isa ("uitoggletool")) + || go.isa ("uipanel") + || go.isa ("uimenu") + || go.isa ("uicontextmenu") + || go.isa ("uitoolbar") + || go.isa ("uipushtool") + || go.isa ("uitoggletool")) return std::string ("__object__"); else qCritical ("QtHandles::Backend: no __object__ property known for object " - "of type %s", go.type ().c_str ()); + "of type %s", go.type ().c_str ()); return std::string (); } @@ -73,7 +73,7 @@ ObjectFactory* factory = ObjectFactory::instance (); connect (this, SIGNAL (createObject (double)), - factory, SLOT (createObject (double))); + factory, SLOT (createObject (double))); } Backend::~Backend (void) @@ -92,13 +92,13 @@ || go.isa ("uitoggletool")) { Logger::debug ("Backend::initialize %s from thread %08x", - go.type ().c_str (), QThread::currentThreadId ()); + go.type ().c_str (), QThread::currentThreadId ()); ObjectProxy* proxy = new ObjectProxy (); graphics_object gObj (go); gObj.get_properties ().set(toolkitObjectProperty (go), - OCTAVE_PTR_TYPE (reinterpret_cast <OCTAVE_INTPTR_TYPE> (proxy))); + OCTAVE_PTR_TYPE (reinterpret_cast <OCTAVE_INTPTR_TYPE> (proxy))); emit createObject (go.get_handle ().value ()); @@ -123,30 +123,30 @@ return; Logger::debug ("Backend::update %s(%d) from thread %08x", - go.type ().c_str (), pId, QThread::currentThreadId ()); + go.type ().c_str (), pId, QThread::currentThreadId ()); ObjectProxy* proxy = toolkitObjectProxy (go); if (proxy) { if (go.isa ("uicontrol") - && pId == uicontrol::properties::ID_STYLE) - { - // Special case: we need to recreate the control widget - // associated with the octave graphics_object + && pId == uicontrol::properties::ID_STYLE) + { + // Special case: we need to recreate the control widget + // associated with the octave graphics_object - finalize (go); - initialize (go); - } + finalize (go); + initialize (go); + } else - proxy->update (pId); + proxy->update (pId); } } void Backend::finalize (const graphics_object& go) { Logger::debug ("Backend::finalize %s from thread %08x", - go.type ().c_str (), QThread::currentThreadId ()); + go.type ().c_str (), QThread::currentThreadId ()); ObjectProxy* proxy = toolkitObjectProxy (go); @@ -168,7 +168,7 @@ ObjectProxy* proxy = toolkitObjectProxy (go); if (proxy) - proxy->redraw (); + proxy->redraw (); } } @@ -189,12 +189,12 @@ octave_value ov = go.get (toolkitObjectProperty (go)); if (ov.is_defined () && ! ov.is_empty ()) - { - OCTAVE_INTPTR_TYPE ptr = ov.OCTAVE_PTR_SCALAR ().value (); + { + OCTAVE_INTPTR_TYPE ptr = ov.OCTAVE_PTR_SCALAR ().value (); - if (! error_state) - return reinterpret_cast<ObjectProxy*> (ptr); - } + if (! error_state) + return reinterpret_cast<ObjectProxy*> (ptr); + } } return 0;