Changed: #1193 Code cleanup.

code/nel/tools/3d/object_viewer_qt/src/attrib_widget.cpp

@@ -45,12 +45,12 @@ namespace NLQT
 
 CAttribWidget::CAttribWidget(QWidget *parent)
 	: QGroupBox(parent),
-	_SrcInputEnabled(true),
+	  _SrcInputEnabled(true),
-	_EnableConstantValue(true),
+	  _EnableConstantValue(true),
-	_DisableMemoryScheme(false),
+	  _DisableMemoryScheme(false),
-	_NbCycleEnabled(true),
+	  _NbCycleEnabled(true),
-	_Node(NULL), 
+	  _Node(NULL),
-	_SchemeWidget(NULL)
+	  _SchemeWidget(NULL)
 {
 	_ui.setupUi(this);
 	_ui.constRangeUIntWidget->hide();

code/nel/tools/3d/object_viewer_qt/src/auto_lod_dialog.cpp

@@ -32,9 +32,9 @@ namespace NLQT
 {
 
 CAutoLODDialog::CAutoLODDialog(CWorkspaceNode *ownerNode, NL3D::CParticleSystem *ps, QWidget *parent)
-	: QDialog(parent), 
+	: QDialog(parent),
-	_Node(ownerNode), 
+	  _Node(ownerNode),
-	_PS(ps)
+	  _PS(ps)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/auto_lod_dialog.h

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

code/nel/tools/3d/object_viewer_qt/src/basic_edit_widget.h

@@ -48,7 +48,7 @@ public:
 private Q_SLOTS:
 	void updateGraphics();
 
-private:	
+private:
 	bool eventFilter(QObject *object, QEvent *event);
 
 	// wrapper to the datas

code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h

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

code/nel/tools/3d/object_viewer_qt/src/configuration.cpp

@@ -201,7 +201,7 @@ CRGBA CConfiguration::getValue(const CConfigFile::CVar &var, const CRGBA &defaul
 {
 	if (var.size() >= 3)
 	{
-		if (var.size() > 4) 
+		if (var.size() > 4)
 			nlwarning("RGBA value in config value '%s' is too long, ignoring unused values");
 		return CRGBA((uint8)var.asInt(0), (uint8)var.asInt(1), (uint8)var.asInt(2), var.size() >= 4 ? (uint8)var.asInt(3) : 255);
 	}

code/nel/tools/3d/object_viewer_qt/src/curve_dialog.cpp

@@ -27,11 +27,11 @@ namespace NLQT
 {
 
 CurveEditDialog::CurveEditDialog(NL3D::CPSFloatCurveFunctor *curve, CWorkspaceNode *ownerNode, QWidget *parent)
-	: QDialog(parent), 
+	: QDialog(parent),
-	_scale(1.0), 
+	  _scale(1.0),
-	_pos(0.0), 
+	  _pos(0.0),
-	_Node(ownerNode), 
+	  _Node(ownerNode),
-	_Curve(curve)
+	  _Curve(curve)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/curve_dialog.h

@@ -70,7 +70,7 @@ protected:
 	float _pos;
 
 	CWorkspaceNode *_Node;
-	
+
 	/// the scheme being edited
 	NL3D::CPSFloatCurveFunctor *_Curve;
 

code/nel/tools/3d/object_viewer_qt/src/edit_range_widget.cpp

@@ -34,9 +34,9 @@ namespace NLQT
 const int max_range = 9999;
 
 CEditRangeUIntWidget::CEditRangeUIntWidget(QWidget *parent)
-	: QWidget(parent), 
+	: QWidget(parent),
-	_Wrapper(NULL), 
+	  _Wrapper(NULL),
-	_emit(true)
+	  _emit(true)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/entity.cpp

@@ -44,18 +44,18 @@ namespace NLQT
 {
 
 CSlotInfo::CSlotInfo()
-	: Animation("empty"), 
+	: Animation("empty"),
-	Skeleton("empty"),
+	  Skeleton("empty"),
-	Offset(0), 
+	  Offset(0),
-	StartTime(0), 
+	  StartTime(0),
-	EndTime(0),
+	  EndTime(0),
-	StartBlend(1),	
+	  StartBlend(1),
-	EndBlend (1), 
+	  EndBlend (1),
-	Smoothness(1),
+	  Smoothness(1),
-	SpeedFactor(1),	
+	  SpeedFactor(1),
-	ClampMode(0),
+	  ClampMode(0),
-	SkeletonInverted(false),
+	  SkeletonInverted(false),
-	Enable(true)	
+	  Enable(true)
 {
 }
 
@@ -80,15 +80,15 @@ CSlotInfo &CSlotInfo::operator=(const CSlotInfo &slotInfo)
 }
 
 CEntity::CEntity(void)
-	: _Name("<Unknown>"), 
+	: _Name("<Unknown>"),
-	_FileNameShape(""),
+	  _FileNameShape(""),
-	_FileNameSkeleton(""), 
+	  _FileNameSkeleton(""),
-	_inPlace(false), 
+	  _inPlace(false),
-	_incPos(false),
+	  _incPos(false),
-	_Instance(NULL), 
+	  _Instance(NULL),
-	_Skeleton(NULL),
+	  _Skeleton(NULL),
-	_PlayList(NULL), 
+	  _PlayList(NULL),
-	_AnimationSet(NULL)
+	  _AnimationSet(NULL)
 {
 	_CharacterScalePos = 1;
 }

code/nel/tools/3d/object_viewer_qt/src/entity.h

@@ -100,8 +100,8 @@ public:
 
 		SAnimationStatus()
 			: LoopAnim(false), PlayAnim(false),
-			CurrentTimeAnim(0), StartAnim(0),
+			  CurrentTimeAnim(0), StartAnim(0),
-			EndAnim(0), SpeedAnim(1), Mode(Mode::PlayList) {}
+			  EndAnim(0), SpeedAnim(1), Mode(Mode::PlayList) {}
 	};
 
 	/// Destructor
@@ -227,7 +227,7 @@ public:
 	{
 		return _SWTList;
 	}
-	
+
 	/// Get game interface for manipulating Skeleton.
 	NL3D::UInstance getInstance() const
 	{

code/nel/tools/3d/object_viewer_qt/src/follow_path_dialog.cpp

@@ -30,9 +30,9 @@ namespace NLQT
 {
 
 CFollowPathDialog::CFollowPathDialog(NL3D::CPSPlaneBasisFollowSpeed *pbfs, CWorkspaceNode *ownerNode, QWidget *parent)
-	: QDialog(parent), 
+	: QDialog(parent),
-	_FollowPath(pbfs), 
+	  _FollowPath(pbfs),
-	_Node(ownerNode)
+	  _Node(ownerNode)
 {
 	resize(270, 90);
 	QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);

code/nel/tools/3d/object_viewer_qt/src/modules.cpp

@@ -26,7 +26,7 @@ NLQT::CMainWindow *Modules::_mainWindow = NULL;
 NLQT::CParticleEditor *Modules::_particleEditor = NULL;
 NLQT::CSoundSystem *Modules::_soundSystem = NULL;
 NLQT::CVegetableEditor *Modules::_vegetableEditor = NULL;
-ExtensionSystem::CPluginManager *Modules::_pluginManager = NULL; 
+ExtensionSystem::CPluginManager *Modules::_pluginManager = NULL;
 
 void Modules::init()
 {

code/nel/tools/3d/object_viewer_qt/src/modules.h

@@ -62,9 +62,9 @@ public:
 	{
 		return *_vegetableEditor;
 	}
-	static ExtensionSystem::CPluginManager &plugMan() 
+	static ExtensionSystem::CPluginManager &plugMan()
-	{ 
+	{
-		return *_pluginManager; 
+		return *_pluginManager;
 	}
 
 private:
@@ -74,7 +74,7 @@ private:
 	static NLQT::CParticleEditor *_particleEditor;
 	static NLQT::CSoundSystem *_soundSystem;
 	static NLQT::CVegetableEditor *_vegetableEditor;
-	static ExtensionSystem::CPluginManager *_pluginManager; 
+	static ExtensionSystem::CPluginManager *_pluginManager;
 };
 
 #endif // MODULES_H

code/nel/tools/3d/object_viewer_qt/src/morph_mesh_dialog.cpp

@@ -34,9 +34,9 @@ namespace NLQT
 {
 
 CMorphMeshDialog::CMorphMeshDialog(CWorkspaceNode *ownerNode, NL3D::CPSConstraintMesh *cm, QWidget *parent)
-	: QDialog(parent), 
+	: QDialog(parent),
-	_Node(ownerNode), 
+	  _Node(ownerNode),
-	_CM(cm)
+	  _CM(cm)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/multi_tex_dialog.cpp

@@ -31,9 +31,9 @@ namespace NLQT
 {
 
 CMultiTexDialog::CMultiTexDialog(CWorkspaceNode *ownerNode, NL3D::CPSMultiTexturedParticle *mtp, QWidget *parent)
-	: QDialog(parent), 
+	: QDialog(parent),
-	_Node(ownerNode), 
+	  _Node(ownerNode),
-	_MTP(mtp)
+	  _MTP(mtp)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/particle_editor.cpp

@@ -35,18 +35,18 @@ namespace NLQT
 
 CParticleEditor::CParticleEditor(void)
 	: _ActiveNode(NULL),
-	_State(State::Stopped),
+	  _State(State::Stopped),
-	_Speed(1.0f),
+	  _Speed(1.0f),
-	_AutoRepeat(false),
+	  _AutoRepeat(false),
-	_DisplayBBox(false),
+	  _DisplayBBox(false),
-	_DisplayHelpers(false),
+	  _DisplayHelpers(false),
-	_AutoUpdateBBox(false),
+	  _AutoUpdateBBox(false),
-	_EmptyBBox(true),
+	  _EmptyBBox(true),
-	_PW(NULL),
+	  _PW(NULL),
-	_Driver(NULL),
+	  _Driver(NULL),
-	_Scene(NULL),
+	  _Scene(NULL),
-	_FontManager(NULL),
+	  _FontManager(NULL),
-	_FontGen(NULL)
+	  _FontGen(NULL)
 {
 }
 

code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp

@@ -64,7 +64,7 @@ void CWorkspaceNode::memorizeState()
 void CWorkspaceNode::restoreState()
 {
 	nlassert(_WS);
-	if (!_PS) 
+	if (!_PS)
 		return;
 	_InitialPos.restoreSystem();
 }
@@ -80,7 +80,7 @@ void CWorkspaceNode::stickPSToSkeleton(NL3D::CSkeletonModel *skel,
 									   const std::string &parentBoneName)
 {
 	nlassert(_WS);
-	if (!_PSM) 
+	if (!_PSM)
 		return;
 	unstickPSFromSkeleton();
 	_ParentSkelName = parentSkelName;
@@ -293,7 +293,7 @@ bool CWorkspaceNode::loadPS() throw(NLMISC::EStream)
 	if (oldSB)
 	{
 		Modules::psEdit().getScene()->setShapeBank(oldSB);
-	} 
+	}
 	setup(*psm);
 	unload();
 	// commit new values

code/nel/tools/3d/object_viewer_qt/src/particle_tree_model.cpp

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

code/nel/tools/3d/object_viewer_qt/src/particle_workspace_dialog.cpp

@@ -124,7 +124,7 @@ static std::map<std::string,  uint> _PSElementIdentifiers;
 
 CParticleWorkspaceDialog::CParticleWorkspaceDialog(QWidget *parent)
 	: QDockWidget(parent),
-	_currentItem(NULL)
+	  _currentItem(NULL)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/slot_manager_dialog.cpp

@@ -33,9 +33,9 @@ namespace NLQT
 
 CSlotGroupBox::CSlotGroupBox(QWidget *parent)
 	: QGroupBox(parent),
-	_animName("empty"), 
+	  _animName("empty"),
-	_skelName("empty"), 
+	  _skelName("empty"),
-	_numSlot(0)
+	  _numSlot(0)
 {
 	_ui.setupUi(this);
 

code/nel/tools/3d/object_viewer_qt/src/sound_system.cpp

@@ -34,8 +34,8 @@ namespace NLQT
 
 CSoundSystem::CSoundSystem()
 	:_AudioMixer(NULL),
-	_AnimManager(NULL),
+	 _AnimManager(NULL),
-	_Zero(NLMISC::CVector::Null)
+	 _Zero(NLMISC::CVector::Null)
 {
 
 }

code/nel/tools/3d/object_viewer_qt/src/spinner_dialog.cpp

@@ -25,8 +25,8 @@ namespace NLQT
 
 CSpinnerDialog::CSpinnerDialog(NL3D::CPSBasisSpinner *sf, CWorkspaceNode *ownerNode, QWidget *parent)
 	: QDialog(parent),
-	_Node(ownerNode),
+	  _Node(ownerNode),
-	_BasicSpinner(sf)
+	  _BasicSpinner(sf)
 {
 	nlassert(_BasicSpinner);
 

code/nel/tools/3d/object_viewer_qt/src/tune_timer_dialog.h

@@ -38,7 +38,7 @@ class CTuneTimerDialog: public QDockWidget
 public:
 	CTuneTimerDialog(QWidget *parent = 0);
 	~CTuneTimerDialog();
-	
+
 	void setInterval(int value);
 
 Q_SIGNALS:

code/nel/tools/3d/object_viewer_qt/src/tune_timer_form.ui

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

code/nel/tools/3d/object_viewer_qt/src/value_blender_dialog.h

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

code/nel/tools/3d/object_viewer_qt/src/value_gradient_dialog.h

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