From 8df8734d7378e7c54a6740cab696902610cf72f0 Mon Sep 17 00:00:00 2001 From: Hatef Date: Mon, 4 Jul 2022 13:22:51 +0430 Subject: [PATCH] Adding CONST and pass by ref amendment --- logger.cpp | 7 ++++++- logger.h | 2 +- main.cpp | 2 +- socket.cpp | 11 ++++++++--- socket.h | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/logger.cpp b/logger.cpp index 40384b5..27b1237 100644 --- a/logger.cpp +++ b/logger.cpp @@ -14,7 +14,8 @@ QHash Logger::_logTitles = { {QtMsgType::QtFatalMsg, " Fatal "} }; -Logger::Logger(QString fileName) +/*******************************************************************************************/ +Logger::Logger(const QString& fileName) { _logFile = new QFile; _logFile->setFileName(fileName); @@ -22,12 +23,14 @@ Logger::Logger(QString fileName) qInstallMessageHandler(Logger::messageOutput); } +/*******************************************************************************************/ Logger::~Logger() { qInfo() << "The Logger closed" << "\n"; delete _logFile; } +/*******************************************************************************************/ void Logger::clearLog() { if(_logFile) @@ -36,6 +39,7 @@ void Logger::clearLog() } } +/*******************************************************************************************/ void Logger::makeStartingLine() { if(_logFile) @@ -46,6 +50,7 @@ void Logger::makeStartingLine() } } +/*******************************************************************************************/ void Logger::messageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg) { QString log = QObject::tr("%1 | %2 | %3 | %4 | %5\n"). diff --git a/logger.h b/logger.h index 754185f..dd9d9a0 100644 --- a/logger.h +++ b/logger.h @@ -12,7 +12,7 @@ private: static QHash _logTitles; public: - Logger(QString fileName = "./DefaultHatefLogFile.log"); + Logger(const QString& fileName = "./DefaultHatefLogFile.log"); ~Logger(); static void makeStartingLine(); diff --git a/main.cpp b/main.cpp index 6859dae..a423226 100644 --- a/main.cpp +++ b/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char* argv[]) { QCoreApplication a(argc, argv); - Logger mylog("thetest6.log"); + Logger mylog("thetest7.log"); //mylog.clearLog(); Logger::makeStartingLine(); diff --git a/socket.cpp b/socket.cpp index d5c28fa..a889b4f 100644 --- a/socket.cpp +++ b/socket.cpp @@ -10,31 +10,36 @@ UdpSocket::UdpSocket(QObject* parent, quint16 port) : qInfo() << "A Socket built" << "\n"; } +/*******************************************************************************************/ UdpSocket::~UdpSocket() { qInfo() << "Udp socket deleted!" << "\n"; delete _socket; } +/*******************************************************************************************/ void UdpSocket::sayHello() { sayMsg("Connected!"); } -void UdpSocket::sayMsg(QString Msg) +/*******************************************************************************************/ +void UdpSocket::sayMsg(const QString& msg) { QByteArray Data; - Data.append(Msg); + Data.append(msg); _socket->writeDatagram(Data, QHostAddress::LocalHost, _port); } -void UdpSocket::logReceivedData(QHostAddress& addr, quint16& port, QByteArray& msg) +/*******************************************************************************************/ +void UdpSocket::logReceivedData(const QHostAddress& addr, quint16 port, const QByteArray& msg) const { qDebug() << "Address : " << addr.toString(); qDebug() << "Port : " << port; qDebug() << "Content : " << msg << '\n'; } +/*******************************************************************************************/ void UdpSocket::readyRead() { QByteArray buffer; diff --git a/socket.h b/socket.h index d56821f..99278a1 100644 --- a/socket.h +++ b/socket.h @@ -12,14 +12,14 @@ private: QUdpSocket* _socket; const quint16 _port; - void logReceivedData(QHostAddress& addr, quint16& port, QByteArray& msg); + void logReceivedData(const QHostAddress& addr, quint16 port, const QByteArray& msg) const; public: explicit UdpSocket(QObject* parent = nullptr, quint16 port = 1234); ~UdpSocket(); void sayHello(); - void sayMsg(QString Msg); + void sayMsg(const QString& msg); //uncrustify off public slots: