ToastMgr.cpp   ToastMgr.cpp 
skipping to change at line 34 skipping to change at line 34
#include "StelFader.hpp" #include "StelFader.hpp"
#include "StelPainter.hpp" #include "StelPainter.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelSkyLayerMgr.hpp" #include "StelSkyLayerMgr.hpp"
#include <QSettings> #include <QSettings>
ToastMgr::ToastMgr() : survey(NULL) ToastMgr::ToastMgr() : survey(Q_NULLPTR)
{ {
setObjectName("ToastMgr"); setObjectName("ToastMgr");
fader = new LinearFader(); fader = new LinearFader();
} }
ToastMgr::~ToastMgr() ToastMgr::~ToastMgr()
{ {
delete fader; delete fader;
fader = NULL; fader = Q_NULLPTR;
} }
void ToastMgr::init() void ToastMgr::init()
{ {
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
Q_ASSERT(conf); Q_ASSERT(conf);
QString toastHost = conf->value("astro/toast_survey_host", "http://d ss.stellarium.org").toString(); QString toastHost = conf->value("astro/toast_survey_host", "http://d ss.stellarium.org").toString();
QString toastDir = conf->value("astro/toast_survey_directory", "surv ey").toString(); QString toastDir = conf->value("astro/toast_survey_directory", "surv ey").toString();
int toastLevel = conf->value("astro/toast_survey_levels", 11).toInt( ); int toastLevel = conf->value("astro/toast_survey_levels", 11).toInt( );
skipping to change at line 66 skipping to change at line 66
// Hide deep-sky survey by default // Hide deep-sky survey by default
setFlagSurveyShow(conf->value("astro/flag_toast_survey", false).toBo ol()); setFlagSurveyShow(conf->value("astro/flag_toast_survey", false).toBo ol());
addAction("actionShow_Toast_Survey", N_("Display Options"), N_("Digi tized Sky Survey (experimental)"), "surveyDisplayed", "Ctrl+Alt+D"); addAction("actionShow_Toast_Survey", N_("Display Options"), N_("Digi tized Sky Survey (experimental)"), "surveyDisplayed", "Ctrl+Alt+D");
} }
void ToastMgr::deinit() void ToastMgr::deinit()
{ {
delete survey; delete survey;
survey = NULL; survey = Q_NULLPTR;
} }
void ToastMgr::draw(StelCore* core) void ToastMgr::draw(StelCore* core)
{ {
if (!getFlagSurveyShow()) if (!getFlagSurveyShow())
return; return;
StelPainter sPainter(core->getProjection(StelCore::FrameJ2000)); StelPainter sPainter(core->getProjection(StelCore::FrameJ2000));
survey->draw(&sPainter); survey->draw(&sPainter);
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 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/