##// END OF EJS Templates
Minor updates for qt5 compatibility
leroy -
r66:17db61d84eef default
parent child
Show More
@@ -11,10 +11,9
11 #include <tmpackettoread.h>
11 #include <tmpackettoread.h>
12 #include <TC_types.h>
12 #include <TC_types.h>
13
13
14 #include "parameterdump_global.h"
15 #include "tcpackettosend.h"
14 #include "tcpackettosend.h"
16
15
17 class PARAMETERDUMPSHARED_EXPORT ParameterDump : public QWidget
16 class ParameterDump : public QWidget
18 {
17 {
19 Q_OBJECT
18 Q_OBJECT
20 public:
19 public:
@@ -29,7 +29,6 SOURCES += parameterdump.cpp \
29 ../rmapplugin/tmpackettoread.cpp
29 ../rmapplugin/tmpackettoread.cpp
30
30
31 HEADERS += parameterdump.h \
31 HEADERS += parameterdump.h \
32 parameterdump_global.h \
33 tcpackettosend.h \
32 tcpackettosend.h \
34 ../../DEV_PLE/header/ccsds_types.h \
33 ../../DEV_PLE/header/ccsds_types.h \
35 ../../DEV_PLE/header/TC_types.h \
34 ../../DEV_PLE/header/TC_types.h \
@@ -6,7 +6,7
6 #include "parameterdump_global.h"
6 #include "parameterdump_global.h"
7 #include <TC_types.h>
7 #include <TC_types.h>
8
8
9 class PARAMETERDUMPSHARED_EXPORT TCPacketToSend : public QObject
9 class TCPacketToSend : public QObject
10 {
10 {
11 Q_OBJECT
11 Q_OBJECT
12 public:
12 public:
@@ -1,8 +1,6
1 #ifndef PAGESPECTRA_H
1 #ifndef PAGESPECTRA_H
2 #define PAGESPECTRA_H
2 #define PAGESPECTRA_H
3
3
4 #include "wfdisplay_global.h"
5
6 #include <QMainWindow>
4 #include <QMainWindow>
7 #include <QRadioButton>
5 #include <QRadioButton>
8 #include <QPushButton>
6 #include <QPushButton>
@@ -1,8 +1,6
1 #ifndef WFDISPLAY_H
1 #ifndef WFDISPLAY_H
2 #define WFDISPLAY_H
2 #define WFDISPLAY_H
3
3
4 #include "wfdisplay_global.h"
5
6 #include <QWidget>
4 #include <QWidget>
7 #include <QGridLayout>
5 #include <QGridLayout>
8 #include <QVBoxLayout>
6 #include <QVBoxLayout>
@@ -31,7 +31,6 SOURCES += wfdisplay.cpp \
31
31
32
32
33 HEADERS += wfdisplay.h\
33 HEADERS += wfdisplay.h\
34 wfdisplay_global.h \
35 wfplot.h \
34 wfplot.h \
36 wfpage.h \
35 wfpage.h \
37 wfdisplay_params.h \
36 wfdisplay_params.h \
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 3.0.1, 2014-03-27T10:13:46. -->
3 <!-- Written by QtCreator 3.0.1, 2014-04-14T09:37:32. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -1,8 +1,6
1 #ifndef WFPAGE_H
1 #ifndef WFPAGE_H
2 #define WFPAGE_H
2 #define WFPAGE_H
3
3
4 #include "wfdisplay_global.h"
5
6 #include <QMainWindow>
4 #include <QMainWindow>
7 #include <QRadioButton>
5 #include <QRadioButton>
8 #include <QPushButton>
6 #include <QPushButton>
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now