From 6eb5ca15703122e1a5ba9b26eb9a9bb0095dbc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 10 Jan 2012 15:37:39 +0000 Subject: [PATCH] Fixed more warnings git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13307 383ad7c9-94d9-4d36-a494-682f7c89f535 --- DataControlPlugin.cc | 26 ++++++++++++++++++++++---- DataControlPlugin.hh | 4 ++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/DataControlPlugin.cc b/DataControlPlugin.cc index 7471e64..3766594 100644 --- a/DataControlPlugin.cc +++ b/DataControlPlugin.cc @@ -74,6 +74,28 @@ const ACG::Vec4f target_color (0.0,0.5,0.2,1.0); //****************************************************************************** + + +DataControlPlugin::DataControlPlugin() : + tool_(0), + toolIcon_(0), + MeshDialogLayout_(0), + objectList_(0), + locked(false), + model_(0), + view_(0), + viewHeader_(0), + onlyDown_(0), + onlyUp_(0), + headerPopupType_(0), + targetAction_(0), + sourceAction_(0), + removeAction_(0) +{ + +} + + /** \brief Plugin initialization * */ @@ -143,7 +165,6 @@ void DataControlPlugin::initializePlugin() if ( ! OpenFlipper::Options::gui()) return; - locked = false; tool_ = new DatacontrolToolboxWidget(); connect( tool_ , SIGNAL( keyEvent( QKeyEvent* ) ), this , SLOT(slotKeyEvent ( QKeyEvent* ) )); @@ -189,9 +210,6 @@ void DataControlPlugin::initializePlugin() emit addToolbox("Data Control", tool_, toolIcon_); - onlyDown_ = 0; - onlyUp_ = 0; - QIcon icon = QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"datacontrol-boundingBox.png"); tool_->boundingBoxBtn->setIcon( icon ); icon = QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"datacontrol-hide-object.png"); diff --git a/DataControlPlugin.hh b/DataControlPlugin.hh index 785b890..8794b78 100644 --- a/DataControlPlugin.hh +++ b/DataControlPlugin.hh @@ -127,6 +127,10 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn void noguiSupported( ) {} ; public : + + /// Constructor + DataControlPlugin(); + /// Destructor ~DataControlPlugin() {}; -- GitLab