From 0875b19ab814e27338a3eabc2a64022248cd9e4e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 16 May 2011 08:59:10 +0000 Subject: [PATCH] Fixed traling spaces --- include/osgQt/GraphicsWindowQt | 30 +++++++++++++++--------------- src/osgQt/GraphicsWindowQt.cpp | 14 +++++++------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/osgQt/GraphicsWindowQt b/include/osgQt/GraphicsWindowQt index fe67b17eb..f739cea32 100644 --- a/include/osgQt/GraphicsWindowQt +++ b/include/osgQt/GraphicsWindowQt @@ -1,13 +1,13 @@ /* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Wang Rui * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -29,11 +29,11 @@ class OSGQT_EXPORT GraphWidget : public QGLWidget { public: GraphWidget( const QGLFormat& format, QWidget* parent=0, const QGLWidget* shareWidget=0, Qt::WindowFlags f=0 ); - + inline void setGraphicsWindow( osgViewer::GraphicsWindow* gw ) { _gw = gw; } - + void setKeyboardModifiers( QInputEvent* event ); - + virtual void resizeEvent( QResizeEvent* event ); virtual void keyPressEvent( QKeyEvent* event ); virtual void keyReleaseEvent( QKeyEvent* event ); @@ -42,7 +42,7 @@ public: virtual void mouseDoubleClickEvent( QMouseEvent* event ); virtual void mouseMoveEvent( QMouseEvent* event ); virtual void wheelEvent( QWheelEvent* event ); - + protected: osgViewer::GraphicsWindow* _gw; }; @@ -52,18 +52,18 @@ class OSGQT_EXPORT GraphicsWindowQt : public osgViewer::GraphicsWindow public: GraphicsWindowQt( osg::GraphicsContext::Traits* traits ); virtual ~GraphicsWindowQt(); - + inline GraphWidget* getGraphWidget() { return _widget; } inline const GraphWidget* getGraphWidget() const { return _widget; } - + struct WindowData : public osg::Referenced { WindowData( GraphWidget* widget ): _widget(widget) {} GraphWidget* _widget; }; - + bool init(); - + virtual bool setWindowRectangleImplementation( int x, int y, int width, int height ); virtual void getWindowRectangle( int& x, int& y, int& width, int& height ); virtual bool setWindowDecorationImplementation( bool windowDecoration ); @@ -75,7 +75,7 @@ public: virtual std::string getWindowName(); virtual void useCursor( bool cursorOn ); virtual void setCursor( MouseCursor cursor ); - + virtual bool valid() const; virtual bool realizeImplementation(); virtual bool isRealizedImplementation() const; @@ -83,9 +83,9 @@ public: virtual bool makeCurrentImplementation(); virtual bool releaseContextImplementation(); virtual void swapBuffersImplementation(); - + virtual void requestWarpPointer( float x, float y ); - + protected: GraphWidget* _widget; QCursor _currentCursor; diff --git a/src/osgQt/GraphicsWindowQt.cpp b/src/osgQt/GraphicsWindowQt.cpp index 7f5f2b589..10f8026c3 100644 --- a/src/osgQt/GraphicsWindowQt.cpp +++ b/src/osgQt/GraphicsWindowQt.cpp @@ -21,7 +21,7 @@ class QtKeyboardMap public: QtKeyboardMap() - { + { mKeyMap[Qt::Key_Escape ] = osgGA::GUIEventAdapter::KEY_Escape; mKeyMap[Qt::Key_Delete ] = osgGA::GUIEventAdapter::KEY_Delete; mKeyMap[Qt::Key_Home ] = osgGA::GUIEventAdapter::KEY_Home; @@ -250,26 +250,26 @@ bool GraphicsWindowQt::init() format.setDoubleBuffer( _traits->doubleBuffer ); format.setSwapInterval( _traits->vsync ? 1 : 0 ); format.setStereo( _traits->quadBufferStereo ? 1 : 0 ); - + WindowData* windowData = _traits.get() ? dynamic_cast(_traits->inheritedWindowData.get()) : 0; _widget = windowData ? windowData->_widget : 0; if ( !_widget ) { GraphicsWindowQt* sharedContextQt = dynamic_cast(_traits->sharedContext); QGLWidget* shareWidget = sharedContextQt ? sharedContextQt->getGraphWidget() : 0; - + Qt::WindowFlags flags = Qt::Window|Qt::CustomizeWindowHint;//|Qt::WindowStaysOnTopHint; if ( _traits->windowDecoration ) flags |= Qt::WindowTitleHint|Qt::WindowMinMaxButtonsHint|Qt::WindowSystemMenuHint; - + _widget = new GraphWidget( format, 0, shareWidget, flags ); } - + _widget->setWindowTitle( _traits->windowName.c_str() ); _widget->move( _traits->x, _traits->y ); if ( !_traits->supportsResize ) _widget->setFixedSize( _traits->width, _traits->height ); else _widget->resize( _traits->width, _traits->height ); - + _widget->setFocusPolicy( Qt::WheelFocus ); _widget->setGraphicsWindow( this ); useCursor( _traits->useCursor ); @@ -300,7 +300,7 @@ bool GraphicsWindowQt::setWindowDecorationImplementation( bool windowDecoration if ( windowDecoration ) flags |= Qt::WindowTitleHint|Qt::WindowMinMaxButtonsHint|Qt::WindowSystemMenuHint; _traits->windowDecoration = windowDecoration; - + // FIXME: Calling setWindowFlags or reparent widget will recreate the window handle, // which makes QGLContext no longer work...How to deal with that? //if ( _widget ) _widget->setWindowFlags( flags );