Browse Source

Adding CONST and pass by ref amendment

master
Hatef 3 years ago
parent
commit
8df8734d73
  1. 7
      logger.cpp
  2. 2
      logger.h
  3. 2
      main.cpp
  4. 11
      socket.cpp
  5. 4
      socket.h

7
logger.cpp

@ -14,7 +14,8 @@ QHash<QtMsgType, QString> Logger::_logTitles = {
{QtMsgType::QtFatalMsg, " Fatal "} {QtMsgType::QtFatalMsg, " Fatal "}
}; };
Logger::Logger(QString fileName) /*******************************************************************************************/
Logger::Logger(const QString& fileName)
{ {
_logFile = new QFile; _logFile = new QFile;
_logFile->setFileName(fileName); _logFile->setFileName(fileName);
@ -22,12 +23,14 @@ Logger::Logger(QString fileName)
qInstallMessageHandler(Logger::messageOutput); qInstallMessageHandler(Logger::messageOutput);
} }
/*******************************************************************************************/
Logger::~Logger() Logger::~Logger()
{ {
qInfo() << "The Logger closed" << "\n"; qInfo() << "The Logger closed" << "\n";
delete _logFile; delete _logFile;
} }
/*******************************************************************************************/
void Logger::clearLog() void Logger::clearLog()
{ {
if(_logFile) if(_logFile)
@ -36,6 +39,7 @@ void Logger::clearLog()
} }
} }
/*******************************************************************************************/
void Logger::makeStartingLine() void Logger::makeStartingLine()
{ {
if(_logFile) if(_logFile)
@ -46,6 +50,7 @@ void Logger::makeStartingLine()
} }
} }
/*******************************************************************************************/
void Logger::messageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg) void Logger::messageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
{ {
QString log = QObject::tr("%1 | %2 | %3 | %4 | %5\n"). QString log = QObject::tr("%1 | %2 | %3 | %4 | %5\n").

2
logger.h

@ -12,7 +12,7 @@ private:
static QHash<QtMsgType, QString> _logTitles; static QHash<QtMsgType, QString> _logTitles;
public: public:
Logger(QString fileName = "./DefaultHatefLogFile.log"); Logger(const QString& fileName = "./DefaultHatefLogFile.log");
~Logger(); ~Logger();
static void makeStartingLine(); static void makeStartingLine();

2
main.cpp

@ -6,7 +6,7 @@ int main(int argc, char* argv[])
{ {
QCoreApplication a(argc, argv); QCoreApplication a(argc, argv);
Logger mylog("thetest6.log"); Logger mylog("thetest7.log");
//mylog.clearLog(); //mylog.clearLog();
Logger::makeStartingLine(); Logger::makeStartingLine();

11
socket.cpp

@ -10,31 +10,36 @@ UdpSocket::UdpSocket(QObject* parent, quint16 port) :
qInfo() << "A Socket built" << "\n"; qInfo() << "A Socket built" << "\n";
} }
/*******************************************************************************************/
UdpSocket::~UdpSocket() UdpSocket::~UdpSocket()
{ {
qInfo() << "Udp socket deleted!" << "\n"; qInfo() << "Udp socket deleted!" << "\n";
delete _socket; delete _socket;
} }
/*******************************************************************************************/
void UdpSocket::sayHello() void UdpSocket::sayHello()
{ {
sayMsg("Connected!"); sayMsg("Connected!");
} }
void UdpSocket::sayMsg(QString Msg) /*******************************************************************************************/
void UdpSocket::sayMsg(const QString& msg)
{ {
QByteArray Data; QByteArray Data;
Data.append(Msg); Data.append(msg);
_socket->writeDatagram(Data, QHostAddress::LocalHost, _port); _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() << "Address : " << addr.toString();
qDebug() << "Port : " << port; qDebug() << "Port : " << port;
qDebug() << "Content : " << msg << '\n'; qDebug() << "Content : " << msg << '\n';
} }
/*******************************************************************************************/
void UdpSocket::readyRead() void UdpSocket::readyRead()
{ {
QByteArray buffer; QByteArray buffer;

4
socket.h

@ -12,14 +12,14 @@ private:
QUdpSocket* _socket; QUdpSocket* _socket;
const quint16 _port; const quint16 _port;
void logReceivedData(QHostAddress& addr, quint16& port, QByteArray& msg); void logReceivedData(const QHostAddress& addr, quint16 port, const QByteArray& msg) const;
public: public:
explicit UdpSocket(QObject* parent = nullptr, quint16 port = 1234); explicit UdpSocket(QObject* parent = nullptr, quint16 port = 1234);
~UdpSocket(); ~UdpSocket();
void sayHello(); void sayHello();
void sayMsg(QString Msg); void sayMsg(const QString& msg);
//uncrustify off //uncrustify off
public slots: public slots:

Loading…
Cancel
Save