OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 48 skipping to change at line 48
#include <QStandardItemModel> #include <QStandardItemModel>
#include <limits> #include <limits>
OcularDialog::OcularDialog(Oculars* pluginPtr, OcularDialog::OcularDialog(Oculars* pluginPtr,
QList<CCD *>* ccds, QList<CCD *>* ccds,
QList<Ocular *>* oculars, QList<Ocular *>* oculars,
QList<Telescope *>* telescopes, QList<Telescope *>* telescopes,
QList<Lens *> *lense) QList<Lens *> *lense)
: StelDialog("Oculars") : StelDialog("Oculars")
, plugin(pluginPtr) , plugin(pluginPtr)
, ccdMapper(NULL) , ccdMapper(Q_NULLPTR)
, ocularMapper(NULL) , ocularMapper(Q_NULLPTR)
, telescopeMapper(NULL) , telescopeMapper(Q_NULLPTR)
, lensMapper(NULL) , lensMapper(Q_NULLPTR)
{ {
ui = new Ui_ocularDialogForm; ui = new Ui_ocularDialogForm;
this->ccds = ccds; this->ccds = ccds;
ccdTableModel = new PropertyBasedTableModel(this); ccdTableModel = new PropertyBasedTableModel(this);
CCD* ccdModel = CCD::ccdModel(); CCD* ccdModel = CCD::ccdModel();
ccdTableModel->init(reinterpret_cast<QList<QObject *>* >(ccds), ccdTableModel->init(reinterpret_cast<QList<QObject *>* >(ccds),
ccdModel, ccdModel,
ccdModel->propertyMap()); ccdModel->propertyMap());
this->oculars = oculars; this->oculars = oculars;
ocularTableModel = new PropertyBasedTableModel(this); ocularTableModel = new PropertyBasedTableModel(this);
skipping to change at line 92 skipping to change at line 92
} }
OcularDialog::~OcularDialog() OcularDialog::~OcularDialog()
{ {
ocularTableModel->disconnect(); ocularTableModel->disconnect();
telescopeTableModel->disconnect(); telescopeTableModel->disconnect();
ccdTableModel->disconnect(); ccdTableModel->disconnect();
lensTableModel->disconnect(); lensTableModel->disconnect();
delete ui; delete ui;
ui = NULL; ui = Q_NULLPTR;
} }
/* ********************************************************************* */ /* ********************************************************************* */
#if 0 #if 0
#pragma mark - #pragma mark -
#pragma mark StelModule Methods #pragma mark StelModule Methods
#endif #endif
/* ********************************************************************* */ /* ********************************************************************* */
void OcularDialog::retranslate() void OcularDialog::retranslate()
{ {
 End of changes. 2 change blocks. 
5 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/