Changed: #1193 Code cleanup.

This commit is contained in:
dnk-88 2011-02-10 16:44:31 +02:00
parent ed4f0cca43
commit 15a429a0e4
27 changed files with 105 additions and 88 deletions

View file

@ -46,7 +46,6 @@ public:
private Q_SLOTS: private Q_SLOTS:
void setDegradationExponent(int value); void setDegradationExponent(int value);
void setSkipParticles(bool state); void setSkipParticles(bool state);
void setDistRatio(float value); void setDistRatio(float value);
void setMaxDistLODBias(float value); void setMaxDistLODBias(float value);

View file

@ -47,7 +47,7 @@ class CBinOpDialog : public QDialog
public: public:
CBinOpDialog(QWidget *widget1, QWidget *widget2, QWidget *parent = 0); CBinOpDialog(QWidget *widget1, QWidget *widget2, QWidget *parent = 0);
~CBinOpDialog(); virtual ~CBinOpDialog();
virtual void init() = 0; virtual void init() = 0;
@ -86,7 +86,6 @@ public:
_SchemeWrapper[k].Index = k ; _SchemeWrapper[k].Index = k ;
} }
} }
void init() void init()
{ {
uint k ; uint k ;

View file

@ -126,7 +126,7 @@ bool CParticleTreeItem::replace(const QList<QVariant> &data)
bool CParticleTreeItem::deleteChild(int row) bool CParticleTreeItem::deleteChild(int row)
{ {
_childItems.removeAt(row); delete _childItems.takeAt(row);
return true; return true;
} }

View file

@ -27,7 +27,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSlider" name="horizontalSlider"> <widget class="QSlider" name="horizontalSlider">
<property name="maximum"> <property name="maximum">
<number>1000</number> <number>500</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -36,7 +36,7 @@
<enum>QSlider::TicksAbove</enum> <enum>QSlider::TicksAbove</enum>
</property> </property>
<property name="tickInterval"> <property name="tickInterval">
<number>100</number> <number>50</number>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -96,6 +96,8 @@ template <typename T>
class CValueBlenderDialogClientT : public IValueBlenderDialogClient class CValueBlenderDialogClientT : public IValueBlenderDialogClient
{ {
public: public:
virtual ~CValueBlenderDialogClientT() {}
// the scheme being used. Must be set by the user // the scheme being used. Must be set by the user
NL3D::CPSValueBlendFuncBase<T> *SchemeFunc; NL3D::CPSValueBlendFuncBase<T> *SchemeFunc;
@ -143,6 +145,8 @@ protected:
class CFloatBlenderDialogClient : public CValueBlenderDialogClientT<float> class CFloatBlenderDialogClient : public CValueBlenderDialogClientT<float>
{ {
public: public:
~CFloatBlenderDialogClient() {}
QWidget *newDialog(IPSWrapper<float> *wrapper, QWidget *parent) QWidget *newDialog(IPSWrapper<float> *wrapper, QWidget *parent)
{ {
CEditRangeFloatWidget *erf = new CEditRangeFloatWidget(parent); CEditRangeFloatWidget *erf = new CEditRangeFloatWidget(parent);
@ -158,6 +162,8 @@ public:
class CUIntBlenderDialogClient : public CValueBlenderDialogClientT<uint32> class CUIntBlenderDialogClient : public CValueBlenderDialogClientT<uint32>
{ {
public: public:
~CUIntBlenderDialogClient() {}
QWidget *newDialog(IPSWrapper<uint32> *wrapper, QWidget *parent) QWidget *newDialog(IPSWrapper<uint32> *wrapper, QWidget *parent)
{ {
CEditRangeUIntWidget *erf = new CEditRangeUIntWidget(parent); CEditRangeUIntWidget *erf = new CEditRangeUIntWidget(parent);
@ -173,6 +179,8 @@ public:
class CIntBlenderDialogClient : public CValueBlenderDialogClientT<sint32> class CIntBlenderDialogClient : public CValueBlenderDialogClientT<sint32>
{ {
public: public:
~CIntBlenderDialogClient() {}
QWidget *newDialog(IPSWrapper<sint32> *wrapper, QWidget *parent) QWidget *newDialog(IPSWrapper<sint32> *wrapper, QWidget *parent)
{ {
CEditRangeIntWidget *erf = new CEditRangeIntWidget(parent); CEditRangeIntWidget *erf = new CEditRangeIntWidget(parent);
@ -188,6 +196,8 @@ public:
class CRGBABlenderDialogClient : public CValueBlenderDialogClientT<NLMISC::CRGBA> class CRGBABlenderDialogClient : public CValueBlenderDialogClientT<NLMISC::CRGBA>
{ {
public: public:
~CRGBABlenderDialogClient() {}
QWidget *newDialog(IPSWrapper<NLMISC::CRGBA> *wrapper, QWidget *parent) QWidget *newDialog(IPSWrapper<NLMISC::CRGBA> *wrapper, QWidget *parent)
{ {
CColorEditWidget *ce = new CColorEditWidget(parent); CColorEditWidget *ce = new CColorEditWidget(parent);

View file

@ -59,6 +59,7 @@ class IValueGradientClient: public QObject
Q_OBJECT Q_OBJECT
public: public:
IValueGradientClient(QObject *parent = 0): QObject(parent) {} IValueGradientClient(QObject *parent = 0): QObject(parent) {}
virtual ~IValueGradientClient() {}
virtual QWidget *createDialog(QWidget *parent) = 0; virtual QWidget *createDialog(QWidget *parent) = 0;
@ -168,6 +169,7 @@ class CValueGradientClientT : public IValueGradientClient, public IPSWrapper<T>
{ {
public: public:
CValueGradientClientT(QObject *parent = 0): IValueGradientClient(parent) {} CValueGradientClientT(QObject *parent = 0): IValueGradientClient(parent) {}
virtual ~CValueGradientClientT() {}
/// the gradient being edited, must be filled by the instancier /// the gradient being edited, must be filled by the instancier
NL3D::CPSValueGradientFunc<T> *Scheme; NL3D::CPSValueGradientFunc<T> *Scheme;
@ -268,6 +270,7 @@ class CFloatGradientWrapper : public CValueGradientClientT<float>
Q_OBJECT Q_OBJECT
public: public:
CFloatGradientWrapper(QObject *parent = 0): CValueGradientClientT<float>(parent) {} CFloatGradientWrapper(QObject *parent = 0): CValueGradientClientT<float>(parent) {}
~CFloatGradientWrapper() {}
virtual QWidget *newDialog(IPSWrapperFloat *wrapper, QWidget *parent) virtual QWidget *newDialog(IPSWrapperFloat *wrapper, QWidget *parent)
{ {
@ -304,6 +307,7 @@ class CUIntGradientWrapper : public CValueGradientClientT<uint32>
Q_OBJECT Q_OBJECT
public: public:
CUIntGradientWrapper(QObject *parent = 0): CValueGradientClientT<uint32>(parent) {} CUIntGradientWrapper(QObject *parent = 0): CValueGradientClientT<uint32>(parent) {}
~CUIntGradientWrapper() {}
virtual QWidget *newDialog(IPSWrapperUInt *wrapper, QWidget *parent) virtual QWidget *newDialog(IPSWrapperUInt *wrapper, QWidget *parent)
{ {
@ -340,6 +344,7 @@ class CIntGradientWrapper : public CValueGradientClientT<sint32>
Q_OBJECT Q_OBJECT
public: public:
CIntGradientWrapper(QObject *parent = 0): CValueGradientClientT<sint32>(parent) {} CIntGradientWrapper(QObject *parent = 0): CValueGradientClientT<sint32>(parent) {}
~CIntGradientWrapper() {}
virtual QWidget *newDialog(IPSWrapper<sint32> *wrapper, QWidget *parent) virtual QWidget *newDialog(IPSWrapper<sint32> *wrapper, QWidget *parent)
{ {
@ -376,6 +381,7 @@ class CColorGradientWrapper : public CValueGradientClientT<NLMISC::CRGBA>
Q_OBJECT Q_OBJECT
public: public:
CColorGradientWrapper(QObject *parent = 0): CValueGradientClientT<NLMISC::CRGBA>(parent) {} CColorGradientWrapper(QObject *parent = 0): CValueGradientClientT<NLMISC::CRGBA>(parent) {}
~CColorGradientWrapper() {}
virtual QWidget *newDialog(IPSWrapper<NLMISC::CRGBA> *wrapper, QWidget *parent) virtual QWidget *newDialog(IPSWrapper<NLMISC::CRGBA> *wrapper, QWidget *parent)
{ {
@ -418,6 +424,7 @@ class CPlaneBasisGradientWrapper : public CValueGradientClientT<NL3D::CPlaneBasi
Q_OBJECT Q_OBJECT
public: public:
CPlaneBasisGradientWrapper(QObject *parent = 0): CValueGradientClientT<NL3D::CPlaneBasis>(parent) {} CPlaneBasisGradientWrapper(QObject *parent = 0): CValueGradientClientT<NL3D::CPlaneBasis>(parent) {}
~CPlaneBasisGradientWrapper() {}
virtual QWidget *newDialog(IPSWrapper<NL3D::CPlaneBasis> *wrapper, QWidget *parent) virtual QWidget *newDialog(IPSWrapper<NL3D::CPlaneBasis> *wrapper, QWidget *parent)
{ {
@ -455,6 +462,8 @@ public:
CTextureGradientInterface(NL3D::CPSTexturedParticle *tp, CWorkspaceNode *ownerNode): Node(ownerNode), TP(tp) {} CTextureGradientInterface(NL3D::CPSTexturedParticle *tp, CWorkspaceNode *ownerNode): Node(ownerNode), TP(tp) {}
~CTextureGradientInterface() {}
CWorkspaceNode *Node; CWorkspaceNode *Node;
NL3D::CPSTexturedParticle *TP; NL3D::CPSTexturedParticle *TP;