[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [brprint3d] /: Don't init things to null if this is should not be their initial value
From:       Tomaz Canabrava <tomaz.canabrava () intel ! com>
Date:       2015-11-30 23:47:42
Message-ID: E1a3YAY-0000MT-3y () scm ! kde ! org
[Download RAW message or body]

Git commit 91c7ce381a34fb68b1fc5d59017b35252c922cb1 by Tomaz Canabrava.
Committed on 30/11/2015 at 23:00.
Pushed by tcanabrava into branch 'master'.

Don't init things to null if this is should not be their initial value

You where initializing pointers to nullptr on the class definition
but also initializing them on the constructor. initialize them only
once, on the initialization-list.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>

M  +1    -1    arduinolistener.h
M  +10   -14   brprint3d.cpp
M  +10   -7    brprint3d.h

http://commits.kde.org/brprint3d/91c7ce381a34fb68b1fc5d59017b35252c922cb1

diff --git a/arduinolistener.h b/arduinolistener.h
index 78b14e7..e29c54e 100755
--- a/arduinolistener.h
+++ b/arduinolistener.h
@@ -29,7 +29,7 @@
 #include <QTextStream>
 #include <QThread>
 
-
+//TODO: Remove this class, use a QTimer instead.
 class arduinoListener : public QThread
 {
     Q_OBJECT
diff --git a/brprint3d.cpp b/brprint3d.cpp
index c0021d6..3690be1 100755
--- a/brprint3d.cpp
+++ b/brprint3d.cpp
@@ -25,28 +25,27 @@
 #include "ui_Pandora.h"
 
 BrPrint3D::BrPrint3D(QWidget *parent) : QMainWindow(parent),
-    ui(new Ui::BrPrint3D)
+    ui(new Ui::BrPrint3D), 
+    bt_import(new BigButton(this,tr("Import GCode"),":/Icons/Icons/import.png", \
false)), +    bt_open(new BigButton(this,tr("Open \
File"),":/Icons/Icons/openFile.png", false)), +    bt_connect(new \
BigButton(this,tr("Connect"),":/Icons/Icons/connect.png", true)), +    bt_play(new \
BigButton(this,tr("Play"),":/Icons/Icons/play.png", true)), +    bt_pause(new \
BigButton(this,tr("Pause"),":/Icons/Icons/pause.png", true)), +    bt_stop(new \
BigButton(this,tr("Stop"),":/Icons/Icons/stop.png", false)), +    \
bt_stopOnEmergency(new BigButton(this,tr("Emergency \
Stop"),":/Icons/Icons/emergency.png", false)), +    vtkView(new vtkWidget())
 {
     ui->setupUi(this);
-    bt_import = new BigButton(this,tr("Import GCode"),":/Icons/Icons/import.png", \
                false);
-    bt_open = new BigButton(this,tr("Open File"),":/Icons/Icons/openFile.png", \
                false);
-    bt_connect = new BigButton(this,tr("Connect"),":/Icons/Icons/connect.png", \
                true);
-
+    
     ui->ly_ConteinerLeft->addWidget(bt_import);
     ui->ly_ConteinerLeft->addWidget(bt_open);
     ui->ly_ConteinerLeft->addWidget(bt_connect);
 
-    bt_play = new BigButton(this,tr("Play"),":/Icons/Icons/play.png", true);
-    bt_pause = new BigButton(this,tr("Pause"),":/Icons/Icons/pause.png", true);
-    bt_stop = new BigButton(this,tr("Stop"),":/Icons/Icons/stop.png", false);
-    bt_stopOnEmergency = new BigButton(this,tr("Emergency \
                Stop"),":/Icons/Icons/emergency.png", false);
-
     ui->ly_ConteinerRight->addWidget(bt_play);
     ui->ly_ConteinerRight->addWidget(bt_pause);
     ui->ly_ConteinerRight->addWidget(bt_stop);
     ui->ly_ConteinerRight->addWidget(bt_stopOnEmergency);
 
-    vtkView = new vtkWidget();
     ui->_vtkConteiner->addWidget(vtkView);
 
     connect(ui->_PrinterSettings,&PrinterSettingsWidget::s_extrudersInUse,ui->_ManualControl,&ManualControlWidget::setExtrudersInUse);
 @@ -67,10 +66,7 @@ BrPrint3D::BrPrint3D(QWidget *parent) : QMainWindow(parent),
     connect(bt_stopOnEmergency,&BigButton::clicked,ui->_ManualControl,&ManualControlWidget::stopOnEmergency);
                
     connect(ui->bt_hide,&QPushButton::clicked,this,&BrPrint3D::hidePrinterSettings);
     connect(ui->_ManualControl,&ManualControlWidget::checkConnectButton,bt_connect,&BigButton::setChecked);
                
-
     connect(ui->_PrinterSettings,&PrinterSettingsWidget::updateCube,vtkView,&vtkWidget::updateCube);
                
-
-
 }
 
 BrPrint3D::~BrPrint3D()
diff --git a/brprint3d.h b/brprint3d.h
index 1d1bc68..433abac 100755
--- a/brprint3d.h
+++ b/brprint3d.h
@@ -61,18 +61,21 @@ public:
     explicit BrPrint3D(QWidget *parent = 0);
     ~BrPrint3D();
     void init();
-    BigButton *bt_import=nullptr;
-    BigButton *bt_open=nullptr;
-    BigButton *bt_connect=nullptr;
-    BigButton *bt_play=nullptr;
-    BigButton *bt_pause=nullptr;
-    BigButton *bt_stop=nullptr;
-    BigButton *bt_stopOnEmergency=nullptr;
+    
 private:
     Ui::BrPrint3D *ui;
     vtkWidget *vtkView=nullptr;
     PrinterSettings psettings;
     QString filePath;
+
+    BigButton *bt_import;
+    BigButton *bt_open;
+    BigButton *bt_connect;
+    BigButton *bt_play;
+    BigButton *bt_pause;
+    BigButton *bt_stop;
+    BigButton *bt_stopOnEmergency;
+    
     void setEnabled(bool b);
 
 


[prev in list] [next in list] [prev in thread] [next in thread]