Merge pull request #5 from secondYearProjects/dev

SergySanJj · web-flow · commit 8bd5acef18c2 · 2018-11-06T15:41:48.000-08:00
Optimize parameters passing
diff --git a/SmartTimer/addalarmdialog.cpp b/SmartTimer/addalarmdialog.cpp
@@ -36,7 +36,7 @@ addAlarmDialog::~addAlarmDialog()
 
 void addAlarmDialog::updateWidget(GlobalSettings _globalSettings)
 {
-    globalSettings = _globalSettings;
+    globalSettings = std::move(_globalSettings);
     ui->alarmTime->setDisplayFormat(globalSettings.alarmTimeFormat);
 }
 
diff --git a/SmartTimer/addtimerdialog.cpp b/SmartTimer/addtimerdialog.cpp
@@ -41,7 +41,7 @@ addTimerDialog::~addTimerDialog()
 
 void addTimerDialog::updateWidget(GlobalSettings _globalSettings)
 {
-    globalSettings = _globalSettings;
+    globalSettings = std::move(_globalSettings);
 
     ui->interval->setDisplayFormat(globalSettings.timerTimeFormat);
 }
diff --git a/SmartTimer/alertwidget.cpp b/SmartTimer/alertwidget.cpp
@@ -19,20 +19,19 @@ int calculateDuration(const QTime &t)
         int wholeDay = 3600*24*1000;
         return (wholeDay+alertMsecs-currMsecs);
     }
-    else if (currMsecs < alertMsecs)
+    if (currMsecs < alertMsecs)
     {
         return (alertMsecs-currMsecs);
     }
-    else
-        return 0;
+    return 0;
 }
 
 
 alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::alertwidget)
 {
-    Settings = settings;
+    Settings = std::move(settings);
 
     alertTime = QTime::fromMSecsSinceStartOfDay(Settings.msecs);
 
@@ -79,8 +78,8 @@ alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :
 
     this->setContextMenuPolicy(Qt::CustomContextMenu);
 
-    connect(this, SIGNAL(customContextMenuRequest(const QPoint &)),
-            this, SLOT(ShowContextMenu(const QPoint &)));
+    connect(this, SIGNAL(customContextMenuRequest(QPoint)),
+            this, SLOT(ShowContextMenu(QPoint)));
 
 }
 
@@ -195,7 +194,7 @@ void alertwidget::closeAlarm()
 
 void alertwidget::changeAlarm()
 {
-    ChangeAlarmDialog *dial = new ChangeAlarmDialog(this);
+    auto dial = new ChangeAlarmDialog(this);
 
     connect(dial, SIGNAL(changeAlarmSignal(WidgetSettings)),this,SLOT(setAlarm(WidgetSettings)));
 
@@ -221,7 +220,7 @@ void alertwidget::ShowContextMenu(const QPoint &pos)
 
 void alertwidget::setAlarm(WidgetSettings settings)
 {
-    Settings = settings;
+    Settings = std::move(settings);
 
     ui->timeLabel->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString(globalSettings.alarmTimeFormat));
     ui->alarmNameLabel->setText(Settings.name);
@@ -237,7 +236,7 @@ void alertwidget::setAlarm(WidgetSettings settings)
 
 void alertwidget::updateWidget(GlobalSettings _globalSettings)
 {
-    globalSettings = _globalSettings;
+    globalSettings = std::move(_globalSettings);
     ui->timeLabel->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.alarmTimeFormat));
 
 }
diff --git a/SmartTimer/changealarmdialog.cpp b/SmartTimer/changealarmdialog.cpp
@@ -37,7 +37,7 @@ ChangeAlarmDialog::~ChangeAlarmDialog()
 
 void ChangeAlarmDialog::updateWidget(GlobalSettings _globalSettings)
 {
-    globalSettings = _globalSettings;
+    globalSettings = std::move(_globalSettings);
 
     ui->time->setDisplayFormat(globalSettings.alarmTimeFormat);
 }
diff --git a/SmartTimer/changetimerdialog.cpp b/SmartTimer/changetimerdialog.cpp
@@ -48,7 +48,7 @@ ChangeTimerDialog::~ChangeTimerDialog()
 
 void ChangeTimerDialog::updateWidget(GlobalSettings _globalSettings)
 {
-    globalSettings = _globalSettings;
+    globalSettings = std::move(_globalSettings);
 
     ui->interval->setDisplayFormat(globalSettings.timerTimeFormat);
 }
diff --git a/SmartTimer/mainwindow.cpp b/SmartTimer/mainwindow.cpp
@@ -105,13 +105,13 @@ void MainWindow::changeSettings()
 
 void MainWindow::onTimeRecieved(WidgetSettings settings)
 {
-    auto *newTimer = new TimerWidget(settings, this);
+    auto *newTimer = new TimerWidget(std::move(settings), this);
 
     timerScrollWidget->layout()->addWidget(newTimer);
 
     connect(newTimer, SIGNAL(del(const TimerWidget*)), this, SLOT(remove(const TimerWidget*)));
     connect(newTimer, SIGNAL(timerFinished()), this, SLOT(onTimerFinished()));
-    connect(newTimer, SIGNAL(blinkInfo(QString, bool)), this, SLOT(tabBlinking(QString,bool)));
+    connect(newTimer, SIGNAL(blinkInfo(QString,bool)), this, SLOT(tabBlinking(QString,bool)));
 
     timersList.append(newTimer);
     newTimer->updateWidget(Settings);
@@ -144,12 +144,12 @@ void MainWindow::onTimerFinished()
 
 void MainWindow::onAlarmTimeRecieved(WidgetSettings settings)
 {
-    auto *newAlarm = new alertwidget(settings, this);
+    auto *newAlarm = new alertwidget(std::move(settings), this);
 
     alarmScrollWidget->layout()->addWidget(newAlarm);
 
     connect(newAlarm, SIGNAL(del(const alertwidget*)), this, SLOT(remove(const alertwidget*)));
-    connect(newAlarm, SIGNAL(blinkInfo(QString, bool)), this, SLOT(tabBlinking(QString,bool)));
+    connect(newAlarm, SIGNAL(blinkInfo(QString,bool)), this, SLOT(tabBlinking(QString,bool)));
 
 
     alarmsList.append(newAlarm);
@@ -159,7 +159,7 @@ void MainWindow::onAlarmTimeRecieved(WidgetSettings settings)
 
 void MainWindow::onSettingsRecieved(GlobalSettings settings)
 {
-    Settings = settings;
+    Settings = std::move(settings);
 
     this->setWindowOpacity(Settings.windowOpacity);
 
@@ -169,7 +169,7 @@ void MainWindow::onSettingsRecieved(GlobalSettings settings)
 // TODO: here
 // update settings handler
 
-void MainWindow::tabBlinking(QString tabName, bool enable)
+void MainWindow::tabBlinking(const QString &tabName, bool enable)
 {
     if (enable)
     {
diff --git a/SmartTimer/mainwindow.h b/SmartTimer/mainwindow.h
@@ -46,7 +46,7 @@ public slots:
     void onSettingsRecieved(GlobalSettings settings);
 
 
-    void tabBlinking(QString tabName, bool enable);
+    void tabBlinking(const QString &tabName, bool enable);
     void alarmsTabBlink();
     void timersTabBlink();
 
diff --git a/SmartTimer/mainwindow.ui b/SmartTimer/mainwindow.ui
@@ -93,48 +93,6 @@
       <property name="bottomMargin">
        <number>5</number>
       </property>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menuButton">
-        <property name="minimumSize">
-         <size>
-          <width>30</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>30</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="resources.qrc">
-          <normaloff>:/icons/menu.png</normaloff>:/icons/menu.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>30</width>
-          <height>30</height>
-         </size>
-        </property>
-       </widget>
-      </item>
       <item>
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
@@ -389,7 +347,7 @@
               <x>0</x>
               <y>0</y>
               <width>420</width>
-              <height>671</height>
+              <height>670</height>
              </rect>
             </property>
             <property name="minimumSize">
diff --git a/SmartTimer/smarttimerlog.cpp b/SmartTimer/smarttimerlog.cpp
@@ -15,7 +15,7 @@
 smartTimerLog::smartTimerLog(QObject *parent) : par(parent)
 {
     this->par = parent;
-    connect(par, SIGNAL(del(QList<TimerWidget*>,QList<alertwidget*>, GlobalSettings)), this, SLOT(saveLog(QList<TimerWidget*>,QList<alertwidget*>,GlobalSettings)));
+    connect(par, SIGNAL(del(QList<TimerWidget*>,QList<alertwidget*>,GlobalSettings)), this, SLOT(saveLog(QList<TimerWidget*>,QList<alertwidget*>,GlobalSettings)));
 
 }
 
diff --git a/SmartTimer/timerwidget.cpp b/SmartTimer/timerwidget.cpp
@@ -17,7 +17,7 @@ TimerWidget::TimerWidget(WidgetSettings settings, QWidget *parent) :
 {
     ui->setupUi(this);
 
-    Settings = settings;
+    Settings = std::move(settings);
 
     QFile file(":/stylesheet.qss");
     if(file.open(QIODevice::ReadOnly | QIODevice::Text))
@@ -105,7 +105,7 @@ void TimerWidget::setTimerDuration(int _duration)
 
 void TimerWidget::updateWidget(GlobalSettings _globalSettings)
 {
-    globalSettings = _globalSettings;
+    globalSettings = std::move(_globalSettings);
     ui->intervalTime->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
     ui->timeLeft->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));
 
@@ -200,7 +200,7 @@ void TimerWidget::closeTimer()
 
 void TimerWidget::setTimer(WidgetSettings _settings)
 {
-    Settings = _settings;
+    Settings = std::move(_settings);
     ui->intervalTime->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString(globalSettings.timerTimeFormat));
     ui->TimerName->setText(Settings.name);
 
diff --git a/SmartTimer/widgetsettings.cpp b/SmartTimer/widgetsettings.cpp
@@ -28,15 +28,14 @@ bool DDCheck(GlobalSettings globalSettings)
         {
             if (currTime>=globalSettings.DDstart && currTime <= globalSettings.DDend )
                 return false;
-            else
-                return true;
+
+            return true;
         }
         else
         {
             if (currTime>=globalSettings.DDstart || currTime <= globalSettings.DDend)
                 return false;
-            else
-                return true;
+            return true;
         }
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ addAlarmDialog::~addAlarmDialog()`
`36`	`36`
`37`	`37`	`void addAlarmDialog::updateWidget(GlobalSettings _globalSettings)`
`38`	`38`	`{`
`39`		`- globalSettings = _globalSettings;`
	`39`	`+ globalSettings = std::move(_globalSettings);`
`40`	`40`	`ui->alarmTime->setDisplayFormat(globalSettings.alarmTimeFormat);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ addTimerDialog::~addTimerDialog()`
`41`	`41`
`42`	`42`	`void addTimerDialog::updateWidget(GlobalSettings _globalSettings)`
`43`	`43`	`{`
`44`		`- globalSettings = _globalSettings;`
	`44`	`+ globalSettings = std::move(_globalSettings);`
`45`	`45`
`46`	`46`	`ui->interval->setDisplayFormat(globalSettings.timerTimeFormat);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,20 +19,19 @@ int calculateDuration(const QTime &t)`
`19`	`19`	`int wholeDay = 3600241000;`
`20`	`20`	`return (wholeDay+alertMsecs-currMsecs);`
`21`	`21`	`}`
`22`		`- else if (currMsecs < alertMsecs)`
	`22`	`+ if (currMsecs < alertMsecs)`
`23`	`23`	`{`
`24`	`24`	`return (alertMsecs-currMsecs);`
`25`	`25`	`}`
`26`		`- else`
`27`		`- return 0;`
	`26`	`+ return 0;`
`28`	`27`	`}`
`29`	`28`
`30`	`29`
`31`	`30`	`alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :`
`32`	`31`	`QWidget(parent),`
`33`	`32`	`ui(new Ui::alertwidget)`
`34`	`33`	`{`
`35`		`- Settings = settings;`
	`34`	`+ Settings = std::move(settings);`
`36`	`35`
`37`	`36`	`alertTime = QTime::fromMSecsSinceStartOfDay(Settings.msecs);`
`38`	`37`
`@@ -79,8 +78,8 @@ alertwidget::alertwidget(WidgetSettings settings, QWidget *parent) :`
`79`	`78`
`80`	`79`	`this->setContextMenuPolicy(Qt::CustomContextMenu);`
`81`	`80`
`82`		`- connect(this, SIGNAL(customContextMenuRequest(const QPoint &)),`
`83`		`- this, SLOT(ShowContextMenu(const QPoint &)));`
	`81`	`+ connect(this, SIGNAL(customContextMenuRequest(QPoint)),`
	`82`	`+ this, SLOT(ShowContextMenu(QPoint)));`
`84`	`83`
`85`	`84`	`}`
`86`	`85`
`@@ -195,7 +194,7 @@ void alertwidget::closeAlarm()`
`195`	`194`
`196`	`195`	`void alertwidget::changeAlarm()`
`197`	`196`	`{`
`198`		`- ChangeAlarmDialog *dial = new ChangeAlarmDialog(this);`
	`197`	`+ auto dial = new ChangeAlarmDialog(this);`
`199`	`198`
`200`	`199`	`connect(dial, SIGNAL(changeAlarmSignal(WidgetSettings)),this,SLOT(setAlarm(WidgetSettings)));`
`201`	`200`
`@@ -221,7 +220,7 @@ void alertwidget::ShowContextMenu(const QPoint &pos)`
`221`	`220`
`222`	`221`	`void alertwidget::setAlarm(WidgetSettings settings)`
`223`	`222`	`{`
`224`		`- Settings = settings;`
	`223`	`+ Settings = std::move(settings);`
`225`	`224`
`226`	`225`	`ui->timeLabel->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString(globalSettings.alarmTimeFormat));`
`227`	`226`	`ui->alarmNameLabel->setText(Settings.name);`
`@@ -237,7 +236,7 @@ void alertwidget::setAlarm(WidgetSettings settings)`
`237`	`236`
`238`	`237`	`void alertwidget::updateWidget(GlobalSettings _globalSettings)`
`239`	`238`	`{`
`240`		`- globalSettings = _globalSettings;`
	`239`	`+ globalSettings = std::move(_globalSettings);`
`241`	`240`	`ui->timeLabel->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.alarmTimeFormat));`
`242`	`241`
`243`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ ChangeAlarmDialog::~ChangeAlarmDialog()`
`37`	`37`
`38`	`38`	`void ChangeAlarmDialog::updateWidget(GlobalSettings _globalSettings)`
`39`	`39`	`{`
`40`		`- globalSettings = _globalSettings;`
	`40`	`+ globalSettings = std::move(_globalSettings);`
`41`	`41`
`42`	`42`	`ui->time->setDisplayFormat(globalSettings.alarmTimeFormat);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ ChangeTimerDialog::~ChangeTimerDialog()`
`48`	`48`
`49`	`49`	`void ChangeTimerDialog::updateWidget(GlobalSettings _globalSettings)`
`50`	`50`	`{`
`51`		`- globalSettings = _globalSettings;`
	`51`	`+ globalSettings = std::move(_globalSettings);`
`52`	`52`
`53`	`53`	`ui->interval->setDisplayFormat(globalSettings.timerTimeFormat);`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`smartTimerLog::smartTimerLog(QObject *parent) : par(parent)`
`16`	`16`	`{`
`17`	`17`	`this->par = parent;`
`18`		`- connect(par, SIGNAL(del(QList<TimerWidget>,QList<alertwidget>, GlobalSettings)), this, SLOT(saveLog(QList<TimerWidget>,QList<alertwidget>,GlobalSettings)));`
	`18`	`+ connect(par, SIGNAL(del(QList<TimerWidget>,QList<alertwidget>,GlobalSettings)), this, SLOT(saveLog(QList<TimerWidget>,QList<alertwidget>,GlobalSettings)));`
`19`	`19`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ TimerWidget::TimerWidget(WidgetSettings settings, QWidget *parent) :`
`17`	`17`	`{`
`18`	`18`	`ui->setupUi(this);`
`19`	`19`
`20`		`- Settings = settings;`
	`20`	`+ Settings = std::move(settings);`
`21`	`21`
`22`	`22`	`QFile file(":/stylesheet.qss");`
`23`	`23`	`if(file.open(QIODevice::ReadOnly \| QIODevice::Text))`
`@@ -105,7 +105,7 @@ void TimerWidget::setTimerDuration(int _duration)`
`105`	`105`
`106`	`106`	`void TimerWidget::updateWidget(GlobalSettings _globalSettings)`
`107`	`107`	`{`
`108`		`- globalSettings = _globalSettings;`
	`108`	`+ globalSettings = std::move(_globalSettings);`
`109`	`109`	`ui->intervalTime->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));`
`110`	`110`	`ui->timeLeft->setText((QTime::fromMSecsSinceStartOfDay(Settings.msecs)).toString(globalSettings.timerTimeFormat));`
`111`	`111`
`@@ -200,7 +200,7 @@ void TimerWidget::closeTimer()`
`200`	`200`
`201`	`201`	`void TimerWidget::setTimer(WidgetSettings _settings)`
`202`	`202`	`{`
`203`		`- Settings = _settings;`
	`203`	`+ Settings = std::move(_settings);`
`204`	`204`	`ui->intervalTime->setText(QTime::fromMSecsSinceStartOfDay(Settings.msecs).toString(globalSettings.timerTimeFormat));`
`205`	`205`	`ui->TimerName->setText(Settings.name);`
`206`	`206`