StelMainGraphicsView.hpp   StelMainGraphicsView.hpp 
skipping to change at line 36 skipping to change at line 36
class QGLWidget; class QGLWidget;
class QResizeEvent; class QResizeEvent;
class StelGuiBase; class StelGuiBase;
class StelMainScriptAPIProxy; class StelMainScriptAPIProxy;
class StelScriptMgr; class StelScriptMgr;
class StelQGLWidget; class StelQGLWidget;
//! @class StelMainGraphicsView //! @class StelMainGraphicsView
//! Reimplement a QGraphicsView for Stellarium. //! Reimplement a QGraphicsView for Stellarium.
//! It is the class creating the singleton GL Widget, the main StelApp inst ance as well as the main GUI. //! It is the class creating the main StelApp instance as well as the main GUI.
class StelMainGraphicsView : public QGraphicsView class StelMainGraphicsView : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
StelMainGraphicsView(QWidget* parent); StelMainGraphicsView(QWidget* parent);
virtual ~StelMainGraphicsView(); virtual ~StelMainGraphicsView();
//! Start the main initialization of Stellarium //! Start the main initialization of Stellarium
void init(class QSettings* conf); void init(class QSettings* conf);
//! Get the StelMainGraphicsView singleton instance. //! Get the StelMainGraphicsView singleton instance.
static StelMainGraphicsView& getInstance() {Q_ASSERT(singleton); ret urn *singleton;} static StelMainGraphicsView& getInstance() {Q_ASSERT(singleton); ret urn *singleton;}
//! Delete openGL textures (to call before the GLContext disappears) //! Delete textures (to call before the renderer disappears)
void deinitGL(); void deinit();
//! Return the QGraphicsWidget encapsulating the Stellarium main sky view. //! Return the QGraphicsWidget encapsulating the Stellarium main sky view.
//! Use its layout if you want to add widget on the top of the main sky view. //! Use its layout if you want to add widget on the top of the main sky view.
class StelAppGraphicsWidget* getStelAppGraphicsWidget() {return main SkyItem;} class StelAppGraphicsWidget* getStelAppGraphicsWidget() {return main SkyItem;}
//! Return the top level QGraphicsWidget which contains the layout c ontaining the Stellarium main sky view. //! Return the top level QGraphicsWidget which contains the layout c ontaining the Stellarium main sky view.
//! Use its layout if you want to add widget on the side of the main sky view. //! Use its layout if you want to add widget on the side of the main sky view.
QGraphicsWidget* getTopLevelGraphicsWidget() {return backItem;} QGraphicsWidget* getTopLevelGraphicsWidget() {return backItem;}
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
skipping to change at line 153 skipping to change at line 153
private: private:
//! Start the display loop //! Start the display loop
void startMainLoop(); void startMainLoop();
//! The StelMainGraphicsView singleton //! The StelMainGraphicsView singleton
static StelMainGraphicsView* singleton; static StelMainGraphicsView* singleton;
QGraphicsWidget* backItem; QGraphicsWidget* backItem;
class StelAppGraphicsWidget* mainSkyItem; class StelAppGraphicsWidget* mainSkyItem;
//! The openGL window //! Handles all rendering (e.g. GL) functionality.
StelQGLWidget* glWidget; class StelRenderer* renderer;
class QGLContext* glContext;
StelGuiBase* gui; StelGuiBase* gui;
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
// The script API proxy object (for bridging threads) // The script API proxy object (for bridging threads)
StelMainScriptAPIProxy* scriptAPIProxy; StelMainScriptAPIProxy* scriptAPIProxy;
// The script manager based on Qt script engine // The script manager based on Qt script engine
StelScriptMgr* scriptMgr; StelScriptMgr* scriptMgr;
#endif #endif
 End of changes. 3 change blocks. 
6 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/