Changeset 8252 in ntrip for trunk


Ignore:
Timestamp:
Jan 10, 2018, 1:16:12 PM (6 years ago)
Author:
stoecker
Message:

see #105 - reenable Qt4 build options, drop generic version dependend includes, replace by direct requirements, remaining QtCore lines should also be replaced

Location:
trunk/BNC
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/bnc.pro

    r8231 r8252  
     1greaterThan(QT_MAJOR_VERSION, 4): QT += printer widgets
     2QT += svg
    13
    24TEMPLATE = subdirs

  • trunk/BNC/src/PPP_SSR_I/pppFilter.h

    r8127 r8252  
    2626#define PPPFILTER_H
    2727
    28 #include <QtCore>
    29 #include <QtNetwork>
     28#include <QByteArray>
     29#include <QMap>
     30#include <QStringList>
     31#include <QVector>
    3032#include <newmat.h>
    3133

  • trunk/BNC/src/RTCM3/RTCM3coDecoder.h

    r7169 r8252  
    2727
    2828#include <fstream>
    29 #include <QtCore>
    30 #include <QtNetwork>
     29
     30#include <QByteArray>
     31#include <QList>
     32#include <QMap>
     33
    3134#include "GPSDecoder.h"
    3235

  • trunk/BNC/src/app.cpp

    r5084 r8252  
    1414 *
    1515 * -----------------------------------------------------------------------*/
     16
     17#include <QFileOpenEvent>
    1618
    1719#include "app.h"

  • trunk/BNC/src/app.h

    r8231 r8252  
    22#define GnssCenter_APP_H
    33
    4 #include <QtWidgets>
     4#include <QApplication>
     5#include <QEvent>
    56
    67class t_app : public QApplication {

  • trunk/BNC/src/bncbytescounter.h

    r8231 r8252  
    2626#define BNCBYTESCOUNTER_H
    2727
    28 #include <QtWidgets>
     28#include <QByteArray>
     29#include <QLabel>
     30#include <QMutex>
    2931
    3032class bncBytesCounter : public QLabel {

  • trunk/BNC/src/bnccaster.h

    r7387 r8252  
    2727
    2828#include <QFile>
    29 #include <QtNetwork>
    3029#include <QMultiMap>
     30#include <QTcpServer>
     31#include <QTcpSocket>
     32
    3133#include "satObs.h"
    3234

  • trunk/BNC/src/bncclockrinex.h

    r4991 r8252  
    44#include <fstream>
    55#include <newmat.h>
    6 #include <QtCore>
     6
     7#include <QDateTime>
    78
    89#include "bncoutf.h"

  • trunk/BNC/src/bnccore.h

    r8231 r8252  
    2525#ifndef BNCAPP_H
    2626#define BNCAPP_H
    27 
    28 #include <QtWidgets>
    2927
    3028#include "bnctime.h"

  • trunk/BNC/src/bncfigure.cpp

    r8204 r8252  
    4040
    4141#include <iostream>
     42
     43#include <QMapIterator>
     44#include <QPainter>
     45#include <QTimer>
     46#include <QUrl>
     47#include <QVariant>
    4248
    4349#include "bncfigure.h"

  • trunk/BNC/src/bncfigure.h

    r8231 r8252  
    2626#define BNCFIGURE_H
    2727
    28 #include <QtWidgets>
     28#include <QByteArray>
     29#include <QMap>
     30#include <QMutex>
     31#include <QWidget>
    2932
    3033class bncFigure : public QWidget {

  • trunk/BNC/src/bncfigurelate.cpp

    r8204 r8252  
    4040
    4141#include <iostream>
     42#include <math.h>
     43
     44#include <QMapIterator>
     45#include <QPainter>
     46#include <QTimer>
     47#include <QUrl>
     48#include <QVariant>
    4249
    4350#include "bncfigurelate.h"

  • trunk/BNC/src/bncfigurelate.h

    r8231 r8252  
    2626#define BNCFIGURELATE_H
    2727
    28 #include <QtWidgets>
     28#include <QByteArray>
     29#include <QMap>
     30#include <QMutex>
     31#include <QWidget>
    2932
    3033class bncFigureLate : public QWidget {

  • trunk/BNC/src/bncfigureppp.cpp

    r7684 r8252  
    4141#include <iostream>
    4242
    43 #include "bncfigureppp.h"
     43#include <QApplication>
     44#include <QPainter>
     45#include <QVariant>
     46
     47#include "bncfigureppp.h"
    4448#include "bncsettings.h"
    4549#include "bncutils.h"

  • trunk/BNC/src/bncfigureppp.h

    r8231 r8252  
    2626#define BNCFIGUREPPP_H
    2727
    28 #include <QtWidgets>
     28#include <QByteArray>
     29#include <QMutex>
     30#include <QPoint>
     31#include <QWidget>
    2932#include "bnctime.h"
    3033

  • trunk/BNC/src/bncgetthread.cpp

    r8246 r8252  
    4848#include <QTextStream>
    4949#include <QMutex>
    50 #include <QtNetwork>
    5150#include <QPushButton>
    5251#include <QTableWidget>

  • trunk/BNC/src/bncgetthread.h

    r8082 r8252  
    2727
    2828#include <QThread>
    29 #include <QtNetwork>
    3029#include <QDateTime>
    3130#include <QFile>
     31#include <QTcpServer>
     32#include <QUrl>
    3233
    3334#include "bncconst.h"

  • trunk/BNC/src/bnchlpdlg.h

    r8231 r8252  
    2727
    2828#include <QtCore>
    29 #include <QtWidgets>
    3029
    3130#include <QDialog>

  • trunk/BNC/src/bncipport.cpp

    r7679 r8252  
    4040
    4141#include <iostream>
     42
     43#include <QLabel>
     44#include <QLineEdit>
     45#include <QGridLayout>
     46#include <QMessageBox>
     47#include <QPushButton>
     48#include <QVBoxLayout>
    4249
    4350#include "bncipport.h"

  • trunk/BNC/src/bncipport.h

    r8231 r8252  
    2727
    2828#include <QtCore>
    29 #include <QtWidgets>
     29#include <QDialog>
     30#include <QLineEdit>
     31#include <QPushButton>
    3032#include <QWhatsThis>
    3133

  • trunk/BNC/src/bncmain.cpp

    r8231 r8252  
    3939 * -----------------------------------------------------------------------*/
    4040
     41#include <iostream>
    4142#include <unistd.h>
    4243#include <signal.h>
     44
    4345#include <QApplication>
    4446#include <QFile>
    45 #include <iostream>
    4647
    4748#include "app.h"

  • trunk/BNC/src/bncmap.h

    r8231 r8252  
    2626#define BNCMAP_H
    2727
    28 #include <QtWidgets>
     28#include <QDialog>
    2929#include <QWhatsThis>
    3030

  • trunk/BNC/src/bncmap_svg.cpp

    r8231 r8252  
    3939 * -----------------------------------------------------------------------*/
    4040
    41 #include <QtSvg>
    42 #include <QtPrintSupport/QPrinter>
    43 #include <QtPrintSupport/QPrintDialog>
     41#include <QHBoxLayout>
     42#include <QPrinter>
     43#include <QPrintDialog>
     44#include <QPushButton>
    4445
    4546#include <qwt_symbol.h>

  • trunk/BNC/src/bncnetquery.h

    r6787 r8252  
    22#define BNCNETQUERY_H
    33
    4 #include <QtNetwork>
     4#include <QByteArray>
     5#include <QUrl>
     6
    57#include "bncconst.h"
    68#include "bnccore.h"

  • trunk/BNC/src/bncnetqueryrtp.h

    r6787 r8252  
    11#ifndef BNCNETQUERYRTP_H
    22#define BNCNETQUERYRTP_H
     3
     4#include <QUdpSocket>
    35
    46#include "bncnetquery.h"

  • trunk/BNC/src/bncnetqueryudp.cpp

    r8204 r8252  
    1818#include <iomanip>
    1919#include <time.h>
     20
     21#include <QHostInfo>
    2022
    2123#include "bncnetqueryudp.h"

  • trunk/BNC/src/bncnetqueryudp.h

    r6787 r8252  
    11#ifndef BNCNETQUERYUDP_H
    22#define BNCNETQUERYUDP_H
     3
     4#include <QHostAddress>
     5#include <QUdpSocket>
    36
    47#include "bncnetquery.h"

  • trunk/BNC/src/bncnetqueryudp0.h

    r6787 r8252  
    11#ifndef BNCNETQUERYUDP0_H
    22#define BNCNETQUERYUDP0_H
     3
     4#include <QUdpSocket>
    35
    46#include "bncnetquery.h"

  • trunk/BNC/src/bncnetqueryv2.h

    r7513 r8252  
    11#ifndef BNCNETQUERYV2_H
    22#define BNCNETQUERYV2_H
     3
     4#include <QEventLoop>
     5#include <QNetworkAccessManager>
     6#include <QNetworkProxy>
     7#include <QNetworkReply>
     8#include <QSslError>
    39
    410#include "bncnetquery.h"

  • trunk/BNC/src/bncserialport.cpp

    r7673 r8252  
    4040
    4141#include <iostream>
     42
     43#include <QComboBox>
     44#include <QHBoxLayout>
     45#include <QLabel>
     46#include <QLineEdit>
     47#include <QMessageBox>
     48#include <QPushButton>
    4249
    4350#include "bncserialport.h"

  • trunk/BNC/src/bncserialport.h

    r8231 r8252  
    2626#define BNCSERIALPORT_H
    2727
    28 #include <QtCore>
    29 #include <QtWidgets>
     28#include <QComboBox>
     29#include <QDialog>
     30#include <QLineEdit>
     31#include <QPushButton>
    3032#include <QWhatsThis>
    3133

  • trunk/BNC/src/bncsslconfig.cpp

    r4278 r8252  
    1616
    1717#include <iostream>
     18
     19#include <QApplication>
     20#include <QDir>
     21#include <QStringList>
    1822
    1923#include "bncsslconfig.h"

  • trunk/BNC/src/bncsslconfig.h

    r4278 r8252  
    22#define BNCSSLCONFIG_H
    33
    4 #include <QtNetwork>
     4#include <QSslConfiguration>
    55
    66// Singleton Class

  • trunk/BNC/src/bnctabledlg.h

    r8231 r8252  
    2727
    2828#include <QtCore>
    29 #include <QtWidgets>
    3029#include <QComboBox>
    3130#include <QDialog>

  • trunk/BNC/src/bnctableitem.h

    r8231 r8252  
    2626#define BNCTABLEITEM_H
    2727
    28 #include <QtCore>
    29 #include <QtWidgets>
    30 
     28#include <QMutex>
     29#include <QObject>
    3130#include <QTableWidgetItem>
    3231

  • trunk/BNC/src/bncudpport.cpp

    r7672 r8252  
    4040
    4141#include <iostream>
     42
     43#include <QLabel>
     44#include <QLineEdit>
     45#include <QGridLayout>
     46#include <QMessageBox>
     47#include <QPushButton>
     48#include <QVBoxLayout>
    4249
    4350#include "bncudpport.h"

  • trunk/BNC/src/bncudpport.h

    r8231 r8252  
    2626#define BNCUDPPORT_H
    2727
    28 #include <QtCore>
    29 #include <QtWidgets>
     28#include <QDialog>
     29#include <QLineEdit>
     30#include <QPushButton>
    3031#include <QWhatsThis>
    3132

  • trunk/BNC/src/bncwindow.cpp

    r8233 r8252  
    4444#include <QApplication>
    4545#include <QCheckBox>
     46#include <QCloseEvent>
    4647#include <QComboBox>
    4748#include <QDialog>

  • trunk/BNC/src/bncwindow.h

    r8231 r8252  
    2626#define BNCWINDOW_H
    2727
    28 #include <QtWidgets>
     28#include <QDialog>
     29#include <QList>
    2930#include <QMainWindow>
     31#include <QTextEdit>
    3032#include <QWhatsThis>
    3133

  • trunk/BNC/src/map/bncmapwin.h

    r8231 r8252  
    2626#define BNCMAPWIN_H
    2727
    28 #include <QtWidgets>
    29 #include <QtWebKit>
     28#include <QByteArray>
     29#include <QDialog>
    3030#include <QNetworkProxy>
     31#include <QVector>
    3132#include "bnctime.h"
    3233

  • trunk/BNC/src/pppWidgets.cpp

    r8231 r8252  
    4040
    4141#include <iostream>
     42
     43#include <QCheckBox>
     44#include <QComboBox>
     45#include <QHeaderView>
     46#include <QLineEdit>
     47#include <QPushButton>
     48#include <QRadioButton>
     49#include <QSpinBox>
     50#include <QTableWidget>
    4251
    4352#include "pppWidgets.h"
    … …  
    171180  _staTable->setSelectionMode(QAbstractItemView::ExtendedSelection);
    172181  _staTable->setSelectionBehavior(QAbstractItemView::SelectRows);
     182#if QT_VERSION >= 0x050000
    173183  _staTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
     184#endif
    174185  _staTable->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
    175186

  • trunk/BNC/src/pppWidgets.h

    r8231 r8252  
    2626#define PPPWIDGETS_H
    2727
    28 #include <QtWidgets>
     28#include <QCheckBox>
     29#include <QComboBox>
     30#include <QLineEdit>
     31#include <QObject>
     32#include <QPushButton>
     33#include <QRadioButton>
     34#include <QSpinBox>
     35#include <QTableWidget>
    2936
    3037class qtFileChooser;

  • trunk/BNC/src/qtfilechooser.cpp

    r4278 r8252  
    1414 *
    1515 * -----------------------------------------------------------------------*/
     16
     17#include <QFileDialog>
     18#include <QHBoxLayout>
     19#include <QLineEdit>
     20#include <QPushButton>
    1621
    1722#include "qtfilechooser.h"

  • trunk/BNC/src/qtfilechooser.h

    r8231 r8252  
    33#define QTFILECHOOSER
    44
    5 #include <QtWidgets>
     5#include <QLineEdit>
     6#include <QPushButton>
     7#include <QWidget>
    68
    79class qtFileChooser : public QWidget {

  • trunk/BNC/src/reqcdlg.cpp

    r8128 r8252  
    4040
    4141#include <iostream>
     42
     43#include <QCloseEvent>
     44#include <QComboBox>
     45#include <QDateTimeEdit>
     46#include <QGridLayout>
     47#include <QLabel>
     48#include <QLineEdit>
     49#include <QMessageBox>
     50#include <QPushButton>
     51#include <QSpinBox>
     52#include <QWhatsThis>
    4253
    4354#include "reqcdlg.h"

  • trunk/BNC/src/reqcdlg.h

    r8231 r8252  
    2626#define REQCDLG_H
    2727
    28 #include <QtCore>
    29 #include <QtWidgets>
     28#include <QComboBox>
     29#include <QDateTimeEdit>
     30#include <QDialog>
     31#include <QLineEdit>
     32#include <QSpinBox>
    3033
    3134#include "bncconst.h"

  • trunk/BNC/src/rinex/graphwin.cpp

    r8231 r8252  
    4141#include <qwt_scale_widget.h>
    4242#include <qwt_scale_engine.h>
     43
     44#include <QDir>
     45#include <QFileInfo>
     46#include <QHBoxLayout>
     47#include <QVBoxLayout>
     48#include <QPushButton>
    4349
    4450#include "graphwin.h"

  • trunk/BNC/src/rinex/graphwin.h

    r8231 r8252  
    2626#define GRAPHWIN_H
    2727
    28 #include <QtCore>
    29 #include <QtWidgets>
    30 #include <QtPrintSupport/QPrinter>
    31 #include <QtPrintSupport/QPrintDialog>
     28#include <QByteArray>
     29#include <QDialog>
     30#include <QPrinter>
     31#include <QPrintDialog>
    3232#include <qwt_color_map.h>
    3333#include <qwt_plot.h>

  • trunk/BNC/src/upload/bnccustomtrafo.cpp

    r8085 r8252  
    1414 *
    1515 * -----------------------------------------------------------------------*/
     16
     17#include <QLabel>
     18#include <QLineEdit>
     19#include <QMessageBox>
     20#include <QPushButton>
     21#include <QVBoxLayout>
    1622
    1723#include "bnccustomtrafo.h"

  • trunk/BNC/src/upload/bnccustomtrafo.h

    r8231 r8252  
    22#define BNCCUSTOMTRAFO_H
    33
    4 #include <QtCore>
    5 #include <QtWidgets>
     4#include <QDialog>
     5#include <QLineEdit>
     6#include <QPushButton>
    67#include <QWhatsThis>
    78

  • trunk/BNC/src/upload/bncuploadcaster.h

    r3273 r8252  
    22#define BNCUPLOADCASTER_H
    33
    4 #include <QtNetwork>
     4#include <QDateTime>
     5#include <QMutex>
     6#include <QTcpSocket>
     7#include <QThread>
    58
    69class bncUploadCaster : public QThread {
Note: See TracChangeset for help on using the changeset viewer.