summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Brentjes <d.brentjes@gmail.com>2014-05-06 13:26:27 +0200
committerDennis Brentjes <d.brentjes@gmail.com>2014-05-06 13:26:27 +0200
commit7f6f356e4498cf545209f4cb9ee5588d898ebb51 (patch)
tree9cdb2578764aa4d65c07c1f9fc05460aa11d5c01
parenta8d753c769fb98dc27066aed0f4df8fe101ad842 (diff)
downloadgeneric-gui-7f6f356e4498cf545209f4cb9ee5588d898ebb51.tar.gz
generic-gui-7f6f356e4498cf545209f4cb9ee5588d898ebb51.tar.bz2
generic-gui-7f6f356e4498cf545209f4cb9ee5588d898ebb51.zip
Cleans up some inclusions
-rw-r--r--fusion_model.hpp1
-rw-r--r--fusion_outputter.hpp1
-rw-r--r--gui_item_delegate.cpp7
-rw-r--r--main.cpp1
-rw-r--r--qt_adapter.hpp3
5 files changed, 4 insertions, 9 deletions
diff --git a/fusion_model.hpp b/fusion_model.hpp
index 116e49f..3d71f8d 100644
--- a/fusion_model.hpp
+++ b/fusion_model.hpp
@@ -9,7 +9,6 @@
#include <vector>
#include <map>
-#include <iostream>
template <typename T>
struct fusion_model {
diff --git a/fusion_outputter.hpp b/fusion_outputter.hpp
index d148c8d..3c3d5c4 100644
--- a/fusion_outputter.hpp
+++ b/fusion_outputter.hpp
@@ -6,7 +6,6 @@
#include <boost/fusion/include/map.hpp>
#include <boost/fusion/include/vector.hpp>
-#include <iostream>
#include <ostream>
#include <vector>
#include <string>
diff --git a/gui_item_delegate.cpp b/gui_item_delegate.cpp
index 4a3633f..2eafa44 100644
--- a/gui_item_delegate.cpp
+++ b/gui_item_delegate.cpp
@@ -1,9 +1,8 @@
-#include "meta_types.hpp"
-
#include "gui_item_delegate.hpp"
+#include "meta_types.hpp"
+
#include <QMetaProperty>
-#include <iostream>
GuiItemDelegate::GuiItemDelegate(QObject *parent) :
QStyledItemDelegate(parent)
@@ -16,9 +15,7 @@ void GuiItemDelegate::setModelData(QWidget* widget, QAbstractItemModel* model, c
QByteArray n = widget->metaObject()->userProperty().name();
QVariant variant = widget->property(n);
- std::cout << std::string(widget->metaObject()->userProperty().typeName()) << std::endl;
if(variant.userType() == QVariant::String && variant.userType() != QMetaType::Float) {
- std::cout << "lolwut" << std::endl;
model->setData(index, QVariant::fromValue(variant.toString().toStdString()), Qt::EditRole);
} else {
QStyledItemDelegate::setModelData(widget, model, index);
diff --git a/main.cpp b/main.cpp
index 262c1e9..e378fcb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,7 +2,6 @@
#include "main_window.hpp"
#include "fusion_model.hpp"
#include "qt_adapter.hpp"
-#include "gui_item_delegate.hpp"
#include "meta_types.hpp"
#include "fusion_outputter.hpp"
diff --git a/qt_adapter.hpp b/qt_adapter.hpp
index 2e6548a..c0aba79 100644
--- a/qt_adapter.hpp
+++ b/qt_adapter.hpp
@@ -8,11 +8,12 @@
#include <QAbstractTableModel>
#include <QTableView>
#include <QVariant>
-#include <QMetaType>
#include <memory>
#include <string>
#include <iostream>
+#include <vector>
+#include <map>
template <typename T>
struct QtModelType