# HG changeset patch
# User Paul LEROY <paul.leroy@lpp.polytechnique.fr>
# Date 2014-04-14 07:38:14
# Node ID 17db61d84eef9c552cfaa4d5fd9756aec56ccb1b
# Parent  34aad6053543a6b77ea6f93960c4aef81a641b37

Minor updates for qt5 compatibility

diff --git a/parameterdump/parameterdump.h b/parameterdump/parameterdump.h
--- a/parameterdump/parameterdump.h
+++ b/parameterdump/parameterdump.h
@@ -11,10 +11,9 @@
 #include <tmpackettoread.h>
 #include <TC_types.h>
 
-#include "parameterdump_global.h"
 #include "tcpackettosend.h"
 
-class PARAMETERDUMPSHARED_EXPORT ParameterDump  : public QWidget
+class ParameterDump  : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/parameterdump/parameterdump.pro b/parameterdump/parameterdump.pro
--- a/parameterdump/parameterdump.pro
+++ b/parameterdump/parameterdump.pro
@@ -29,7 +29,6 @@ SOURCES += parameterdump.cpp \
     ../rmapplugin/tmpackettoread.cpp
 
 HEADERS += parameterdump.h \
-        parameterdump_global.h \
         tcpackettosend.h \
         ../../DEV_PLE/header/ccsds_types.h \
         ../../DEV_PLE/header/TC_types.h \
diff --git a/parameterdump/parameterdump_global.h b/parameterdump/parameterdump_global.h
deleted file mode 100644
--- a/parameterdump/parameterdump_global.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef PARAMETERDUMP_GLOBAL_H
-#define PARAMETERDUMP_GLOBAL_H
-
-#include <qglobal.h>
-
-#if defined(PARAMETERDUMP_LIBRARY)
-#  define PARAMETERDUMPSHARED_EXPORT Q_DECL_EXPORT
-#else
-#  define PARAMETERDUMPSHARED_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // PARAMETERDUMP_GLOBAL_H
diff --git a/parameterdump/tcpackettosend.h b/parameterdump/tcpackettosend.h
--- a/parameterdump/tcpackettosend.h
+++ b/parameterdump/tcpackettosend.h
@@ -6,7 +6,7 @@
 #include "parameterdump_global.h"
 #include <TC_types.h>
 
-class PARAMETERDUMPSHARED_EXPORT TCPacketToSend : public QObject
+class TCPacketToSend : public QObject
 {
     Q_OBJECT
 public:
diff --git a/wfdisplay/wfdisplay/pagespectra.h b/wfdisplay/wfdisplay/pagespectra.h
--- a/wfdisplay/wfdisplay/pagespectra.h
+++ b/wfdisplay/wfdisplay/pagespectra.h
@@ -1,8 +1,6 @@
 #ifndef PAGESPECTRA_H
 #define PAGESPECTRA_H
 
-#include "wfdisplay_global.h"
-
 #include <QMainWindow>
 #include <QRadioButton>
 #include <QPushButton>
diff --git a/wfdisplay/wfdisplay/wfdisplay.h b/wfdisplay/wfdisplay/wfdisplay.h
--- a/wfdisplay/wfdisplay/wfdisplay.h
+++ b/wfdisplay/wfdisplay/wfdisplay.h
@@ -1,8 +1,6 @@
 #ifndef WFDISPLAY_H
 #define WFDISPLAY_H
 
-#include "wfdisplay_global.h"
-
 #include <QWidget>
 #include <QGridLayout>
 #include <QVBoxLayout>
diff --git a/wfdisplay/wfdisplay/wfdisplay.pro b/wfdisplay/wfdisplay/wfdisplay.pro
--- a/wfdisplay/wfdisplay/wfdisplay.pro
+++ b/wfdisplay/wfdisplay/wfdisplay.pro
@@ -31,7 +31,6 @@ SOURCES += wfdisplay.cpp \
 
 
 HEADERS += wfdisplay.h\
-    wfdisplay_global.h \
     wfplot.h \
     wfpage.h \
     wfdisplay_params.h \
diff --git a/wfdisplay/wfdisplay/wfdisplay.pro.user b/wfdisplay/wfdisplay/wfdisplay.pro.user
--- a/wfdisplay/wfdisplay/wfdisplay.pro.user
+++ b/wfdisplay/wfdisplay/wfdisplay.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2014-03-27T10:13:46. -->
+<!-- Written by QtCreator 3.0.1, 2014-04-14T09:37:32. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/wfdisplay/wfdisplay/wfdisplay_global.h b/wfdisplay/wfdisplay/wfdisplay_global.h
deleted file mode 100644
--- a/wfdisplay/wfdisplay/wfdisplay_global.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef WFDISPLAY_GLOBAL_H
-#define WFDISPLAY_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#endif // WFDISPLAY_GLOBAL_H
diff --git a/wfdisplay/wfdisplay/wfpage.h b/wfdisplay/wfdisplay/wfpage.h
--- a/wfdisplay/wfdisplay/wfpage.h
+++ b/wfdisplay/wfdisplay/wfpage.h
@@ -1,8 +1,6 @@
 #ifndef WFPAGE_H
 #define WFPAGE_H
 
-#include "wfdisplay_global.h"
-
 #include <QMainWindow>
 #include <QRadioButton>
 #include <QPushButton>