From 242d02879fef34b6495a88175ce43479e6b33d65 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sat, 5 Dec 2015 08:46:23 +0000 Subject: [PATCH] Misc code style fixes --- src/backend/helpers/version.cpp | 2 +- src/backend/masterlist.cpp | 10 ++++++---- src/backend/metadata/file.cpp | 2 +- src/backend/metadata/message_content.cpp | 2 +- src/backend/metadata/plugin_dirty_info.cpp | 2 +- src/backend/metadata/tag.cpp | 2 +- src/gui/main.cpp | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/backend/helpers/version.cpp b/src/backend/helpers/version.cpp index bd4decf6..1740fc72 100644 --- a/src/backend/helpers/version.cpp +++ b/src/backend/helpers/version.cpp @@ -115,4 +115,4 @@ namespace loot { bool Version::operator != (const Version& ver) const { return pseudosem::compare(this->verString, ver.AsString()) != 0; } - } +} diff --git a/src/backend/masterlist.cpp b/src/backend/masterlist.cpp index f145530b..e555bb27 100644 --- a/src/backend/masterlist.cpp +++ b/src/backend/masterlist.cpp @@ -136,8 +136,8 @@ namespace loot { // Branch doesn't exist. Create a new branch using the remote branch's latest commit. git.CheckoutNewBranch("origin", repoBranch); else { - // The local branch exists. Need to merge the remote branch - // into it. + // The local branch exists. Need to merge the remote branch + // into it. git.Call(ret); // Handle other errors from preceding branch lookup. // Check if HEAD points to the desired branch and set it to if not. @@ -207,9 +207,11 @@ namespace loot { BOOST_LOG_TRIVIAL(info) << "Local branch and masterlist file are already up to date."; return false; } - } else + } + else BOOST_LOG_TRIVIAL(trace) << "Local branch heads is ahead of remote branch head."; - } else + } + else BOOST_LOG_TRIVIAL(trace) << "Local branch can be fast-forwarded to remote branch."; if (updateBranchHead) { diff --git a/src/backend/metadata/file.cpp b/src/backend/metadata/file.cpp index 269ed4da..4ac891ff 100644 --- a/src/backend/metadata/file.cpp +++ b/src/backend/metadata/file.cpp @@ -73,4 +73,4 @@ namespace YAML { return out; } -} \ No newline at end of file +} diff --git a/src/backend/metadata/message_content.cpp b/src/backend/metadata/message_content.cpp index 3032e51c..d0c2037d 100644 --- a/src/backend/metadata/message_content.cpp +++ b/src/backend/metadata/message_content.cpp @@ -63,4 +63,4 @@ namespace YAML { return out; } -} \ No newline at end of file +} diff --git a/src/backend/metadata/plugin_dirty_info.cpp b/src/backend/metadata/plugin_dirty_info.cpp index 17eaa7cd..edbf27de 100644 --- a/src/backend/metadata/plugin_dirty_info.cpp +++ b/src/backend/metadata/plugin_dirty_info.cpp @@ -105,4 +105,4 @@ namespace YAML { return out; } -} \ No newline at end of file +} diff --git a/src/backend/metadata/tag.cpp b/src/backend/metadata/tag.cpp index 2c3149df..2b559fcd 100644 --- a/src/backend/metadata/tag.cpp +++ b/src/backend/metadata/tag.cpp @@ -74,4 +74,4 @@ namespace YAML { return out; } -} \ No newline at end of file +} diff --git a/src/gui/main.cpp b/src/gui/main.cpp index b9642eed..ca50880b 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -158,7 +158,7 @@ int main(int argc, char* argv[]) { // Initialise CEF settings. CefSettings cef_settings = GetCefSettings(); - + #ifndef _WIN32 // Install xlib error handlers so that the application won't be terminated // on non-fatal errors.