From 2df59f19ee1c9f64471da8039317159631f26806 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 19 Dec 2016 14:54:32 +0100 Subject: [PATCH] fix(app): coding style --- tests/src/app/App.cpp | 2 +- tests/src/app/App.hpp | 2 +- tests/src/app/AvatarProvider.cpp | 4 +-- tests/src/app/AvatarProvider.hpp | 3 +- tests/src/app/Database.cpp | 18 +++++----- tests/src/app/Database.hpp | 4 +-- tests/src/app/DefaultTranslator.cpp | 2 +- tests/src/app/DefaultTranslator.hpp | 4 +-- tests/src/app/Logger.cpp | 51 ++++++++++++++++------------- tests/src/app/Logger.hpp | 2 ++ 10 files changed, 49 insertions(+), 43 deletions(-) diff --git a/tests/src/app/App.cpp b/tests/src/app/App.cpp index ab4332c93..2455f5e5f 100644 --- a/tests/src/app/App.cpp +++ b/tests/src/app/App.cpp @@ -58,7 +58,7 @@ App::App (int &argc, char **argv) : QApplication(argc, argv) { m_engine.addImportPath(":/ui/views"); } -// ------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void App::initContentApp () { qInfo() << "Initializing core manager..."; diff --git a/tests/src/app/App.hpp b/tests/src/app/App.hpp index fe33ce138..6cfaaf200 100644 --- a/tests/src/app/App.hpp +++ b/tests/src/app/App.hpp @@ -11,7 +11,7 @@ class Notifier; -// =================================================================== +// ============================================================================= class App : public QApplication { Q_OBJECT; diff --git a/tests/src/app/AvatarProvider.cpp b/tests/src/app/AvatarProvider.cpp index 1d70f6cf5..f54d8e309 100644 --- a/tests/src/app/AvatarProvider.cpp +++ b/tests/src/app/AvatarProvider.cpp @@ -1,11 +1,9 @@ -#include - #include "Database.hpp" #include "../utils.hpp" #include "AvatarProvider.hpp" -// =================================================================== +// ============================================================================= const QString AvatarProvider::PROVIDER_ID = "avatar"; diff --git a/tests/src/app/AvatarProvider.hpp b/tests/src/app/AvatarProvider.hpp index 0445d9557..b57707ef8 100644 --- a/tests/src/app/AvatarProvider.hpp +++ b/tests/src/app/AvatarProvider.hpp @@ -3,7 +3,7 @@ #include -// =================================================================== +// ============================================================================= class AvatarProvider : public QQuickImageProvider { public: @@ -17,6 +17,7 @@ public: ) override; static const QString PROVIDER_ID; + private: QString m_avatars_path; }; diff --git a/tests/src/app/Database.cpp b/tests/src/app/Database.cpp index b8cddd0c8..40ede28ac 100644 --- a/tests/src/app/Database.cpp +++ b/tests/src/app/Database.cpp @@ -7,12 +7,12 @@ #include "Database.hpp" #ifdef _WIN32 - #define DATABASES_PATH \ - QStandardPaths::writableLocation(QStandardPaths::DataLocation) +#define DATABASES_PATH \ + QStandardPaths::writableLocation(QStandardPaths::DataLocation) #else - #define DATABASES_PATH \ - QStandardPaths::writableLocation(QStandardPaths::HomeLocation) -#endif +#define DATABASES_PATH \ + QStandardPaths::writableLocation(QStandardPaths::HomeLocation) +#endif // ifdef _WIN32 #define DATABASE_PATH_AVATARS ".linphone/avatars/" #define DATABASE_PATH_CALL_HISTORY_LIST ".linphone-call-history.db" @@ -21,7 +21,7 @@ using namespace std; -// =================================================================== +// ============================================================================= inline bool ensureDatabaseFilePathExists (const QString &path) { QDir dir(DATABASES_PATH); @@ -47,9 +47,9 @@ string Database::getAvatarsPath () { inline string getDatabaseFilePath (const QString &filename) { QString path(DATABASES_PATH + "/"); path += filename; - return ensureDatabaseFilePathExists(path) - ? Utils::qStringToLinphoneString(QDir::toNativeSeparators(path)) - : ""; + return ensureDatabaseFilePathExists(path) ? Utils::qStringToLinphoneString( + QDir::toNativeSeparators(path) + ) : ""; } string Database::getCallHistoryPath () { diff --git a/tests/src/app/Database.hpp b/tests/src/app/Database.hpp index 9369f5365..4e1a75f4d 100644 --- a/tests/src/app/Database.hpp +++ b/tests/src/app/Database.hpp @@ -3,7 +3,7 @@ #include -// =================================================================== +// ============================================================================= namespace Database { // Returns the databases paths. @@ -14,6 +14,6 @@ namespace Database { std::string getCallHistoryPath (); std::string getFriendsListPath (); std::string getMessageHistoryPath (); -}; +} #endif // DATABASE_H_ diff --git a/tests/src/app/DefaultTranslator.cpp b/tests/src/app/DefaultTranslator.cpp index 54cb3ca9d..579b67386 100644 --- a/tests/src/app/DefaultTranslator.cpp +++ b/tests/src/app/DefaultTranslator.cpp @@ -3,7 +3,7 @@ #include "DefaultTranslator.hpp" -// =================================================================== +// ============================================================================= DefaultTranslator::DefaultTranslator () { QDirIterator it(":", QDirIterator::Subdirectories); diff --git a/tests/src/app/DefaultTranslator.hpp b/tests/src/app/DefaultTranslator.hpp index 790e77c29..a7a6560cf 100644 --- a/tests/src/app/DefaultTranslator.hpp +++ b/tests/src/app/DefaultTranslator.hpp @@ -4,7 +4,7 @@ #include #include -// =================================================================== +// ============================================================================= class DefaultTranslator : public QTranslator { public: @@ -22,4 +22,4 @@ private: QSet m_contexts; }; -#endif +#endif // DEFAULT_TRANSLATOR_H_ diff --git a/tests/src/app/Logger.cpp b/tests/src/app/Logger.cpp index 008444b5a..6b4050202 100644 --- a/tests/src/app/Logger.cpp +++ b/tests/src/app/Logger.cpp @@ -14,9 +14,9 @@ #define PURPLE "" #define RED "" #define RESET "" -#endif +#endif // ifdef __linux__ -// =================================================================== +// ============================================================================= void logger (QtMsgType type, const QMessageLogContext &context, const QString &msg) { QByteArray local_msg = msg.toLocal8Bit(); @@ -31,26 +31,31 @@ void logger (QtMsgType type, const QMessageLogContext &context, const QString &m context_line = context.line; } - switch (type) { - case QtDebugMsg: - fprintf(stderr, GREEN "[%s][Debug]" PURPLE "%s:%u: " RESET "%s\n", - date_time.constData(), context_file, context_line, local_msg.constData()); - break; - case QtInfoMsg: - fprintf(stderr, BLUE "[%s][Info]" PURPLE "%s:%u: " RESET "%s\n", - date_time.constData(), context_file, context_line, local_msg.constData()); - break; - case QtWarningMsg: - fprintf(stderr, RED "[%s][Warning]" PURPLE "%s:%u: " RESET "%s\n", - date_time.constData(), context_file, context_line, local_msg.constData()); - break; - case QtCriticalMsg: - fprintf(stderr, RED "[%s][Critical]" PURPLE "%s:%u: " RESET "%s\n", - date_time.constData(), context_file, context_line, local_msg.constData()); - break; - case QtFatalMsg: - fprintf(stderr, RED "[%s][Fatal]" PURPLE "%s:%u: " RESET "%s\n", - date_time.constData(), context_file, context_line, local_msg.constData()); - abort(); + if (type == QtDebugMsg) + fprintf( + stderr, GREEN "[%s][Debug]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context_line, local_msg.constData() + ); + else if (type == QtInfoMsg) + fprintf( + stderr, BLUE "[%s][Info]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context_line, local_msg.constData() + ); + else if (type == QtWarningMsg) + fprintf( + stderr, RED "[%s][Warning]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context_line, local_msg.constData() + ); + else if (type == QtCriticalMsg) + fprintf( + stderr, RED "[%s][Critical]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context_line, local_msg.constData() + ); + else if (type == QtFatalMsg) { + fprintf( + stderr, RED "[%s][Fatal]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context_line, local_msg.constData() + ); + abort(); } } diff --git a/tests/src/app/Logger.hpp b/tests/src/app/Logger.hpp index 8c92ccf53..4148ee8ab 100644 --- a/tests/src/app/Logger.hpp +++ b/tests/src/app/Logger.hpp @@ -3,6 +3,8 @@ #include +// ============================================================================= + void logger (QtMsgType type, const QMessageLogContext &context, const QString &msg); #endif // LOGGER_H_