Repo before provisional merging

include/Compilation.h

@@ -2,14 +2,13 @@
 #define _COMPILATION_H_
 
 #include "Project.h"
+#include "Compiler.h"
 
 #include <QString>
 #include <QStringList>
 #include <QMap>
 #include <QSet>
 
-class Compiler;
-
 class Compilation
 {
 public:
@@ -20,6 +19,8 @@ class Compilation
 	void addFile(const QString& file, bool remove = false);
 	void addFiles(const QStringList& files, bool remove = false);
 
+	const CompileResult& results();
+
 	void addCompileResult(const QString& file);
 	const QStringList& compileResults() const;
 
@@ -39,6 +40,7 @@ class Compilation
 	QSet<QString> m_files;
 	QStringList m_compileResults;
 	QStringList m_removes;
+	CompileResult m_results;
 };
 
 #endif

include/Compiler.h

@@ -32,19 +32,23 @@
 class CompileResult
 {
 public:
-	CompileResult(bool success, const QMap<QString, QStringList>& categorizedOutput);
+	CompileResult(bool success, const QMap<QString, QStringList>& categorizedOutput, const QString& raw = QString());
 	CompileResult(bool success);
 
 	const bool success() const;
+	const QString& raw() const;
 	const QStringList output(const QString& category) const;
 	const QMap<QString, QStringList>& categorizedOutput() const;
 
+	void clear();
+
 	void addCompileResult(const CompileResult& rhs);
 	CompileResult& operator+=(const CompileResult& rhs);
 	CompileResult operator+(const CompileResult& rhs) const;
 private:
 	bool m_success;
 	QMap<QString, QStringList> m_categorizedOutput;
+	QString m_raw;
 };
 
 class Compilation;

include/MainWindow.h

@@ -32,6 +32,7 @@
 
 #include "MenuManager.h"
 #include "ScriptEnvironment.h"
+#include "Compiler.h"
 
 #include "ProjectsModel.h"
 
@@ -45,19 +46,6 @@
 class QListWidgetItem;
 class SourceFile;
 
-struct Messages
-{
-	Messages() {}
-
-	Messages(QStringList errors, QStringList warnings, QStringList linker, QStringList verbose)
-		: errors(errors), warnings(warnings), linker(linker), verbose(verbose) {}
-
-	QStringList errors;
-	QStringList warnings;
-	QStringList linker;
-	QStringList verbose;
-};
-
 /*! \class MainWindow
  * \brief Holds tabs to display
  *
@@ -110,11 +98,8 @@ class MainWindow : public QMainWindow, private Ui::MainWindow
 	void setStatusMessage(const QString& message, int time = 0);
 
 	/*! Shows given errors in Error View */
-	void setErrors(TabbedWidget* tab, 
-		const QStringList& errors, const QStringList& warnings, 
-		const QStringList& linker, const QStringList& verbose);
-
-	void showErrors(TabbedWidget* tab);
+	void setErrors(const WorkingUnit* unit, const CompileResult& results);
+	void showErrors(const WorkingUnit* unit);
 
 	void hideErrors();
 
@@ -174,6 +159,7 @@ class MainWindow : public QMainWindow, private Ui::MainWindow
 	bool canGoNext();
 
 	Project* activeProject() const;
+	ProjectsModel* projectsModel();
 
 	friend class MainWindowMenu;
 
@@ -189,8 +175,6 @@ public slots:
 	bool closeFile(const QString& file);
 	bool closeNode(const TinyNode* node);
 	void about();
-	void errorViewShowVerbose();
-	void errorViewShowSimple();
 	void settings();
 	void managePackages();
 	void installLocalPackage();
@@ -222,11 +206,8 @@ private slots:
 
 private:
 	TabbedWidget* m_currentTab;
-	TabbedWidget* m_errorTab;
 	EditorSettingsDialog m_editorSettingsDialog;
-	QMap<TabbedWidget*, Messages> m_messages;
 	QMap<QWidget*, TabbedWidget*> m_lookup;
-	QListWidget m_errorList, m_warningList, m_linkErrorList, m_verboseList;
 	MenuManager m_menuManager;
 	QList<Menuable*> m_menuables;
 	ScriptEnvironment m_scriptEnvironment;

include/WorkingUnit.h

@@ -18,6 +18,8 @@ class WorkingUnit
 	void setParentUnit(WorkingUnit* parent);
 	WorkingUnit* parentUnit() const;
 
+	const WorkingUnit* topLevelUnit() const;
+
 	QString workingUnitPath() const;
 
 private:

include/dialogs/ProjectSaveAs.h

@@ -13,7 +13,6 @@ Q_OBJECT
 public:
 	ProjectSaveAs(MainWindow* mainWindow);
 
-	void setProjectManager(ProjectManager* project);
 	void setDefaultProject(Project* project);
 
 	Project* activeProject() const;
@@ -31,7 +30,6 @@ private slots:
 	void updateActiveLabel();
 
 	MainWindow* m_mainWindow;
-	ProjectsModel m_model;
 
 	Project* m_active;
 	const TinyNode* m_parent;

include/project/ArchiveWriter.h

@@ -17,7 +17,7 @@ class ArchiveWriter
 	const QDir& root() const;
 	const TinyArchive* archive() const;
 
-	const bool write(const int& mode);
+	const bool write(const int& mode = Delta);
 
 	enum Mode {
 		Delta,

include/provisional/Device.h

@@ -0,0 +1,37 @@
+#ifndef _DEVICE_H_
+#define _DEVICE_H_
+
+#include "Named.h"
+#include "QTinyArchive.h"
+
+#include <QString>
+#include <QMap>
+#include <boost/shared_ptr.hpp>
+
+class Project;
+
+#define NOT_AVAILABLE "N/A"
+
+#define DISPLAY_NAME "disp_name"
+#define SERIAL "serial"
+
+#define DOWNLOAD_TYPE "download_type"
+#define DOWNLOAD_SRC "src"
+#define DOWNLOAD_BIN "bin"
+
+class Device : public Named
+{
+public:
+	Device(const QString& name);
+	virtual ~Device();
+
+	virtual const QMap<QString, QString> information() = 0;
+	virtual const bool available() = 0;
+	virtual const bool download(const QString& name, TinyArchive* archive) = 0;
+	virtual const bool run(const QString& name) = 0;
+};
+
+typedef boost::shared_ptr<Device> DevicePtr;
+
+
+#endif

include/provisional/DeviceInterface.h

@@ -0,0 +1,18 @@
+#ifndef _DEVICEINTERFACE_H_
+#define _DEVICEINTERFACE_H_
+
+#include "Named.h"
+#include "Device.h"
+
+#include <QList>
+#include <QString>
+
+class DeviceInterface : public Named
+{
+public:
+	DeviceInterface(const QString& name);
+
+	virtual QList<DevicePtr> devices() = 0;
+};
+
+#endif

include/provisional/MessageDefines.h

@@ -0,0 +1,9 @@
+#ifndef _MESSAGEDEFINES_H_
+#define _MESSAGEDEFINES_H_
+
+#define MESSAGE_AVAILABLE 1
+#define MESSAGE_INFORMATION 2
+#define MESSAGE_DOWNLOAD 3
+#define MESSAGE_RUN 4
+
+#endif

include/provisional/Named.h

@@ -0,0 +1,15 @@
+#ifndef _NAMED_H_
+#define _NAMED_H_
+
+#include <QString>
+
+class Named
+{
+public:
+	Named(const QString& name);
+	const QString& name() const;
+private:
+	const QString m_name;
+};
+
+#endif

include/provisional/QTinyArchiveStream.h

@@ -0,0 +1,20 @@
+#ifndef _QTINYARCHIVESTREAM_H_
+#define _QTINYARCHIVESTREAM_H_
+
+#include "TinyArchive.h"
+
+class QTinyArchiveStream : public TinyArchiveReader, public TinyArchiveWriter
+{
+public:
+	QTinyArchiveStream(QIODevice* device);
+
+	virtual bool write(const TinyArchive* archive) const;
+	virtual TinyArchive* read() const;
+
+protected:
+	virtual TinyNode* deserializeNode() const;
+
+	QIODevice* m_device;
+};
+
+#endif

include/provisional/Target.h

@@ -0,0 +1,18 @@
+#ifndef _TARGET_H_
+#define _TARGET_H_
+
+#include "Named.h"
+#include <QList>
+
+class Target : public Named
+{
+public:
+	Target(const QString& name, const QList<DeviceInterface*> interfaces);
+	~Target();
+
+	const QList<DeviceInterface*>& interfaces() const;
+private:
+	QList<DeviceInterface*> m_interfaces;
+};
+
+#endif

include/provisional/TcpNetworkDevice.h

@@ -0,0 +1,31 @@
+#ifndef _TCPNETWORKDEVICE_H_
+#define _TCPNETWORKDEVICE_H_
+
+#include "Device.h"
+
+#include <QTcpSocket>
+
+class TcpNetworkDevice : public Device
+{
+public:
+	TcpNetworkDevice(const QHostAddress& address, const quint16& port);
+
+	const QMap<QString, QString> information();
+	virtual const bool available();
+	virtual const bool download(const QString& name, TinyArchive* archive);
+	virtual const bool run(const QString& name);
+
+private:
+	const bool connect();
+	void disconnect();
+
+	const bool waitWrite();
+	const bool waitRead();
+
+	QHostAddress m_address;
+	quint16 m_port;
+	QTcpSocket* m_socket;
+};
+
+
+#endif

include/provisional/ThisMachineTarget.h

@@ -0,0 +1,12 @@
+#ifndef _THISMACHINETARGET_H_
+#define _THISMACHINETARGET_H_
+
+#include "Target.h"
+
+class ThisMachineTarget : public Target
+{
+public:
+	ThisMachineTarget();
+};
+
+#endif

include/widgets/ErrorWidget.h

@@ -5,20 +5,26 @@
 #include "Compiler.h"
 #include "WorkingUnit.h"
 
+#define DEFAULT_ERROR_KEY "Errors"
+#define DEFAULT_WARNING_KEY "Warnings"
+#define DEFAULT_LINKER_KEY "Linker"
+
 class ErrorWidget : public QWidget, private Ui::ErrorWidget
 {
+Q_OBJECT
 public:
 	ErrorWidget(QWidget* parent = 0);
 
-	void setCompileResults(WorkingUnit* unit, const CompileResults& results);
+	void setCompileResult(const WorkingUnit* unit, const CompileResult& results);
 public slots:
-	void workingUnitChanged(WorkingUnit* unit);
+	void workingUnitChanged(const WorkingUnit* current);
 private slots:
 	void on_ui_viewMode_currentIndexChanged(int index);
 private:
 	void setCategorized();
 	void setRaw();
-	WorkingUnit* m_unit;
+	const WorkingUnit* m_current;
+	const WorkingUnit* m_unit;
 };
 
 #endif

include/widgets/TitleDescriptionWidget.h

@@ -10,6 +10,7 @@ Q_OBJECT
 public:
 	TitleDescriptionWidget(QWidget* parent);
 	TitleDescriptionWidget(const QString& title, const QString& description, QWidget* parent);
+	TitleDescriptionWidget(const QString& title, const QString& description, const QString& decoration, QWidget* parent);
 };
 
 #endif

src/CommandChain.cpp

@@ -147,8 +147,6 @@ bool CommandChain::execute()
 		}
 	}
 	if(drainExecuting()) return false;
-	m_chainSession->out()->seek(0);
-	m_chainSession->err()->seek(0);
 	return true;
 }