Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed kar.hpp include and lowercased kiss namespace

  • Loading branch information...
commit 2130b5264353aa96248d7446f8b526821534b14b 1 parent 5858087
@nzrock95 nzrock95 authored
View
6 include/compile_worker.hpp
@@ -3,7 +3,7 @@
#include <QThread>
-#include <kar.hpp>
+#include <kar/kar.hpp>
#include <pcompiler/output.hpp>
#include <pcompiler/progress.hpp>
@@ -13,7 +13,7 @@ class CompileWorker : public QThread, public Compiler::Progress
{
Q_OBJECT
public:
- CompileWorker(const Kiss::KarPtr &archive, KovanSerial *proto, QObject *parent = 0);
+ CompileWorker(const kiss::KarPtr &archive, KovanSerial *proto, QObject *parent = 0);
void run();
@@ -30,7 +30,7 @@ Q_OBJECT
Compiler::OutputList compile();
static QString tempPath();
- Kiss::KarPtr m_archive;
+ kiss::KarPtr m_archive;
KovanSerial *m_proto;
Compiler::OutputList m_output;
QString m_userRoot;
View
2  include/server_thread.hpp
@@ -5,7 +5,7 @@
#include <QString>
#include <QRunnable>
-#include <kar.hpp>
+#include <kar/kar.hpp>
#include <kovanserial/transport_layer.hpp>
class TcpServer;
View
4 src/compile_worker.cpp
@@ -44,7 +44,7 @@ struct Cleaner
QString path;
};
-CompileWorker::CompileWorker(const Kiss::KarPtr &archive, KovanSerial *proto, QObject *parent)
+CompileWorker::CompileWorker(const kiss::KarPtr &archive, KovanSerial *proto, QObject *parent)
: QThread(parent),
m_archive(archive),
m_proto(proto)
@@ -87,7 +87,7 @@ void CompileWorker::progress(double fraction)
Compiler::OutputList CompileWorker::compile()
{
using namespace Compiler;
- using namespace Kiss;
+ using namespace kiss;
// Extract the archive to a temporary directory
m_tempDir = tempPath();
View
4 src/server_thread.cpp
@@ -129,7 +129,7 @@ void ServerThread::handleArchive(const Packet &headerPacket)
qDebug() << "Took" << (end - start) << "milliseconds to recv";
// Load up the archive
- Kiss::Kar *archive = new Kiss::Kar();
+ kiss::Kar *archive = new kiss::Kar();
std::string data = file.str();
QByteArray arr(data.c_str(), data.size());
QDataStream stream(arr);
@@ -157,7 +157,7 @@ void ServerThread::handleAction(const Packet &action)
if(type == COMMAND_ACTION_COMPILE) {
const QString archivePath = m_userRoot + "/archives/" + name;
- const Kiss::KarPtr archive = Kiss::Kar::load(archivePath);
+ const kiss::KarPtr archive = kiss::Kar::load(archivePath);
QFile file(":/target.c");
if(!file.open(QIODevice::ReadOnly)) {
Please sign in to comment.
Something went wrong with that request. Please try again.