From c1fb57e2801cc40d69386a9d2ea80d9caf15fa45 Mon Sep 17 00:00:00 2001 From: h-4nd-h Date: Sun, 26 Jun 2022 17:30:09 +0430 Subject: [PATCH] Comply with bio standard --- main.cpp | 12 +++++------ socket.cpp | 33 +++++++++++++++++------------- socket.cpp.autosave | 50 +++++++++++++++++++++++++++++++++++++++++++++ socket.h | 30 +++++++++++++-------------- socket.h.autosave | 30 +++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 35 deletions(-) create mode 100644 socket.cpp.autosave create mode 100644 socket.h.autosave diff --git a/main.cpp b/main.cpp index 0eb7644..bd9c84b 100644 --- a/main.cpp +++ b/main.cpp @@ -5,13 +5,13 @@ int main(int argc, char* argv[]) { QCoreApplication a(argc, argv); - UDP_Socket server; - UDP_Socket client; + UdpSocket server; + UdpSocket client; - client.SayHello(); - server.SayHello(); - client.SayMsg("MsgC"); - server.SayMsg("MsgS"); + client.sayHello(); + server.sayHello(); + client.sayMsg("MsgC"); + server.sayMsg("MsgS"); return a.exec(); } diff --git a/socket.cpp b/socket.cpp index 574558b..8488596 100644 --- a/socket.cpp +++ b/socket.cpp @@ -1,28 +1,33 @@ #include "socket.h" #include -UDP_Socket::UDP_Socket(QObject* parent, quint16 port) : +UdpSocket::UdpSocket(QObject* parent, quint16 port) : QObject(parent), - the_port(port) + _port(port) { - socket = new QUdpSocket(this); - socket->bind(QHostAddress::LocalHost, the_port); - connect(socket, SIGNAL(readyRead()), this, SLOT(readyRead())); + _socket = new QUdpSocket(this); + _socket->bind(QHostAddress::LocalHost, port); + connect(_socket, SIGNAL(readyRead()), this, SLOT(readyRead())); } -void UDP_Socket::SayHello() +UdpSocket::~UdpSocket() { - SayMsg("Connected :))"); + delete _socket; } -void UDP_Socket::SayMsg(QString Msg) +void UdpSocket::sayHello() +{ + sayMsg("Connected :))"); +} + +void UdpSocket::sayMsg(QString Msg) { QByteArray Data; Data.append(Msg); - socket->writeDatagram(Data, QHostAddress::LocalHost, the_port); + _socket->writeDatagram(Data, QHostAddress::LocalHost, _port); } -QString UDP_Socket::GetTime() +QString UdpSocket::getTime() { QDateTime current_time_object = QDateTime::currentDateTime(); QString formatted_time = current_time_object.toString("yyyy/MM/dd - hh:mm:ss"); @@ -30,15 +35,15 @@ QString UDP_Socket::GetTime() return formatted_time; } -void UDP_Socket::readyRead() +void UdpSocket::readyRead() { QByteArray Buffer; - Buffer.resize(socket->pendingDatagramSize()); + Buffer.resize(_socket->pendingDatagramSize()); QHostAddress sender_addr{}; quint16 sender_port{}; - socket->readDatagram(Buffer.data(), Buffer.size(), &sender_addr, &sender_port); + _socket->readDatagram(Buffer.data(), Buffer.size(), &sender_addr, &sender_port); - qDebug() << "New Message arrived at" << GetTime(); + qDebug() << "New Message arrived at" << getTime(); qDebug() << "Address :" << sender_addr.toString(); qDebug() << "Port : " << sender_port; qDebug() << "Content : " << Buffer << '\n'; diff --git a/socket.cpp.autosave b/socket.cpp.autosave new file mode 100644 index 0000000..2bbaf1b --- /dev/null +++ b/socket.cpp.autosave @@ -0,0 +1,50 @@ +#include "socket.h" +#include + +UdpSocket::UdpSocket(QObject* parent, quint16 port) : + QObject(parent), + _port(port) +{ + _socket = new QUdpSocket(this); + _socket->bind(QHostAddress::LocalHost, port); + connect(_socket, &QUdpSocket::readyRead, this, &UdpSocket::readyRead); +} + +UdpSocket::~UdpSocket() +{ + delete _socket; +} + +void UdpSocket::sayHello() +{ + sayMsg("Connected :))"); +} + +void UdpSocket::sayMsg(QString Msg) +{ + QByteArray Data; + Data.append(Msg); + _socket->writeDatagram(Data, QHostAddress::LocalHost, _port); +} + +QString UdpSocket::getTime() +{ + QDateTime current_time_object = QDateTime::currentDateTime(); + QString formatted_time = current_time_object.toString("yyyy/MM/dd - hh:mm:ss"); + + return formatted_time; +} + +void UdpSocket::readyRead() +{ + QByteArray Buffer; + Buffer.resize(_socket->pendingDatagramSize()); + QHostAddress sender_addr; + quint16 sender_port; + _socket->readDatagram(Buffer.data(), Buffer.size(), &sender_addr, &sender_port); + + qDebug() << "New Message arrived at" << getTime(); + qDebug() << "Address :" << sender_addr.toString(); + qDebug() << "Port : " << sender_port; + qDebug() << "Content : " << Buffer << '\n'; +} diff --git a/socket.h b/socket.h index 5de209c..b62fd5c 100644 --- a/socket.h +++ b/socket.h @@ -1,29 +1,29 @@ -#ifndef UDP_Socket_H -#define UDP_Socket_H +#ifndef UDPSOCKET_H +#define UDPSOCKET_H #include #include -class UDP_Socket : public QObject +class UdpSocket : public QObject { Q_OBJECT -public: - explicit UDP_Socket(QObject* parent = nullptr, quint16 port = 1234); - void SayHello(); - void SayMsg(QString Msg); - private: - QString GetTime(); + QUdpSocket* _socket; + const quint16 _port; -signals: + QString getTime(); + +public: + explicit UdpSocket(QObject* parent = nullptr, quint16 port = 1234); + void sayHello(); + void sayMsg(QString Msg); + + //uncrustify off public slots: + //uncrustify on void readyRead(); - -private: - QUdpSocket* socket; - const quint16 the_port; }; -#endif //UDP_Socket_H +#endif //UDPSOCKET_H diff --git a/socket.h.autosave b/socket.h.autosave new file mode 100644 index 0000000..51ea612 --- /dev/null +++ b/socket.h.autosave @@ -0,0 +1,30 @@ +#ifndef UDPSOCKET_H +#define UDPSOCKET_H + +#include +#include + +class UdpSocket : public QObject +{ + Q_OBJECT + +private: + QUdpSocket* _socket; + const quint16 _port; + + QString getTime(); + +public: + explicit UdpSocket(QObject* parent = nullptr, quint16 port = 1234); + ~UdpSocket(); + + void sayHello(); + void sayMsg(QString Msg); + + //uncrustify off +public slots: + //uncrustify on + void readyRead(); +}; + +#endif //UDPSOCKET_H