--- a/src/CMakeLists.txt Wed Feb 20 11:30:49 2019 +0100
+++ b/src/CMakeLists.txt Sat Mar 30 16:14:41 2019 +0100
@@ -37,7 +37,7 @@
# Executable output:
add_executable(
${EXECUTABLE_FILE}
- QtRelationalReaderStringHadler.h # QObjects must be listed here (including them from other files is not enough)
+ QtRelationalReaderStringHandler.h # QObjects must be listed here (including them from other files is not enough)
RelpipeChartWidget.h
RelpipeTableModel.h
RelpipeChartMainWindow.ui
--- a/src/QtRelationalReaderStringHadler.h Wed Feb 20 11:30:49 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/**
- * Relational pipes
- * Copyright © 2018 František Kučera (Frantovo.cz, GlobalCode.info)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include <QObject>
-
-#include <relpipe/reader/typedefs.h>
-#include <relpipe/reader/TypeId.h>
-#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
-#include <relpipe/reader/handlers/AttributeMetadata.h>
-
-using namespace relpipe::reader;
-using namespace relpipe::reader::handlers;
-
-class QtRelationalReaderStringHadler : public QObject, public RelationalReaderStringHadler {
-
- Q_OBJECT
-public:
- QtRelationalReaderStringHadler(QObject* parent) : QObject(parent) {
- }
-
- virtual ~QtRelationalReaderStringHadler() {
- }
-
- virtual void startRelation(string_t name, std::vector<AttributeMetadata> attributes) override {
- emit startRelationReceived(name, attributes);
- }
-
- virtual void attribute(const string_t& value) override {
- emit attributeReceived(value);
- };
-
- virtual void endOfPipe() override {
- emit endOfPipeReceived();
- };
-
-signals:
- void startRelationReceived(const string_t name, std::vector<AttributeMetadata> attributes);
- void attributeReceived(const string_t value);
- void endOfPipeReceived();
-};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/QtRelationalReaderStringHandler.h Sat Mar 30 16:14:41 2019 +0100
@@ -0,0 +1,56 @@
+/**
+ * Relational pipes
+ * Copyright © 2018 František Kučera (Frantovo.cz, GlobalCode.info)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <QObject>
+
+#include <relpipe/reader/typedefs.h>
+#include <relpipe/reader/TypeId.h>
+#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
+#include <relpipe/reader/handlers/AttributeMetadata.h>
+
+using namespace relpipe::reader;
+using namespace relpipe::reader::handlers;
+
+class QtRelationalReaderStringHandler : public QObject, public RelationalReaderStringHandler {
+
+ Q_OBJECT
+public:
+ QtRelationalReaderStringHandler(QObject* parent) : QObject(parent) {
+ }
+
+ virtual ~QtRelationalReaderStringHandler() {
+ }
+
+ virtual void startRelation(string_t name, std::vector<AttributeMetadata> attributes) override {
+ emit startRelationReceived(name, attributes);
+ }
+
+ virtual void attribute(const string_t& value) override {
+ emit attributeReceived(value);
+ };
+
+ virtual void endOfPipe() override {
+ emit endOfPipeReceived();
+ };
+
+signals:
+ void startRelationReceived(const string_t name, std::vector<AttributeMetadata> attributes);
+ void attributeReceived(const string_t value);
+ void endOfPipeReceived();
+};
--- a/src/relpipe-out-gui.cpp Wed Feb 20 11:30:49 2019 +0100
+++ b/src/relpipe-out-gui.cpp Sat Mar 30 16:14:41 2019 +0100
@@ -30,7 +30,7 @@
#include <relpipe/reader/RelpipeReaderException.h>
#include "RelpipeChartMainWindow.h"
-#include "QtRelationalReaderStringHadler.h"
+#include "QtRelationalReaderStringHandler.h"
using namespace relpipe::cli;
using namespace relpipe::reader;
@@ -78,15 +78,15 @@
RelationalReaderThread t(reader);
// Proxy that passes calls from the background thread to the GUI thread using signal-slot mechanism:
- QtRelationalReaderStringHadler handler(&t); // &t instead of handler.moveToThread(&t); // QObject::moveToThread: Cannot move objects with a parent
+ QtRelationalReaderStringHandler handler(&t); // &t instead of handler.moveToThread(&t); // QObject::moveToThread: Cannot move objects with a parent
// see Q_DECLARE_METATYPE above
qRegisterMetaType<string_t>();
qRegisterMetaType<std::vector < AttributeMetadata >> ();
- QObject::connect(&handler, &QtRelationalReaderStringHadler::startRelationReceived, &window, &RelpipeChartMainWindow::startRelation, Qt::ConnectionType::QueuedConnection);
- QObject::connect(&handler, &QtRelationalReaderStringHadler::attributeReceived, &window, &RelpipeChartMainWindow::attribute, Qt::ConnectionType::QueuedConnection);
- QObject::connect(&handler, &QtRelationalReaderStringHadler::endOfPipeReceived, &window, &RelpipeChartMainWindow::endOfPipe, Qt::ConnectionType::QueuedConnection);
+ QObject::connect(&handler, &QtRelationalReaderStringHandler::startRelationReceived, &window, &RelpipeChartMainWindow::startRelation, Qt::ConnectionType::QueuedConnection);
+ QObject::connect(&handler, &QtRelationalReaderStringHandler::attributeReceived, &window, &RelpipeChartMainWindow::attribute, Qt::ConnectionType::QueuedConnection);
+ QObject::connect(&handler, &QtRelationalReaderStringHandler::endOfPipeReceived, &window, &RelpipeChartMainWindow::endOfPipe, Qt::ConnectionType::QueuedConnection);
reader->addHandler(&handler);