MeteorShowersMgr.cpp   MeteorShowersMgr.cpp 
skipping to change at line 40 skipping to change at line 40
#include "StelActionMgr.hpp" #include "StelActionMgr.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelProgressController.hpp" #include "StelProgressController.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "SporadicMeteorMgr.hpp" #include "SporadicMeteorMgr.hpp"
MeteorShowersMgr::MeteorShowersMgr() MeteorShowersMgr::MeteorShowersMgr()
: m_meteorShowers(NULL) : m_meteorShowers(Q_NULLPTR)
, m_configDialog(NULL) , m_configDialog(Q_NULLPTR)
, m_searchDialog(NULL) , m_searchDialog(Q_NULLPTR)
, m_conf(StelApp::getInstance().getSettings()) , m_conf(StelApp::getInstance().getSettings())
, m_onEarth(false) , m_onEarth(false)
, m_enablePlugin(false) , m_enablePlugin(false)
, m_activeRadiantOnly(false) , m_activeRadiantOnly(false)
, m_enableAtStartup(true) , m_enableAtStartup(true)
, m_enableLabels(true) , m_enableLabels(true)
, m_enableMarker(true) , m_enableMarker(true)
, m_showEnableButton(true) , m_showEnableButton(true)
, m_showSearchButton(true) , m_showSearchButton(true)
, m_messageTimer(NULL) , m_messageTimer(Q_NULLPTR)
, m_isUpdating(false) , m_isUpdating(false)
, m_enableAutoUpdates(true) , m_enableAutoUpdates(true)
, m_updateFrequencyHours(0) , m_updateFrequencyHours(0)
, m_statusOfLastUpdate(OUTDATED) , m_statusOfLastUpdate(OUTDATED)
, m_downloadMgr(NULL) , m_downloadMgr(Q_NULLPTR)
, m_progressBar(NULL) , m_progressBar(Q_NULLPTR)
{ {
setObjectName("MeteorShowers"); setObjectName("MeteorShowers");
} }
MeteorShowersMgr::~MeteorShowersMgr() MeteorShowersMgr::~MeteorShowersMgr()
{ {
delete m_configDialog; delete m_configDialog;
delete m_searchDialog; delete m_searchDialog;
delete m_downloadMgr; delete m_downloadMgr;
} }
skipping to change at line 127 skipping to change at line 127
// enable at startup? // enable at startup?
setEnablePlugin(getEnableAtStartup()); setEnablePlugin(getEnableAtStartup());
} }
void MeteorShowersMgr::deinit() void MeteorShowersMgr::deinit()
{ {
m_bolideTexture.clear(); m_bolideTexture.clear();
m_radiantTexture.clear(); m_radiantTexture.clear();
m_pointerTexture.clear(); m_pointerTexture.clear();
delete m_meteorShowers; delete m_meteorShowers;
m_meteorShowers = NULL; m_meteorShowers = Q_NULLPTR;
delete m_configDialog; delete m_configDialog;
m_configDialog = NULL; m_configDialog = Q_NULLPTR;
delete m_searchDialog; delete m_searchDialog;
m_searchDialog = NULL; m_searchDialog = Q_NULLPTR;
} }
double MeteorShowersMgr::getCallOrder(StelModuleActionName actionName) cons t double MeteorShowersMgr::getCallOrder(StelModuleActionName actionName) cons t
{ {
if (actionName == StelModule::ActionDraw) if (actionName == StelModule::ActionDraw)
{ {
return GETSTELMODULE(SporadicMeteorMgr)->getCallOrder(action Name) + 10.; return GETSTELMODULE(SporadicMeteorMgr)->getCallOrder(action Name) + 10.;
} }
return 0.; return 0.;
} }
skipping to change at line 331 skipping to change at line 331
request.setRawHeader("User-Agent", QString("Mozilla/5.0 (Stellarium Meteor Showers Plugin %1; http://stellarium.org/)").arg(METEORSHOWERS_PLUGI N_VERSION).toUtf8()); request.setRawHeader("User-Agent", QString("Mozilla/5.0 (Stellarium Meteor Showers Plugin %1; http://stellarium.org/)").arg(METEORSHOWERS_PLUGI N_VERSION).toUtf8());
m_downloadMgr->get(request); m_downloadMgr->get(request);
} }
void MeteorShowersMgr::updateFinished(QNetworkReply* reply) void MeteorShowersMgr::updateFinished(QNetworkReply* reply)
{ {
if (m_progressBar) if (m_progressBar)
{ {
m_progressBar->setValue(100); m_progressBar->setValue(100);
StelApp::getInstance().removeProgressBar(m_progressBar); StelApp::getInstance().removeProgressBar(m_progressBar);
m_progressBar = NULL; m_progressBar = Q_NULLPTR;
} }
if (reply->error() != QNetworkReply::NoError) if (reply->error() != QNetworkReply::NoError)
{ {
qWarning() << "MeteorShowersMgr: Failed to download!" << rep ly->url(); qWarning() << "MeteorShowersMgr: Failed to download!" << rep ly->url();
qWarning() << "MeteorShowersMgr: Error " << reply->errorStri ng(); qWarning() << "MeteorShowersMgr: Error " << reply->errorStri ng();
setStatusOfLastUpdate(FAILED); setStatusOfLastUpdate(FAILED);
return; return;
} }
skipping to change at line 395 skipping to change at line 395
try try
{ {
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui()); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui());
if (!gui) if (!gui)
{ {
return; return;
} }
if (show) if (show)
{ {
StelButton* enablePlugin = new StelButton(NULL, StelButton* enablePlugin = new StelButton(Q_NULLPTR,
QPixmap(": /MeteorShowers/btMS-on.png"), QPixmap(": /MeteorShowers/btMS-on.png"),
QPixmap(": /MeteorShowers/btMS-off.png"), QPixmap(": /MeteorShowers/btMS-off.png"),
QPixmap(": /graphicGui/glow32x32.png"), QPixmap(": /graphicGui/glow32x32.png"),
"actionSho w_MeteorShowers"); "actionSho w_MeteorShowers");
gui->getButtonBar()->addButton(enablePlugin, "065-pl uginsGroup"); gui->getButtonBar()->addButton(enablePlugin, "065-pl uginsGroup");
} }
else else
{ {
gui->getButtonBar()->hideButton("actionShow_MeteorSh owers"); gui->getButtonBar()->hideButton("actionShow_MeteorSh owers");
} }
skipping to change at line 428 skipping to change at line 428
try try
{ {
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui()); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui());
if (!gui) if (!gui)
{ {
return; return;
} }
if (show) if (show)
{ {
StelButton* searchMS = new StelButton(NULL, StelButton* searchMS = new StelButton(Q_NULLPTR,
QPixmap(":/Met eorShowers/btMS-search-on.png"), QPixmap(":/Met eorShowers/btMS-search-on.png"),
QPixmap(":/Met eorShowers/btMS-search-off.png"), QPixmap(":/Met eorShowers/btMS-search-off.png"),
QPixmap(":/gra phicGui/glow32x32.png"), QPixmap(":/gra phicGui/glow32x32.png"),
"actionShow_Me teorShowers_search_dialog"); "actionShow_Me teorShowers_search_dialog");
gui->getButtonBar()->addButton(searchMS, "065-plugin sGroup"); gui->getButtonBar()->addButton(searchMS, "065-plugin sGroup");
} }
else else
{ {
gui->getButtonBar()->hideButton("actionShow_MeteorSh owers_search_dialog"); gui->getButtonBar()->hideButton("actionShow_MeteorSh owers_search_dialog");
} }
 End of changes. 9 change blocks. 
12 lines changed or deleted 12 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/