StelMainGraphicsView.cpp   StelMainGraphicsView.cpp 
skipping to change at line 145 skipping to change at line 145
} }
//! Delete openGL textures (to call before the GLContext disappears) //! Delete openGL textures (to call before the GLContext disappears)
void StelMainGraphicsView::deinitGL() void StelMainGraphicsView::deinitGL()
{ {
// Can be called only once // Can be called only once
if (wasDeinit==true) if (wasDeinit==true)
return; return;
wasDeinit = true; wasDeinit = true;
StelApp::getInstance().getModuleMgr().unloadAllPlugins(); StelApp::getInstance().getModuleMgr().unloadAllPlugins();
QCoreApplication::processEvents();
StelApp::getInstance().getModuleMgr().unloadModule("StelGui"); StelApp::getInstance().getModuleMgr().unloadModule("StelGui");
QCoreApplication::processEvents(); QCoreApplication::processEvents();
StelApp* stelApp = &StelApp::getInstance(); StelApp* stelApp = &StelApp::getInstance();
delete stelApp; delete stelApp;
} }
void StelMainGraphicsView::saveScreenShot(const QString& filePrefix, const QString& saveDir) void StelMainGraphicsView::saveScreenShot(const QString& filePrefix, const QString& saveDir)
{ {
screenShotPrefix = filePrefix; screenShotPrefix = filePrefix;
screenShotDir = saveDir; screenShotDir = saveDir;
skipping to change at line 206 skipping to change at line 207
im.save(shotPath); im.save(shotPath);
if (!StelApp::getInstance().getFileMgr().exists(shotPath)) if (!StelApp::getInstance().getFileMgr().exists(shotPath))
return; return;
else else
return; return;
} }
// Add a new progress bar in the lower right corner of the screen. // Add a new progress bar in the lower right corner of the screen.
class QProgressBar* StelMainGraphicsView::addProgressBar() class QProgressBar* StelMainGraphicsView::addProgressBar()
{ {
StelGui* gui = (StelGui*)GETSTELMODULE("StelGui"); StelGui* gui = GETSTELMODULE(StelGui);
return gui->addProgressBar(); return gui->addProgressBar();
} }
//! Activate all the QActions associated to the widget //! Activate all the QActions associated to the widget
void StelMainGraphicsView::activateKeyActions(bool b) void StelMainGraphicsView::activateKeyActions(bool b)
{ {
QList<QAction*> globalActions = findChildren<QAction*>(QRegExp("acti on.*_Global")); QList<QAction*> globalActions = findChildren<QAction*>(QRegExp("acti on.*_Global"));
if (b==false) if (b==false)
{ {
foreach (QAction* a, actions()) foreach (QAction* a, actions())
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 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/