Skip to content

Commit

Permalink
Merge pull request #127 from oblivioncth/dev
Browse files Browse the repository at this point in the history
Merge to master for v0.5.5.1
  • Loading branch information
oblivioncth authored Nov 7, 2023
2 parents 1370819 + 708fbeb commit 300c689
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.23.0...3.26.0)
# avoided and only used for hotfixes. DON'T USE TRAILING
# ZEROS IN VERSIONS
project(Qx
VERSION 0.5.5
VERSION 0.5.5.1
LANGUAGES CXX
DESCRIPTION "Qt Extensions Library"
)
Expand Down
5 changes: 3 additions & 2 deletions lib/io/include/qx/io/qx-applicationlogger.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ class QX_IO_EXPORT ApplicationLogger
IoOpReport finish(int returnCode);

// Status
IoOpReport status();
IoOpReport status() const;
void resetStatus();
bool hasError();
bool hasError() const;
bool isOpen() const;
};

}
Expand Down
11 changes: 9 additions & 2 deletions lib/io/src/qx-applicationlogger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ IoOpReport ApplicationLogger::finish(int returnCode)
*
* @sa resetStatus().
*/
IoOpReport ApplicationLogger::status() { return mErrorStatus; }
IoOpReport ApplicationLogger::status() const { return mErrorStatus; }

/*!
* Resets the status of the logger.
Expand All @@ -351,6 +351,13 @@ void ApplicationLogger::resetStatus() { mErrorStatus = IoOpReport(); }
*
* @sa status().
*/
bool ApplicationLogger::hasError() { return mErrorStatus.isFailure(); }
bool ApplicationLogger::hasError() const { return mErrorStatus.isFailure(); }

/*!
* Returns @c true if the log is open for writing; otherwise, returns @c false.
*
* @sa openLog() and finish().
*/
bool ApplicationLogger::isOpen() const { return mTextStreamWriter.fileIsOpen(); }

}

0 comments on commit 300c689

Please sign in to comment.