diff options
Diffstat (limited to 'src/protocols')
| -rw-r--r-- | src/protocols/httpserver.cpp | 2 | ||||
| -rw-r--r-- | src/protocols/httpserver.h | 4 | ||||
| -rw-r--r-- | src/protocols/iprotocol.cpp | 2 | ||||
| -rw-r--r-- | src/protocols/iprotocol.h | 8 | ||||
| -rw-r--r-- | src/protocols/protocolbase.cpp | 3 | ||||
| -rw-r--r-- | src/protocols/protocolbase.h | 10 |
6 files changed, 4 insertions, 25 deletions
diff --git a/src/protocols/httpserver.cpp b/src/protocols/httpserver.cpp index 41226aa..8819490 100644 --- a/src/protocols/httpserver.cpp +++ b/src/protocols/httpserver.cpp @@ -26,7 +26,7 @@ HttpServer::HttpServer(ICamera *camera, // QObject *parent, const QHostAddress &address, const uint16_t port) - : ProtocolBase{camera} + : IProtocol{camera} , INIT_FIELD(address) , INIT_FIELD(port) , m_server{std::make_shared<QHttpServer>()} diff --git a/src/protocols/httpserver.h b/src/protocols/httpserver.h index 86b6ad6..64f7987 100644 --- a/src/protocols/httpserver.h +++ b/src/protocols/httpserver.h @@ -11,10 +11,8 @@ class ICamera; class QHttpServer; -class HttpServer : public ProtocolBase +class HttpServer : public IProtocol { - // Q_OBJECT - private: struct Stats { diff --git a/src/protocols/iprotocol.cpp b/src/protocols/iprotocol.cpp index f85d990..d021fb7 100644 --- a/src/protocols/iprotocol.cpp +++ b/src/protocols/iprotocol.cpp @@ -1,5 +1,5 @@ #include "iprotocol.h" -ProtocolBase::ProtocolBase(ICamera *camera) +IProtocol::IProtocol(ICamera *camera) : m_camera{camera} {} diff --git a/src/protocols/iprotocol.h b/src/protocols/iprotocol.h index 3827550..1643036 100644 --- a/src/protocols/iprotocol.h +++ b/src/protocols/iprotocol.h @@ -5,14 +5,8 @@ class ICamera; class IProtocol { public: + explicit IProtocol(ICamera *camera); virtual ~IProtocol() = default; -}; - -class ProtocolBase : public IProtocol -{ -public: - explicit ProtocolBase(ICamera *camera); - ~ProtocolBase() override = default; protected: ICamera *m_camera{nullptr}; diff --git a/src/protocols/protocolbase.cpp b/src/protocols/protocolbase.cpp deleted file mode 100644 index 9116d25..0000000 --- a/src/protocols/protocolbase.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "protocolbase.h" - -ProtocolBase::ProtocolBase() {} diff --git a/src/protocols/protocolbase.h b/src/protocols/protocolbase.h deleted file mode 100644 index fb41dca..0000000 --- a/src/protocols/protocolbase.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef PROTOCOLBASE_H -#define PROTOCOLBASE_H - -class ProtocolBase -{ -public: - ProtocolBase(); -}; - -#endif // PROTOCOLBASE_H |
