frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Proto*: fix Error macro conflict (#1146)

Browse Source 
Fixes: #882
This commit is contained in:
Gerion Entrup 2021-02-23 14:25:32 +01:00 committed by GitHub
parent f843b5a046
commit 6ed9553ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsrc/protoserver/ProtoClientConnection.cpp
View File

@ -1,12 +1,13 @@
// project includes
#include "ProtoClientConnection.h"
// qt // qt
#include <QTcpSocket> #include <QTcpSocket>
#include <QHostAddress> #include <QHostAddress>
#include <QTimer> #include <QTimer>
#include <QRgb> #include <QRgb>
// project includes
#include "ProtoClientConnection.h"
// TODO Remove this class if third-party apps have been migrated (eg. Hyperion Android Grabber, Windows Screen grabber etc.) // TODO Remove this class if third-party apps have been migrated (eg. Hyperion Android Grabber, Windows Screen grabber etc.)
ProtoClientConnection::ProtoClientConnection(QTcpSocket* socket, int timeout, QObject *parent) ProtoClientConnection::ProtoClientConnection(QTcpSocket* socket, int timeout, QObject *parent)

8
libsrc/protoserver/ProtoClientConnection.h
View File

@ -1,14 +1,16 @@
#pragma once #pragma once
// protobuffer PROTO
// protobuf defines an Error() function itself, so undef it here
#undef Error
#include "message.pb.h"
// util // util
#include <utils/Logger.h> #include <utils/Logger.h>
#include <utils/Image.h> #include <utils/Image.h>
#include <utils/ColorRgb.h> #include <utils/ColorRgb.h>
#include <utils/Components.h> #include <utils/Components.h>
// protobuffer PROTO
#include "message.pb.h"
class QTcpSocket; class QTcpSocket;
class QTimer; class QTimer;

2
libsrc/protoserver/ProtoServer.cpp
View File

@ -1,5 +1,5 @@
#include <protoserver/ProtoServer.h>
#include "ProtoClientConnection.h" #include "ProtoClientConnection.h"
#include <protoserver/ProtoServer.h>
// util // util
#include <utils/NetOrigin.h> #include <utils/NetOrigin.h>