Mercurial > octave-nkf
changeset 18506:146ce31e5d28
maint: Merge gui-release to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 20 Feb 2014 14:08:53 -0800 |
| parents | c579bd4e12c9 (current diff) 554be77a60fb (diff) |
| children | bc31d9359cf9 |
| files | |
| diffstat | 72 files changed, 843 insertions(+), 1660 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Backend.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Backend.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -44,13 +45,9 @@ # define OCTAVE_PTR_SCALAR uint64_scalar_value //#endif -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static std::string toolkitObjectProperty (const graphics_object& go) { if (go.isa ("figure")) @@ -70,8 +67,6 @@ return std::string (); } -////////////////////////////////////////////////////////////////////////////// - Backend::Backend (void) : QObject (), base_graphics_toolkit ("qt") { @@ -81,14 +76,10 @@ factory, SLOT (createObject (double))); } -////////////////////////////////////////////////////////////////////////////// - Backend::~Backend (void) { } -////////////////////////////////////////////////////////////////////////////// - bool Backend::initialize (const graphics_object& go) { if (go.isa ("figure") @@ -117,8 +108,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - void Backend::update (const graphics_object& go, int pId) { // Rule out obvious properties we want to ignore. @@ -154,8 +143,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Backend::finalize (const graphics_object& go) { Logger::debug ("Backend::finalize %s from thread %08x", @@ -174,8 +161,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Backend::redraw_figure (const graphics_object& go) const { if (go.get_properties ().is_visible ()) @@ -187,8 +172,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - Object* Backend::toolkitObject (const graphics_object& go) { ObjectProxy* proxy = toolkitObjectProxy (go); @@ -199,8 +182,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - ObjectProxy* Backend::toolkitObjectProxy (const graphics_object& go) { if (go) @@ -219,6 +200,4 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/Backend.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Backend.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ #include "graphics.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Object; class ObjectProxy; @@ -65,10 +62,6 @@ void createObject (double handle); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/BaseControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/BaseControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -32,13 +33,9 @@ #include "ContextMenu.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static void updatePalette (const uicontrol::properties& props, QWidget* w) { QPalette p = w->palette (); @@ -71,16 +68,12 @@ w->setPalette (p); } -////////////////////////////////////////////////////////////////////////////// - BaseControl::BaseControl (const graphics_object& go, QWidget* w) : Object (go, w), m_normalizedFont (false), m_keyPressHandlerDefined (false) { init (w); } -////////////////////////////////////////////////////////////////////////////// - void BaseControl::init (QWidget* w, bool callBase) { if (callBase) @@ -103,14 +96,10 @@ m_normalizedFont = up.fontunits_is ("normalized"); } -////////////////////////////////////////////////////////////////////////////// - BaseControl::~BaseControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void BaseControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -158,8 +147,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - bool BaseControl::eventFilter (QObject* watched, QEvent* event) { switch (event->type ()) @@ -228,6 +215,4 @@ return Object::eventFilter (watched, event); } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/BaseControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/BaseControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ class QEvent; class QObject; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class BaseControl : public Object { public: @@ -53,10 +50,6 @@ bool m_keyPressHandlerDefined; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ButtonControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "Container.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - ButtonControl::ButtonControl (const graphics_object& go, QAbstractButton* btn) : BaseControl (go, btn), m_blockCallback (false) { @@ -56,14 +53,10 @@ connect (btn, SIGNAL (toggled (bool)), SLOT (toggled (bool))); } -////////////////////////////////////////////////////////////////////////////// - ButtonControl::~ButtonControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void ButtonControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -98,8 +91,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void ButtonControl::toggled (bool checked) { QAbstractButton* btn = qWidget<QAbstractButton> (); @@ -120,8 +111,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void ButtonControl::clicked (void) { QAbstractButton* btn = qWidget<QAbstractButton> (); @@ -130,6 +119,4 @@ gh_manager::post_callback (m_handle, "callback"); } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/ButtonControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ButtonControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QAbstractButton; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class ButtonControl : public BaseControl { Q_OBJECT @@ -52,10 +49,6 @@ bool m_blockCallback; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Canvas.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Canvas.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -34,13 +35,9 @@ #include "GLCanvas.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - void Canvas::redraw (bool sync) { if (sync) @@ -49,15 +46,11 @@ qWidget ()->update (); } -////////////////////////////////////////////////////////////////////////////// - void Canvas::blockRedraw (bool block) { m_redrawBlocked = block; } -////////////////////////////////////////////////////////////////////////////// - void Canvas::canvasPaintEvent (void) { if (! m_redrawBlocked) @@ -71,8 +64,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Canvas::canvasMouseMoveEvent (QMouseEvent* event) { gh_manager::auto_lock lock; @@ -145,8 +136,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Canvas::canvasMousePressEvent (QMouseEvent* event) { gh_manager::auto_lock lock; @@ -292,8 +281,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Canvas::canvasMouseReleaseEvent (QMouseEvent* event) { if (m_mouseMode == ZoomMode @@ -346,8 +333,6 @@ m_mouseMode = NoMode; } -////////////////////////////////////////////////////////////////////////////// - bool Canvas::canvasKeyPressEvent (QKeyEvent* event) { if (m_eventMask & KeyPress) @@ -364,8 +349,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - bool Canvas::canvasKeyReleaseEvent (QKeyEvent* event) { if (! event->isAutoRepeat () && (m_eventMask & KeyRelease)) @@ -379,8 +362,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - Canvas* Canvas::create (const std::string& /* name */, QWidget* parent, const graphics_handle& handle) { @@ -388,6 +369,4 @@ return new GLCanvas (parent, handle); } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Canvas.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Canvas.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -32,13 +33,9 @@ class QMouseEvent; class QWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Canvas { public: @@ -95,10 +92,6 @@ int m_eventMask; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/CheckBoxControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/CheckBoxControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -28,13 +29,9 @@ #include "CheckBoxControl.h" #include "Container.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - CheckBoxControl* CheckBoxControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -50,20 +47,14 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - CheckBoxControl::CheckBoxControl (const graphics_object& go, QCheckBox* box) : ButtonControl (go, box) { box->setAutoFillBackground (true); } -////////////////////////////////////////////////////////////////////////////// - CheckBoxControl::~CheckBoxControl (void) { } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/CheckBoxControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/CheckBoxControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QCheckBox; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class CheckBoxControl : public ButtonControl { public: @@ -42,10 +39,6 @@ static CheckBoxControl* create (const graphics_object& go); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Container.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Container.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -32,27 +33,19 @@ #include "Object.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - Container::Container (QWidget* parent) : ContainerBase (parent), m_canvas (0) { setFocusPolicy (Qt::ClickFocus); } -////////////////////////////////////////////////////////////////////////////// - Container::~Container (void) { } -////////////////////////////////////////////////////////////////////////////// - Canvas* Container::canvas (const graphics_handle& handle, bool create) { if (! m_canvas && create) @@ -77,8 +70,6 @@ return m_canvas; } -////////////////////////////////////////////////////////////////////////////// - void Container::resizeEvent (QResizeEvent* /* event */) { if (m_canvas) @@ -104,6 +95,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Container.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Container.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -28,13 +29,9 @@ #include "graphics.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - DECLARE_GENERICEVENTNOTIFY_SENDER(ContainerBase, QWidget); class Canvas; @@ -54,10 +51,6 @@ Canvas* m_canvas; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ContextMenu.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ContextMenu.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "ContextMenu.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - ContextMenu* ContextMenu::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -50,8 +47,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - ContextMenu::ContextMenu (const graphics_object& go, QMenu* menu) : Object (go, menu) { @@ -63,14 +58,10 @@ connect (menu, SIGNAL (aboutToHide (void)), SLOT (aboutToHide (void))); } -////////////////////////////////////////////////////////////////////////////// - ContextMenu::~ContextMenu (void) { } -////////////////////////////////////////////////////////////////////////////// - void ContextMenu::update (int pId) { uicontextmenu::properties& up = properties<uicontextmenu> (); @@ -100,30 +91,22 @@ } } -////////////////////////////////////////////////////////////////////////////// - void ContextMenu::aboutToShow (void) { gh_manager::post_callback (m_handle, "callback"); gh_manager::post_set (m_handle, "visible", "on", false); } -////////////////////////////////////////////////////////////////////////////// - void ContextMenu::aboutToHide (void) { gh_manager::post_set (m_handle, "visible", "off", false); } -////////////////////////////////////////////////////////////////////////////// - QWidget* ContextMenu::menu (void) { return qWidget<QWidget> (); } -////////////////////////////////////////////////////////////////////////////// - void ContextMenu::executeAt (const base_properties& props, const QPoint& pt) { graphics_handle h = props.get_uicontextmenu (); @@ -148,6 +131,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/ContextMenu.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ContextMenu.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ class QMenu; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class ContextMenu : public Object, public MenuContainer { Q_OBJECT @@ -59,10 +56,6 @@ void aboutToHide (void); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/EditControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/EditControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -30,13 +31,9 @@ #include "TextEdit.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - EditControl* EditControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -59,16 +56,12 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - EditControl::EditControl (const graphics_object& go, QLineEdit* edit) : BaseControl (go, edit), m_multiLine (false), m_textChanged (false) { init (edit); } -////////////////////////////////////////////////////////////////////////////// - void EditControl::init (QLineEdit* edit, bool callBase) { if (callBase) @@ -89,16 +82,12 @@ SLOT (editingFinished (void))); } -////////////////////////////////////////////////////////////////////////////// - EditControl::EditControl (const graphics_object& go, TextEdit* edit) : BaseControl (go, edit), m_multiLine (true), m_textChanged (false) { init (edit); } -////////////////////////////////////////////////////////////////////////////// - void EditControl::init (TextEdit* edit, bool callBase) { if (callBase) @@ -119,21 +108,15 @@ SLOT (editingFinished (void))); } -////////////////////////////////////////////////////////////////////////////// - EditControl::~EditControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void EditControl::initCommon (QWidget*) { m_textChanged = false; } -////////////////////////////////////////////////////////////////////////////// - void EditControl::update (int pId) { bool handled = false; @@ -154,8 +137,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - bool EditControl::updateSingleLine (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -188,8 +169,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - bool EditControl::updateMultiLine (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -217,15 +196,11 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - void EditControl::textChanged (void) { m_textChanged = true; } -////////////////////////////////////////////////////////////////////////////// - void EditControl::editingFinished (void) { if (m_textChanged) @@ -241,8 +216,5 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -//////////////////////////////////////////////////////////////////////////////
--- a/libgui/graphics/EditControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/EditControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ class QLineEdit; class QWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class TextEdit; class EditControl : public BaseControl @@ -66,10 +63,6 @@ bool m_textChanged; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Figure.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Figure.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -44,21 +45,13 @@ #include "MouseModeActionGroup.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - -#define ABOUT_TEXT "<b>QtHandles</b> - a Qt-based toolkit for <a href=\"http://www.octave.org\">Octave</a>.<br><br>Copyright (C) 2011 Michael Goffioul." - -////////////////////////////////////////////////////////////////////////////// +#define ABOUT_TEXT "<b>QtHandles</b> - a Qt-based toolkit for <a href=\"http://www.octave.org\">Octave</a>.<br><br>Copyright (C) 2011-2014 Michael Goffioul" DECLARE_GENERICEVENTNOTIFY_SENDER(MenuBar, QMenuBar); -////////////////////////////////////////////////////////////////////////////// - static bool hasUiControlChildren (const figure::properties& fp) { Matrix kids = fp.get_all_children (); @@ -75,8 +68,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - static bool hasUiMenuChildren (const figure::properties& fp) { Matrix kids = fp.get_all_children (); @@ -92,8 +83,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - static QRect boundingBoxToRect (const Matrix& bb) { QRect r; @@ -109,15 +98,11 @@ return r; } -////////////////////////////////////////////////////////////////////////////// - Figure* Figure::create (const graphics_object& go) { return new Figure (go, new FigureWindow ()); } -////////////////////////////////////////////////////////////////////////////// - Figure::Figure (const graphics_object& go, FigureWindow* win) : Object (go, win), m_blockUpdates (false), m_mouseMode (NoMode), m_lastMouseMode (NoMode), m_figureToolBar (0), m_menuBar (0), @@ -168,14 +153,10 @@ m_container->addReceiver (this); } -////////////////////////////////////////////////////////////////////////////// - Figure::~Figure (void) { } -////////////////////////////////////////////////////////////////////////////// - void Figure::createFigureToolBarAndMenuBar (void) { QMainWindow* win = qWidget<QMainWindow> (); @@ -223,15 +204,11 @@ m_menuBar->addReceiver (this); } -////////////////////////////////////////////////////////////////////////////// - Container* Figure::innerContainer (void) { return m_container; } -////////////////////////////////////////////////////////////////////////////// - void Figure::redraw (void) { Canvas* canvas = m_container->canvas (m_handle); @@ -252,8 +229,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Figure::beingDeleted (void) { Canvas* canvas = m_container->canvas (m_handle.value (), false); @@ -266,8 +241,6 @@ qWidget<FigureWindow> ()->removeReceiver (this); } -////////////////////////////////////////////////////////////////////////////// - void Figure::update (int pId) { if (m_blockUpdates) @@ -336,8 +309,6 @@ m_blockUpdates = false; } -////////////////////////////////////////////////////////////////////////////// - void Figure::showFigureToolBar (bool visible) { if ((! m_figureToolBar->isHidden ()) != visible) @@ -367,8 +338,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Figure::showMenuBar (bool visible) { int h1 = m_menuBar->sizeHint ().height (); @@ -403,8 +372,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Figure::updateMenuBar (void) { gh_manager::auto_lock lock; @@ -414,15 +381,11 @@ showMenuBar (Utils::properties<figure> (go).menubar_is ("figure")); } -////////////////////////////////////////////////////////////////////////////// - QWidget* Figure::menu (void) { return qWidget<QMainWindow> ()->menuBar (); } -////////////////////////////////////////////////////////////////////////////// - struct UpdateBoundingBoxData { Matrix m_bbox; @@ -453,8 +416,6 @@ delete d; } -////////////////////////////////////////////////////////////////////////////// - void Figure::updateBoundingBox (bool internal, int flags) { QWidget* win = qWidget<QWidget> (); @@ -517,8 +478,6 @@ gh_manager::post_function (Figure::updateBoundingBoxHelper, d); } -////////////////////////////////////////////////////////////////////////////// - bool Figure::eventNotifyBefore (QObject* obj, QEvent* event) { if (! m_blockUpdates) @@ -561,8 +520,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - void Figure::eventNotifyAfter (QObject* watched, QEvent* event) { if (! m_blockUpdates) @@ -622,47 +579,33 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Figure::helpAboutQtHandles (void) { QMessageBox::about (qWidget<QMainWindow> (), tr ("About QtHandles"), ABOUT_TEXT); } -////////////////////////////////////////////////////////////////////////////// - void Figure::fileNewFigure (void) { } -////////////////////////////////////////////////////////////////////////////// - void Figure::fileCloseFigure (void) { qWidget<QMainWindow> ()->close (); } -////////////////////////////////////////////////////////////////////////////// - void Figure::editCopy (void) { } -////////////////////////////////////////////////////////////////////////////// - void Figure::editCut (void) { } -////////////////////////////////////////////////////////////////////////////// - void Figure::editPaste (void) { } -////////////////////////////////////////////////////////////////////////////// - void Figure::addCustomToolBar (QToolBar* bar, bool visible) { QMainWindow* win = qWidget<QMainWindow> (); @@ -688,8 +631,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Figure::showCustomToolBar (QToolBar* bar, bool visible) { QMainWindow* win = qWidget<QMainWindow> (); @@ -713,13 +654,9 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Figure::updateContainer (void) { redraw (); } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Figure.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Figure.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -31,13 +32,9 @@ class QMainWindow; class QToolBar; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - enum MouseMode { NoMode = 0, @@ -47,8 +44,6 @@ SelectMode = 4 }; -////////////////////////////////////////////////////////////////////////////// - class Container; class FigureWindow; class MenuBar; @@ -124,10 +119,6 @@ QRect m_outerRect; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/FigureWindow.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/FigureWindow.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,32 +28,22 @@ #include "FigureWindow.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - FigureWindow::FigureWindow (QWidget* parent) : FigureWindowBase (parent) { } -////////////////////////////////////////////////////////////////////////////// - FigureWindow::~FigureWindow (void) { } -////////////////////////////////////////////////////////////////////////////// - QMenu* FigureWindow::createPopupMenu (void) { // For the time being, disable menubar/toolbar popup menu return 0; } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/FigureWindow.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/FigureWindow.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ #include "GenericEventNotify.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - DECLARE_GENERICEVENTNOTIFY_SENDER(FigureWindowBase, QMainWindow); class FigureWindow : public FigureWindowBase @@ -46,10 +43,6 @@ QMenu* createPopupMenu (void); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/GLCanvas.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/GLCanvas.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -33,27 +34,19 @@ #include "GLCanvas.h" #include "gl-select.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - GLCanvas::GLCanvas (QWidget* parent, const graphics_handle& handle) : QGLWidget (parent), Canvas (handle) { setFocusPolicy (Qt::ClickFocus); } -////////////////////////////////////////////////////////////////////////////// - GLCanvas::~GLCanvas (void) { } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::draw (const graphics_handle& handle) { graphics_object go = gh_manager::get_object (handle); @@ -67,8 +60,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - graphics_object GLCanvas::selectFromAxes (const graphics_object& ax, const QPoint& pt) { @@ -85,8 +76,6 @@ return graphics_object (); } -////////////////////////////////////////////////////////////////////////////// - inline void glDrawZoomBox (const QPoint& p1, const QPoint& p2) { glVertex2d (p1.x (), p1.y ()); @@ -125,50 +114,36 @@ glPopMatrix (); } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::paintGL (void) { canvasPaintEvent (); } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::mouseMoveEvent (QMouseEvent* event) { canvasMouseMoveEvent (event); } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::mousePressEvent (QMouseEvent* event) { canvasMousePressEvent (event); } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::mouseReleaseEvent (QMouseEvent* event) { canvasMouseReleaseEvent (event); } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::keyPressEvent (QKeyEvent* event) { if (! canvasKeyPressEvent (event)) QGLWidget::keyPressEvent (event); } -////////////////////////////////////////////////////////////////////////////// - void GLCanvas::keyReleaseEvent (QKeyEvent* event) { if (! canvasKeyReleaseEvent (event)) QGLWidget::keyReleaseEvent (event); } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/GLCanvas.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/GLCanvas.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ #include "Canvas.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class GLCanvas : public QGLWidget, public Canvas { public: @@ -56,10 +53,6 @@ void keyReleaseEvent (QKeyEvent* event); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/GenericEventNotify.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/GenericEventNotify.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -28,13 +29,9 @@ class QObject; class QWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class GenericEventNotifyReceiver; class GenericEventNotifySender @@ -57,8 +54,6 @@ QSet<GenericEventNotifyReceiver*> m_receivers; }; -////////////////////////////////////////////////////////////////////////////// - class GenericEventNotifyReceiver { public: @@ -69,8 +64,6 @@ virtual void eventNotifyAfter (QObject* obj, QEvent* evt) = 0; }; -////////////////////////////////////////////////////////////////////////////// - inline bool GenericEventNotifySender::notifyReceiversBefore (QObject* obj, QEvent* evt) @@ -81,8 +74,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - inline void GenericEventNotifySender::notifyReceiversAfter (QObject* obj, QEvent* evt) @@ -91,8 +82,6 @@ r->eventNotifyAfter (obj, evt); } -////////////////////////////////////////////////////////////////////////////// - #define DECLARE_GENERICEVENTNOTIFY_SENDER(T,B) \ class T : public B, public GenericEventNotifySender \ { \ @@ -110,10 +99,6 @@ } \ } -////////////////////////////////////////////////////////////////////////////// - }; -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/KeyMap.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/KeyMap.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -28,18 +29,12 @@ #include "KeyMap.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - namespace KeyMap { -////////////////////////////////////////////////////////////////////////////// - std::string qKeyToKeyString (int key) { static QMap<int, std::string> keyMapper; @@ -258,10 +253,6 @@ return keyMapper.value (key, std::string ("<unknown key>")); } -////////////////////////////////////////////////////////////////////////////// - }; //namespace KeyMap -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/KeyMap.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/KeyMap.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,49 +1,38 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ #ifndef __QtHandles__KeyMap__ #define __QtHandles__KeyMap__ 1 -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - namespace KeyMap { -////////////////////////////////////////////////////////////////////////////// - std::string qKeyToKeyString (int key); -////////////////////////////////////////////////////////////////////////////// - }; // namespace KeyMap -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ListBoxControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ListBoxControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "ListBoxControl.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static void updateSelection (QListWidget* list, const Matrix& value) { octave_idx_type n = value.numel (); @@ -63,8 +60,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - ListBoxControl* ListBoxControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -80,8 +75,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - ListBoxControl::ListBoxControl (const graphics_object& go, QListWidget* list) : BaseControl (go, list), m_blockCallback (false) { @@ -120,14 +113,10 @@ SLOT (itemSelectionChanged (void))); } -////////////////////////////////////////////////////////////////////////////// - ListBoxControl::~ListBoxControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void ListBoxControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -160,8 +149,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void ListBoxControl::itemSelectionChanged (void) { if (! m_blockCallback) @@ -180,6 +167,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/ListBoxControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ListBoxControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QListWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class ListBoxControl : public BaseControl { Q_OBJECT @@ -53,10 +50,6 @@ bool m_blockCallback; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Logger.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Logger.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -31,18 +32,12 @@ #include "Logger.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - Logger* Logger::s_instance = 0; QMutex* Logger::s_mutex = 0; -////////////////////////////////////////////////////////////////////////////// - Logger::Logger (void) : m_debugEnabled (false) { @@ -52,14 +47,10 @@ m_debugEnabled = true; } -////////////////////////////////////////////////////////////////////////////// - Logger::~Logger (void) { } -////////////////////////////////////////////////////////////////////////////// - Logger* Logger::instance (void) { if (! s_instance) @@ -71,8 +62,6 @@ return s_instance; } -////////////////////////////////////////////////////////////////////////////// - #define STATIC_LOGGER(fun) \ void Logger::fun (const char* fmt, ...) \ { \ @@ -85,8 +74,6 @@ STATIC_LOGGER (debug) -////////////////////////////////////////////////////////////////////////////// - void Logger::debugV (const char* fmt, va_list arg) { if (m_debugEnabled) @@ -96,6 +83,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Logger.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Logger.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QMutex; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Logger { public: @@ -53,10 +50,6 @@ void debugV (const char* fmt, va_list arg); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Menu.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Menu.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -32,13 +33,9 @@ #include "Menu.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static QKeySequence accelSequence (const uimenu::properties& up) { std::string s (up.get_accelerator ()); @@ -59,8 +56,6 @@ return QKeySequence (); } -////////////////////////////////////////////////////////////////////////////// - Menu* Menu::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -76,8 +71,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - Menu::Menu (const graphics_object& go, QAction* action, Object* parent) : Object (go, action), m_parent (0), m_separator (0) { @@ -154,14 +147,10 @@ connect (action, SIGNAL (triggered (bool)), SLOT (actionTriggered (void))); } -////////////////////////////////////////////////////////////////////////////// - Menu::~Menu (void) { } -////////////////////////////////////////////////////////////////////////////// - void Menu::update (int pId) { uimenu::properties& up = properties<uimenu> (); @@ -251,8 +240,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - QWidget* Menu::menu (void) { QAction* action = qWidget<QAction> (); @@ -270,8 +257,6 @@ return _menu; } -////////////////////////////////////////////////////////////////////////////// - void Menu::actionTriggered (void) { QAction* action = qWidget<QAction> (); @@ -281,15 +266,11 @@ gh_manager::post_callback (m_handle, "callback"); } -////////////////////////////////////////////////////////////////////////////// - void Menu::actionHovered (void) { gh_manager::post_callback (m_handle, "callback"); } -////////////////////////////////////////////////////////////////////////////// - void Menu::updateSiblingPositions (void) { if (m_parent) @@ -323,6 +304,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Menu.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Menu.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ class QMenu; class QWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Menu : public Object, public MenuContainer { Q_OBJECT @@ -65,10 +62,6 @@ QAction* m_separator; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/MenuContainer.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/MenuContainer.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -24,23 +25,15 @@ class QWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class MenuContainer { public: virtual QWidget* menu (void) = 0; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/MouseModeActionGroup.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/MouseModeActionGroup.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "Figure.h" #include "MouseModeActionGroup.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - MouseModeActionGroup::MouseModeActionGroup (QObject* parent) : QObject (parent), m_current (0) { @@ -57,14 +54,10 @@ } } -////////////////////////////////////////////////////////////////////////////// - MouseModeActionGroup::~MouseModeActionGroup (void) { } -////////////////////////////////////////////////////////////////////////////// - void MouseModeActionGroup::actionToggled (bool checked) { if (! checked) @@ -90,8 +83,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - MouseMode MouseModeActionGroup::mouseMode (void) const { int i = (m_current ? -1 : m_actions.indexOf (m_current)); @@ -99,6 +90,4 @@ return static_cast<MouseMode> (i+1); } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/MouseModeActionGroup.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/MouseModeActionGroup.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ class QAction; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class MouseModeActionGroup : public QObject { Q_OBJECT @@ -58,10 +55,6 @@ QAction* m_current; }; -////////////////////////////////////////////////////////////////////////////// - }; -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Object.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Object.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "Object.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - Object::Object (const graphics_object& go, QObject* obj) : QObject (), m_handle (go.get_handle ()), m_qobject (0) { @@ -49,8 +46,6 @@ init (obj); } -////////////////////////////////////////////////////////////////////////////// - void Object::init (QObject* obj, bool) { if (m_qobject) @@ -68,14 +63,10 @@ } } -////////////////////////////////////////////////////////////////////////////// - Object::~Object (void) { } -////////////////////////////////////////////////////////////////////////////// - graphics_object Object::object (void) const { gh_manager::auto_lock lock (false); @@ -88,8 +79,6 @@ return gh_manager::get_object (m_handle); } -////////////////////////////////////////////////////////////////////////////// - void Object::slotUpdate (int pId) { gh_manager::auto_lock lock; @@ -109,8 +98,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void Object::slotFinalize (void) { gh_manager::auto_lock lock; @@ -118,8 +105,6 @@ finalize (); } -////////////////////////////////////////////////////////////////////////////// - void Object::slotRedraw (void) { gh_manager::auto_lock lock; @@ -128,14 +113,10 @@ redraw (); } -////////////////////////////////////////////////////////////////////////////// - void Object::update (int /* pId */) { } -////////////////////////////////////////////////////////////////////////////// - void Object::finalize (void) { if (m_qobject) @@ -146,28 +127,20 @@ deleteLater (); } -////////////////////////////////////////////////////////////////////////////// - void Object::redraw (void) { } -////////////////////////////////////////////////////////////////////////////// - void Object::beingDeleted (void) { } -////////////////////////////////////////////////////////////////////////////// - void Object::objectDestroyed (QObject* obj) { if (obj && obj == m_qobject) m_qobject = 0; } -////////////////////////////////////////////////////////////////////////////// - Object* Object::parentObject (const graphics_object& go) { Object* parent = Backend::toolkitObject @@ -176,8 +149,6 @@ return parent; } -////////////////////////////////////////////////////////////////////////////// - Object* Object::fromQObject (QObject* obj) { QVariant v = obj->property ("QtHandles::Object"); @@ -188,6 +159,4 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Object.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Object.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ class QObject; class QWidget; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Container; class ObjectProxy; @@ -101,10 +98,6 @@ QObject* m_qobject; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ObjectFactory.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ObjectFactory.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -50,13 +51,9 @@ #include "ToolBar.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - ObjectFactory* ObjectFactory::instance (void) { static ObjectFactory s_instance; @@ -72,8 +69,6 @@ return &s_instance; } -////////////////////////////////////////////////////////////////////////////// - void ObjectFactory::createObject (double handle) { gh_manager::auto_lock lock; @@ -151,6 +146,4 @@ handle); } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/ObjectFactory.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ObjectFactory.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class graphics_object; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Object; class ObjectFactory : public QObject @@ -51,10 +48,6 @@ { } }; -////////////////////////////////////////////////////////////////////////////// - }; -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ObjectProxy.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ObjectProxy.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -28,21 +29,15 @@ #include "Object.h" #include "ObjectProxy.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - ObjectProxy::ObjectProxy (Object* obj) : QObject (), m_object (0) { init (obj); } -////////////////////////////////////////////////////////////////////////////// - void ObjectProxy::init (Object* obj) { if (obj != m_object) @@ -71,16 +66,12 @@ } } -////////////////////////////////////////////////////////////////////////////// - void ObjectProxy::setObject (Object* obj) { emit sendFinalize (); init (obj); } -////////////////////////////////////////////////////////////////////////////// - void ObjectProxy::update (int pId) { if (octave_thread::is_octave_thread ()) @@ -89,21 +80,15 @@ m_object->slotUpdate (pId); } -////////////////////////////////////////////////////////////////////////////// - void ObjectProxy::finalize (void) { emit sendFinalize (); init (0); } -////////////////////////////////////////////////////////////////////////////// - void ObjectProxy::redraw (void) { emit sendRedraw (); } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/ObjectProxy.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ObjectProxy.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -24,13 +25,9 @@ #include <QObject> -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Object; class ObjectProxy : public QObject @@ -59,10 +56,6 @@ Object* m_object; }; -////////////////////////////////////////////////////////////////////////////// - }; -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Panel.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Panel.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -35,13 +36,9 @@ #include "Panel.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static int frameStyleFromProperties (const uipanel::properties& pp) { if (pp.bordertype_is ("none")) @@ -58,8 +55,6 @@ return (QFrame::Panel | QFrame::Plain); } -////////////////////////////////////////////////////////////////////////////// - static void setupPalette (const uipanel::properties& pp, QPalette& p) { p.setColor (QPalette::Window, @@ -72,8 +67,6 @@ Utils::fromRgb (pp.get_shadowcolor_rgb ())); } -////////////////////////////////////////////////////////////////////////////// - static int borderWidthFromProperties (const uipanel::properties& pp) { int bw = 0; @@ -88,8 +81,6 @@ return bw; } -////////////////////////////////////////////////////////////////////////////// - Panel* Panel::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -105,8 +96,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - Panel::Panel (const graphics_object& go, QFrame* frame) : Object (go, frame), m_container (0), m_title (0), m_blockUpdates (false) { @@ -145,14 +134,10 @@ frame->hide (); } -////////////////////////////////////////////////////////////////////////////// - Panel::~Panel (void) { } -////////////////////////////////////////////////////////////////////////////// - bool Panel::eventFilter (QObject* watched, QEvent* event) { if (! m_blockUpdates) @@ -223,8 +208,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - void Panel::update (int pId) { uipanel::properties& pp = properties<uipanel> (); @@ -320,8 +303,6 @@ m_blockUpdates = false; } -////////////////////////////////////////////////////////////////////////////// - void Panel::redraw (void) { Canvas* canvas = m_container->canvas (m_handle); @@ -330,8 +311,6 @@ canvas->redraw (); } -////////////////////////////////////////////////////////////////////////////// - void Panel::updateLayout (void) { uipanel::properties& pp = properties<uipanel> (); @@ -370,6 +349,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/Panel.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Panel.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ class QFrame; class QLabel; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Container; class Panel : public Object @@ -61,10 +58,6 @@ bool m_blockUpdates; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/PopupMenuControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/PopupMenuControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "PopupMenuControl.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - PopupMenuControl* PopupMenuControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -51,8 +48,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - PopupMenuControl::PopupMenuControl (const graphics_object& go, QComboBox *box) : BaseControl (go, box), m_blockUpdate (false) { @@ -64,14 +59,10 @@ SLOT (currentIndexChanged (int))); } -////////////////////////////////////////////////////////////////////////////// - PopupMenuControl::~PopupMenuControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void PopupMenuControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -125,8 +116,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void PopupMenuControl::currentIndexChanged (int index) { if (! m_blockUpdate) @@ -138,6 +127,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/PopupMenuControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/PopupMenuControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QComboBox; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class PopupMenuControl : public BaseControl { Q_OBJECT @@ -53,10 +50,6 @@ bool m_blockUpdate; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/PushButtonControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/PushButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -30,13 +31,9 @@ #include "Container.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - PushButtonControl* PushButtonControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -52,22 +49,16 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - PushButtonControl::PushButtonControl (const graphics_object& go, QPushButton* btn) : ButtonControl (go, btn) { btn->setAutoFillBackground (true); } -////////////////////////////////////////////////////////////////////////////// - PushButtonControl::~PushButtonControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void PushButtonControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -84,6 +75,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespave QtHandles
--- a/libgui/graphics/PushButtonControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/PushButtonControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QPushButton; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class PushButtonControl : public ButtonControl { public: @@ -45,10 +42,6 @@ void update (int pId); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/PushTool.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/PushTool.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ #include "ToolBarButton.cc" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - PushTool* PushTool::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -49,22 +46,16 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - PushTool::PushTool (const graphics_object& go, QAction* action) : ToolBarButton<uipushtool> (go, action) { connect (action, SIGNAL (triggered (bool)), this, SLOT (clicked (void))); } -////////////////////////////////////////////////////////////////////////////// - PushTool::~PushTool (void) { } -////////////////////////////////////////////////////////////////////////////// - void PushTool::update (int pId) { switch (pId) @@ -75,13 +66,9 @@ } } -////////////////////////////////////////////////////////////////////////////// - void PushTool::clicked (void) { gh_manager::post_callback (m_handle, "clickedcallback"); } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/PushTool.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/PushTool.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -24,13 +25,9 @@ #include "ToolBarButton.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class PushTool : public ToolBarButton<uipushtool> { Q_OBJECT @@ -48,10 +45,6 @@ void clicked (void); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/RadioButtonControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/RadioButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "Container.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - RadioButtonControl* RadioButtonControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -51,8 +48,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - RadioButtonControl::RadioButtonControl (const graphics_object& go, QRadioButton* radio) : ButtonControl (go, radio) @@ -61,12 +56,8 @@ radio->setAutoExclusive (false); } -////////////////////////////////////////////////////////////////////////////// - RadioButtonControl::~RadioButtonControl (void) { } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/RadioButtonControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/RadioButtonControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QRadioButton; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class RadioButtonControl : public ButtonControl { public: @@ -42,10 +39,6 @@ static RadioButtonControl* create (const graphics_object& go); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/SliderControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/SliderControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -31,13 +32,9 @@ #define RANGE_INT_MAX 1000000 -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - SliderControl* SliderControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -53,8 +50,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - SliderControl::SliderControl (const graphics_object& go, QAbstractSlider* slider) : BaseControl (go, slider), m_blockUpdates (false) @@ -81,14 +76,10 @@ connect (slider, SIGNAL (valueChanged (int)), SLOT (valueChanged (int))); } -////////////////////////////////////////////////////////////////////////////// - SliderControl::~SliderControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void SliderControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -126,8 +117,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void SliderControl::valueChanged (int ival) { if (! m_blockUpdates) @@ -158,6 +147,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/SliderControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/SliderControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QAbstractSlider; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class SliderControl : public BaseControl { Q_OBJECT @@ -53,10 +50,6 @@ bool m_blockUpdates; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/TextControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/TextControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "TextControl.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - TextControl* TextControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -51,8 +48,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - TextControl::TextControl (const graphics_object& go, QLabel* label) : BaseControl (go, label) { @@ -67,14 +62,10 @@ label->setText (Utils::fromStdString (up.get_string_string ())); } -////////////////////////////////////////////////////////////////////////////// - TextControl::~TextControl (void) { } -////////////////////////////////////////////////////////////////////////////// - void TextControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); @@ -97,6 +88,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/TextControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/TextControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QLabel; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class TextControl : public BaseControl { public: @@ -45,10 +42,6 @@ void update (int pId); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/TextEdit.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/TextEdit.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ #include "TextEdit.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - void TextEdit::focusOutEvent (QFocusEvent* event) { QTextEdit::focusOutEvent (event); @@ -41,8 +38,6 @@ emit editingFinished (); } -////////////////////////////////////////////////////////////////////////////// - void TextEdit::keyPressEvent (QKeyEvent* event) { QTextEdit::keyPressEvent (event); @@ -53,6 +48,4 @@ emit editingFinished (); } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/TextEdit.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/TextEdit.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -24,13 +25,9 @@ #include <QTextEdit> -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class TextEdit : public QTextEdit { Q_OBJECT @@ -47,10 +44,6 @@ void keyPressEvent (QKeyEvent* event); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ToggleButtonControl.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToggleButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "Container.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - ToggleButtonControl* ToggleButtonControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -51,8 +48,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - ToggleButtonControl::ToggleButtonControl (const graphics_object& go, QPushButton* btn) : ButtonControl (go, btn) @@ -61,12 +56,8 @@ btn->setAutoFillBackground (true); } -////////////////////////////////////////////////////////////////////////////// - ToggleButtonControl::~ToggleButtonControl (void) { } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/ToggleButtonControl.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToggleButtonControl.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QPushButton; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class ToggleButtonControl : public ButtonControl { public: @@ -42,10 +39,6 @@ static ToggleButtonControl* create (const graphics_object& go); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ToggleTool.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToggleTool.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ #include "ToolBarButton.cc" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - ToggleTool* ToggleTool::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -49,8 +46,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - ToggleTool::ToggleTool (const graphics_object& go, QAction* action) : ToolBarButton<uitoggletool> (go, action) { @@ -63,14 +58,10 @@ this, SLOT (triggered (bool))); } -////////////////////////////////////////////////////////////////////////////// - ToggleTool::~ToggleTool (void) { } -////////////////////////////////////////////////////////////////////////////// - void ToggleTool::update (int pId) { uitoggletool::properties& tp = properties<uitoggletool> (); @@ -87,8 +78,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - void ToggleTool::triggered (bool checked) { gh_manager::post_set (m_handle, "state", checked, false); @@ -99,6 +88,4 @@ gh_manager::post_callback (m_handle, "clickedcallback"); } -////////////////////////////////////////////////////////////////////////////// - };
--- a/libgui/graphics/ToggleTool.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToggleTool.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -24,13 +25,9 @@ #include "ToolBarButton.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class ToggleTool : public ToolBarButton<uitoggletool> { Q_OBJECT @@ -48,10 +45,6 @@ void triggered (bool checked); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ToolBar.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToolBar.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -37,13 +38,9 @@ #include "ToolBar.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static QAction* addEmptyAction (QToolBar* bar) { static QIcon _empty; @@ -65,8 +62,6 @@ return a; } -////////////////////////////////////////////////////////////////////////////// - ToolBar* ToolBar::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -82,8 +77,6 @@ return 0; } -////////////////////////////////////////////////////////////////////////////// - ToolBar::ToolBar (const graphics_object& go, QToolBar* bar) : Object (go, bar), m_empty (0), m_figure (0) { @@ -104,14 +97,10 @@ bar->installEventFilter (this); } -////////////////////////////////////////////////////////////////////////////// - ToolBar::~ToolBar (void) { } -////////////////////////////////////////////////////////////////////////////// - void ToolBar::update (int pId) { uitoolbar::properties& tp = properties<uitoolbar> (); @@ -129,8 +118,6 @@ } } -////////////////////////////////////////////////////////////////////////////// - bool ToolBar::eventFilter (QObject* watched, QEvent* event) { if (watched == qObject ()) @@ -166,15 +153,11 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - void ToolBar::hideEmpty (void) { m_empty->setVisible (false); } -////////////////////////////////////////////////////////////////////////////// - void ToolBar::beingDeleted (void) { if (m_figure) @@ -186,6 +169,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/ToolBar.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToolBar.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -27,13 +28,9 @@ class QAction; class QToolBar; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Figure; class ToolBar : public Object @@ -62,10 +59,6 @@ Figure* m_figure; }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/ToolBarButton.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToolBarButton.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -29,13 +30,9 @@ #include "ToolBarButton.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - template <class T> ToolBarButton<T>::ToolBarButton (const graphics_object& go, QAction* action) : Object (go, action), m_separator (0) @@ -61,15 +58,11 @@ w->insertAction (action, m_separator); } -////////////////////////////////////////////////////////////////////////////// - template <class T> ToolBarButton<T>::~ToolBarButton (void) { } -////////////////////////////////////////////////////////////////////////////// - template <class T> void ToolBarButton<T>::update (int pId) { @@ -123,6 +116,4 @@ } } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/ToolBarButton.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/ToolBarButton.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -26,13 +27,9 @@ class QAction; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - class Container; template <class T> @@ -51,10 +48,6 @@ QAction* m_separator; }; -////////////////////////////////////////////////////////////////////////////// - }; -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/Utils.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Utils.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -38,32 +39,22 @@ #include "Object.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - namespace Utils { -////////////////////////////////////////////////////////////////////////////// - QString fromStdString (const std::string& s) { return QString::fromLocal8Bit (s.c_str ()); } -////////////////////////////////////////////////////////////////////////////// - std::string toStdString (const QString& s) { return std::string (s.toLocal8Bit ().data ()); } -////////////////////////////////////////////////////////////////////////////// - QStringList fromStringVector (const string_vector& v) { QStringList l; @@ -75,8 +66,6 @@ return l; } -////////////////////////////////////////////////////////////////////////////// - string_vector toStringVector (const QStringList& l) { string_vector v (l.length ()); @@ -88,8 +77,6 @@ return v; } -////////////////////////////////////////////////////////////////////////////// - template <class T> QFont computeFont (const typename T::properties& props, int height) { @@ -125,8 +112,6 @@ template QFont computeFont<uipanel> (const uipanel::properties& props, int height); -////////////////////////////////////////////////////////////////////////////// - QColor fromRgb (const Matrix& rgb) { QColor c; @@ -137,8 +122,6 @@ return c; } -////////////////////////////////////////////////////////////////////////////// - Matrix toRgb (const QColor& c) { Matrix rgb (1, 3); @@ -149,8 +132,6 @@ return rgb; } -////////////////////////////////////////////////////////////////////////////// - std::string figureSelectionType (QMouseEvent* event, bool isDoubleClick) { if (isDoubleClick) @@ -186,8 +167,6 @@ return std::string ("normal"); } -////////////////////////////////////////////////////////////////////////////// - Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent* event) { Object* tkFig = Backend::toolkitObject (fig); @@ -209,8 +188,6 @@ return Matrix (1, 2, 0.0); } -////////////////////////////////////////////////////////////////////////////// - Qt::Alignment fromHVAlign (const caseless_str& halign, const caseless_str& valign) { @@ -237,8 +214,6 @@ return flags; } -////////////////////////////////////////////////////////////////////////////// - QImage makeImageFromCData (const octave_value& v, int width, int height) { dim_vector dv (v.dims ()); @@ -314,8 +289,6 @@ return QImage (); } -////////////////////////////////////////////////////////////////////////////// - octave_scalar_map makeKeyEventStruct (QKeyEvent* event) { octave_scalar_map retval; @@ -346,10 +319,6 @@ return retval; } -////////////////////////////////////////////////////////////////////////////// - }; // namespace Utils -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles
--- a/libgui/graphics/Utils.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/Utils.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -35,13 +36,9 @@ class QKeyEvent; class QMouseEvent; -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - namespace Utils { QString fromStdString (const std::string& s); @@ -80,10 +77,6 @@ octave_scalar_map makeKeyEventStruct (QKeyEvent* event); }; -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/__init_qt__.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/__init_qt__.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ @@ -37,17 +38,11 @@ #include "Backend.h" #include "Utils.h" -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - static bool qtHandlesInitialized = false; -////////////////////////////////////////////////////////////////////////////// - bool __init__ (void) { if (! qtHandlesInitialized) @@ -97,8 +92,6 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - bool __shutdown__ (void) { if (qtHandlesInitialized) @@ -117,12 +110,8 @@ return false; } -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles -////////////////////////////////////////////////////////////////////////////// - DEFUN (__init_qt__, , , "") { QtHandles::__init__ (); @@ -130,8 +119,6 @@ return octave_value (); } -////////////////////////////////////////////////////////////////////////////// - DEFUN (__shutdown_qt__, , , "") { QtHandles::__shutdown__ (); @@ -151,8 +138,6 @@ #if 0 -////////////////////////////////////////////////////////////////////////////// - static QStringList makeFilterSpecs (const Cell& filters) { using namespace QtHandles::Utils; @@ -183,8 +168,6 @@ return filterSpecs; } -////////////////////////////////////////////////////////////////////////////// - static QString appendDirSep (const QString& d) { if (! d.endsWith ("/") && ! d.endsWith (QDir::separator ())) @@ -192,8 +175,6 @@ return d; } -////////////////////////////////////////////////////////////////////////////// - DEFUN (__uigetfile_qt__, args, , "") { using namespace QtHandles::Utils; @@ -276,8 +257,6 @@ return retval; } -////////////////////////////////////////////////////////////////////////////// - DEFUN (__uiputfile_qt__, args, , "") { using namespace QtHandles::Utils; @@ -328,8 +307,6 @@ return retval; } -////////////////////////////////////////////////////////////////////////////// - DEFUN (__uigetdir_qt__, args, , "") { using namespace QtHandles::Utils;
--- a/libgui/graphics/__init_qt__.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/__init_qt__.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,42 +1,35 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */ #ifndef __QtHandles_init_qt__ #define __QtHandles_init_qt__ 1 -////////////////////////////////////////////////////////////////////////////// - namespace QtHandles { -////////////////////////////////////////////////////////////////////////////// - bool __init__ (void); -////////////////////////////////////////////////////////////////////////////// - }; // namespace QtHandles extern void install___init_qt___functions (void); -////////////////////////////////////////////////////////////////////////////// - #endif
--- a/libgui/graphics/gl-select.cc Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/gl-select.cc Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */
--- a/libgui/graphics/gl-select.h Thu Feb 20 14:27:48 2014 -0500 +++ b/libgui/graphics/gl-select.h Thu Feb 20 14:08:53 2014 -0800 @@ -1,21 +1,22 @@ /* -Copyright (C) 2011 Michael Goffioul. +Copyright (C) 2011-2014 Michael Goffioul -This file is part of QtHandles. +This file is part of Octave. -Foobar is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. -QtHandles is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with Foobar. If not, see <http://www.gnu.org/licenses/>. +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. */