Commit 2fbd2532 authored by Jan Möbius's avatar Jan Möbius

Fixed more warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13307 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 80379a37
......@@ -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");
......
......@@ -127,6 +127,10 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn
void noguiSupported( ) {} ;
public :
/// Constructor
DataControlPlugin();
/// Destructor
~DataControlPlugin() {};
......
......@@ -900,7 +900,6 @@ void FileOBJPlugin::readOBJFile(QString _filename, OBJImporter& _importer)
//get curve control points
std::string curveLine;
std::string tmp;
std::getline(stream, curveLine);
......@@ -1028,7 +1027,6 @@ void FileOBJPlugin::readOBJFile(QString _filename, OBJImporter& _importer)
//get surface control points
std::string surfLine;
std::string tmp;
std::getline(stream, surfLine);
......@@ -1305,7 +1303,6 @@ void FileOBJPlugin::checkTypes(QString _filename, OBJImporter& _importer, QStrin
//get curve control points
std::string curveLine;
std::string tmp;
std::getline(stream, curveLine);
......@@ -1373,7 +1370,6 @@ void FileOBJPlugin::checkTypes(QString _filename, OBJImporter& _importer, QStrin
//get surface control points
std::string surfLine;
std::string tmp;
std::getline(stream, surfLine);
......@@ -1501,7 +1497,7 @@ int FileOBJPlugin::loadObject(QString _filename) {
importer.addGroup( QFileInfo(_filename).fileName() );
//check if something was found
if ( importer.objectOptions().size() == 0 && objIDs.size() == 0 ){
if ( importer.objectOptions().empty() && objIDs.empty() ){
forceTriangleMesh_ = false;
forcePolyMesh_ = false;
......
......@@ -67,6 +67,8 @@ namespace VSI {
Text::Text (QGraphicsItem *_parent) :
QGraphicsSimpleTextItem (_parent),
backgroundSet_ (false),
leftOut_(true),
rightOut_(true),
alignment_ (Qt::AlignLeft),
hStretch_ (true)
{
......@@ -80,6 +82,8 @@ Text::Text (const QString &_text, QGraphicsItem *_parent) :
QGraphicsSimpleTextItem (_text, _parent),
text_ (_text),
backgroundSet_ (false),
leftOut_(true),
rightOut_(true),
alignment_ (Qt::AlignLeft),
hStretch_ (true)
{
......@@ -297,8 +301,8 @@ void Text::paint (QPainter *_painter, const QStyleOptionGraphicsItem *_option, Q
void Text::setBackground(bool _leftOut, bool _rightOut)
{
backgroundSet_ = true;
leftOut_ = _leftOut;
rightOut_ = _rightOut;
leftOut_ = _leftOut;
rightOut_ = _rightOut;
updateGeometry ();
}
......
......@@ -61,7 +61,7 @@ class GraphicsScene;
//== CLASS DEFINITION =========================================================
/** Layoutable text widget implementation with an optional background.
* The background can va convex or concave sides.
* The background can have convex or concave sides.
*/
class Text : public QObject, public QGraphicsSimpleTextItem, public QGraphicsLayoutItem
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment