From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Thu, 12 Mar 2015 23:47:31 +0000 (+0100)
Subject: - Remove includes of metatypes.h
X-Git-Tag: 0.4b~5
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=440b2f9c9363f3fc7f01242719372a0034a873ba;p=anyanka.git

- Remove includes of metatypes.h
- Remove "noexcept" from connectActions() to avoid the need of #ifdef
---

diff --git a/datamanager.h b/datamanager.h
index 0c0dcaa..1d98f9b 100644
--- a/datamanager.h
+++ b/datamanager.h
@@ -37,7 +37,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QTextCodec>
 #include <QtCore/QTime>
-#include "metatypes.h"
 
 typedef std::function<void (DataFileExporter::WriteList&, const std::shared_ptr<SingleRunData>, std::vector<std::string>&)> GeneratorFunc;
 typedef std::map<const std::string, std::shared_ptr<Sequence>> SequenceMap;
diff --git a/gui/graphview.h b/gui/graphview.h
index b4795aa..9177a04 100644
--- a/gui/graphview.h
+++ b/gui/graphview.h
@@ -26,7 +26,6 @@
 
 #include "gui/graphviewcontextmenu.h"
 #include "signaldrawer.h"
-#include "metatypes.h"
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QWidget>
 
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 158a3c6..5da3a9e 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -55,11 +55,7 @@ void MainWindow::setSingleRunsListModel(SingleRunsSelectorModel* model)
 
 /* Private methods */
 
-#ifdef Q_OS_UNIX
-void MainWindow::connectActions() noexcept
-#elif defined Q_OS_WIN
 void MainWindow::connectActions()
-#endif
 {
   /* Controls panel */
   connect(ui->qpb_integrateBaseline, SIGNAL(pressed()), this, SLOT(onIntegrateBaselineSelected()));
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index bab4ce6..5a3b4f3 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -32,7 +32,6 @@
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMainWindow>
 #include <QtWidgets/QSplitter>
-#include "metatypes.h"
 
 namespace Ui {
   class MainWindow;
@@ -49,11 +48,7 @@ public:
   void setSingleRunsListModel(SingleRunsSelectorModel* model);
 
 private:
-#ifdef Q_OS_UNIX
-  void connectActions() noexcept;
-#elif defined Q_OS_WIN
   void connectActions();
-#endif
 
   //std::vector<SignalView*> m_itemsOnDashboard;
   QSplitter* m_dashboard;
diff --git a/main.cpp b/main.cpp
index a16616b..a201577 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,11 +35,6 @@ int main(int argc, char *argv[])
   a.setOrganizationName(GlobalInfo::ORG_NAME);
   UserSettings::initialize();
 
-#ifndef _MSC_VER
-#warning Revisit the metatype shared_ptr<SignalView> registration
-#endif
-  //qRegisterMetaType<std::shared_ptr<SignalView>>();
-
   Logger::initializeGlobal();
   Logger::setPrintLevel(Logger::Level::DEBUG);
   std::unique_ptr<DataManager> dMgr;