sauvegarde après fusion
This commit is contained in:
@@ -1,10 +1,15 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "pws2mqtt.h"
|
#include "pws2mqtt.h"
|
||||||
|
#include "qjsonarray.h"
|
||||||
|
#include "qjsondocument.h"
|
||||||
|
#include "qjsonobject.h"
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QtMath>
|
#include <QtMath>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QFile>
|
||||||
|
|
||||||
struct ForecastResult
|
struct ForecastResult
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-9
@@ -1,28 +1,21 @@
|
|||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
//#include <unistd.h>
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
//#include <iostream>
|
|
||||||
//#include <QDebug>
|
|
||||||
#include <qhttpserver.h>
|
#include <qhttpserver.h>
|
||||||
#include <QHttpServerResponse>
|
#include <QHttpServerResponse>
|
||||||
#include "pws2mqtt.h"
|
#include "pws2mqtt.h"
|
||||||
#ifdef WITH_MQTT
|
|
||||||
#include "mqtt.h"
|
|
||||||
#endif
|
|
||||||
#include "src/barometertrend.h"
|
#include "src/barometertrend.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
//#include <sys/types.h>
|
|
||||||
//#include <sys/select.h>
|
|
||||||
#ifdef WITH_MQTT
|
#ifdef WITH_MQTT
|
||||||
#include <QtMqtt>
|
#include <QtMqtt>
|
||||||
#include <QtMqtt/QMqttClient>
|
#include <QtMqtt/QMqttClient>
|
||||||
#include <QtMqtt/QMqttMessage>
|
#include <QtMqtt/QMqttMessage>
|
||||||
#include <QtMqtt/QMqttSubscription>
|
#include <QtMqtt/QMqttSubscription>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CLIENT_ID "Client_ID"
|
#define CLIENT_ID "Client_ID"
|
||||||
|
|
||||||
uint debugLevel = INFO | ERROR | ALERT;
|
uint debugLevel = DEBUG |INFO | ERROR | ALERT;
|
||||||
QByteArray toFollow;
|
QByteArray toFollow;
|
||||||
|
|
||||||
#ifdef WITH_MQTT
|
#ifdef WITH_MQTT
|
||||||
|
|||||||
Reference in New Issue
Block a user