Replaced include guards with #pragma once as its easier to maintain; renamed EzBuilder to Builder; removed unused parameters in SpinParser functions.

Author: bweir

src/propelleride/EzBuilder.cpp renamed to src/propelleride/Builder.cpp

@@ -1,10 +1,10 @@
-#include "EzBuilder.h"
+#include "Builder.h"
 
-EzBuilder::EzBuilder(QObject *parent) : QObject(parent)
+Builder::Builder(QObject *parent) : QObject(parent)
 {
 }
 
-void EzBuilder::setParameters(QString comp, QString incl, QString compPath, QString projFile, QString compstat)
+void Builder::setParameters(QString comp, QString incl, QString compPath, QString projFile, QString compstat)
 {
     compilerStr = comp;
     compilerPath = compPath;
@@ -13,15 +13,15 @@ void EzBuilder::setParameters(QString comp, QString incl, QString compPath, QStr
     compileResult = compstat;
 }
 
-void EzBuilder::setObjects(QLabel *stat, QLabel *progsize, QProgressBar *progbar, QComboBox *ports)
+void Builder::setObjects(QLabel *stat, QLabel *progsize, QProgressBar *progbar, QComboBox *ports)
 {
     msgLabel = stat;
     sizeLabel = progsize;
     progress = progbar;
     cbPort = ports;
 }
 
-QString EzBuilder::filePathName(QString fileName)
+QString Builder::filePathName(QString fileName)
 {
     QString rets;
     if(fileName.lastIndexOf("/") > -1)
@@ -31,28 +31,28 @@ QString EzBuilder::filePathName(QString fileName)
     return rets;
 }
 
-int EzBuilder::runCompiler(QString copts)
+int Builder::runCompiler(QString copts)
 {
     // satisfy warnings only
     if(copts.length())
         return 0;
     return 0;
 }
 
-void EzBuilder::compilerError(QProcess::ProcessError error)
+void Builder::compilerError(QProcess::ProcessError error)
 {
     // satisfy warnings only
     if(error != QProcess::Crashed) return;
 }
 
-void EzBuilder::compilerFinished(int exitCode, QProcess::ExitStatus status)
+void Builder::compilerFinished(int exitCode, QProcess::ExitStatus status)
 {
     // satisfy warnings only
     if(exitCode) return;
     if(status != QProcess::CrashExit) return;
 }
 
-void EzBuilder::procReadyRead()
+void Builder::procReadyRead()
 {
 }
 

src/propelleride/EzBuilder.h renamed to src/propelleride/Builder.h

@@ -1,5 +1,4 @@
-#ifndef EZBUILDER_H
-#define EZBUILDER_H
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -9,11 +8,11 @@
 #include <QProcess>
 #include <QMutex>
 
-class EzBuilder : public QObject
+class Builder : public QObject
 {
     Q_OBJECT
 public:
-    explicit EzBuilder(QObject *parent = 0);
+    explicit Builder(QObject *parent = 0);
 
     void setParameters(QString comp, QString incl, QString compPath, QString projFile, QString compstat);
     void setObjects(QLabel *stat, QLabel *progsize, QProgressBar *progbar, QComboBox *ports);
@@ -53,5 +52,3 @@ public slots:
     QMutex      procMutex;
     bool        procDone;
 };
-
-#endif // EZBUILDER_H

src/propelleride/PortConnectionMonitor.h

@@ -1,5 +1,4 @@
-#ifndef PORTCONNECTIONMONITOR_H
-#define PORTCONNECTIONMONITOR_H
+#pragma once
 
 #include <QThread>
 #include <QObject>
@@ -27,5 +26,3 @@ public slots:
     bool running;
 
 };
-
-#endif // PORTCONNECTIONMONITOR_H

src/propelleride/PortListener.h

@@ -1,5 +1,4 @@
-#ifndef PORTLISTENER_H_
-#define PORTLISTENER_H_
+#pragma once
 
 #include <QObject>
 #include <QThread>
@@ -170,6 +169,3 @@ public slots:
     void flushPort();
 
 };
-
-
-#endif /*PORTLISTENER_H_*/

src/propelleride/Preferences.h

@@ -1,5 +1,4 @@
-#ifndef PREFERENCES_H
-#define PREFERENCES_H
+#pragma once
 
 #include <Qt>
 #include <QWidget>
@@ -217,5 +216,3 @@ public slots:
 
     QVector<PColor*> propertyColors;
 };
-
-#endif // PREFERENCES_H 

src/propelleride/Sleeper.h

@@ -1,5 +1,4 @@
-#ifndef SLEEPER_H
-#define SLEEPER_H
+#pragma once
 
 #include <QThread>
 
@@ -15,6 +14,3 @@ class Sleeper : QThread
         sleep(s);
     }
 };
-
-
-#endif // SLEEPER_H

src/propelleride/SpinBuilder.cpp

@@ -9,7 +9,7 @@
 
 #include "Sleeper.h"
 
-SpinBuilder::SpinBuilder() : EzBuilder(0)
+SpinBuilder::SpinBuilder() : Builder(0)
 {
 }
 

src/propelleride/SpinBuilder.h

@@ -1,12 +1,11 @@
-#ifndef SPINBUILDER_H
-#define SPINBUILDER_H
+#pragma once
 
-#include "EzBuilder.h"
+#include "Builder.h"
 
 #include <QStringList>
 #include <QProcess>
 
-class SpinBuilder : public EzBuilder
+class SpinBuilder : public Builder
 {
 public:
     SpinBuilder();
@@ -26,5 +25,3 @@ class SpinBuilder : public EzBuilder
     QStringList getCompilerParameters();
     bool receiving;
 };
-
-#endif // SPINBUILDER_H

src/propelleride/SpinModel.h

@@ -1,5 +1,4 @@
-#ifndef SPINMODEL_H
-#define SPINMODEL_H
+#pragma once
 
 #include <QAbstractItemModel>
 #include <QModelIndex>
@@ -24,6 +23,3 @@ class SpinModel : public TreeModel
     bool isSectionHead(QString s, QString nocmp);
     QString removeComments(QString text);
 };
-//! [0]
-
-#endif

src/propelleride/SpinParser.cpp

@@ -220,7 +220,7 @@ QStringList SpinParser::spinMethods(QString file, QString objname)
     return list;
 }
 
-QStringList SpinParser::spinDat(QString file, QString objname)
+QStringList SpinParser::spinDat(QString objname)
 {
     QStringList list;
     QStringList keys = db.keys();
@@ -240,7 +240,7 @@ QStringList SpinParser::spinDat(QString file, QString objname)
     return list;
 }
 
-QStringList SpinParser::spinVars(QString file, QString objname)
+QStringList SpinParser::spinVars(QString objname)
 {
     QStringList list;
     QStringList keys = db.keys();
@@ -260,7 +260,7 @@ QStringList SpinParser::spinVars(QString file, QString objname)
     return list;
 }
 
-QStringList SpinParser::spinObjects(QString file, QString objname)
+QStringList SpinParser::spinObjects(QString objname)
 {
     QStringList list;
     QStringList keys = db.keys();