Merge pull request #10 from bweir/master

More code cleanup

Author: bweir

README.md

@@ -27,8 +27,6 @@ PropellerIDE was created using C++ and Qt.
 
 ## Building
 
-PropellerIDE 
-
 ### Dependencies
 
 PropellerIDE can be built against Qt4 or Qt5.

src/prebuilt/win32/p1load.exe

@@ -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()
 {
 }
 

gfx/propellerhat.ico renamed to src/prebuilt/win32/propellerhat.ico

@@ -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/EzBuilder.cpp renamed to src/propelleride/Builder.cpp

@@ -1,4 +1,4 @@
-#include "console.h"
+#include "Console.h"
 #include "Sleeper.h"
 
 #include <QApplication>

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

@@ -1,5 +1,4 @@
-#ifndef CONSOLE_H
-#define CONSOLE_H
+#pragma once
 
 #include <QWidget>
 #include <QTabWidget>
@@ -158,5 +157,3 @@ public slots:
     void update(char ch);
 
 };
-
-#endif // CONSOLE_H

src/propelleride/console.cpp renamed to src/propelleride/Console.cpp

@@ -45,7 +45,7 @@
 **
 ****************************************************************************/
 
-#include "highlighter.h"
+#include "Highlighter.h"
 
 #include <QSettings>
 #include <QVariant>

src/propelleride/console.h renamed to src/propelleride/Console.h

@@ -1,3 +1,5 @@
+#pragma once
+
 /****************************************************************************
   The basis of this code is the Qt Highlighter example having the copyright
   below. This code is substanially different for choosing the rules, and it
@@ -45,9 +47,6 @@
 **
 ****************************************************************************/
 
-#ifndef HIGHLIGHTER_H
-#define HIGHLIGHTER_H
-
 #include <QSyntaxHighlighter>
 
 #include <QHash>
@@ -125,5 +124,3 @@ class Highlighter : public QSyntaxHighlighter
     QFont::Weight   hlBlockComWeight;
     Qt::GlobalColor hlBlockComColor;
 };
-
-#endif

src/propelleride/highlighter.cpp renamed to src/propelleride/Highlighter.cpp

@@ -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