Merge branch '2.7-rc'

Includes full code reformat.

# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp

1 files changed, 11 insertions, 12 deletions

diff --git a/src/hex_functions.cpp b/src/hex_functions.cpp
index 4a58d2b..1e35718 100644
--- a/src/hex_functions.cpp
+++ b/src/hex_functions.cpp
@@ -1,18 +1,17 @@
 #include "hex_functions.h"
 
-namespace omni
+namespace omni {
+std::string int_to_hex(unsigned int input)
 {
-  std::string int_to_hex(unsigned int input)
-  {
-    if (input > 255)
-      return "FF";
+  if (input > 255)
+    return "FF";
 
-    std::stringstream stream;
-    stream << std::setfill('0') << std::setw(sizeof(char)*2)
-           << std::hex << input;
-    std::string result(stream.str());
-    std::transform(result.begin(), result.end(), result.begin(), ::toupper);
+  std::stringstream stream;
+  stream << std::setfill('0') << std::setw(sizeof(char) * 2) << std::hex
+         << input;
+  std::string result(stream.str());
+  std::transform(result.begin(), result.end(), result.begin(), ::toupper);
 
-    return result;
-  }
+  return result;
 }
+} // namespace omni