- Remove includes of metatypes.h

- Remove "noexcept" from connectActions() to avoid the need of #ifdef

diff --git a/datamanager.h b/datamanager.h
index 0c0dcaab79455a5695a6b4ed674d28cd93d5d701..1d98f9b9aa9ca5641c7c33188e0dcbf0dd6931ed 100644 (file)
--- 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 b4795aa0a8145b4a1b4766d03b35042ac94aa903..9177a047ae6a80193e43954772970abd4fed2d1b 100644 (file)
--- 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 158a3c65c7a126f876e97b128ec3b0252a6a088d..5da3a9e146e975d67c71fdde9664b85de5ca4dd1 100644 (file)
--- 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 bab4ce61a04abfe15c7e2528d0bb8d8253b0826d..5a3b4f334fd6728ea3f84fe3b3b6ff3a345befd5 100644 (file)
--- 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 a16616bd13820e0022970a509cb731b7d8688e51..a201577c541a667cf2dd5a15a0059751900c8892 100644 (file)
--- 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;