Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 41 insertions, 40 deletions

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 37daa038..bd41b068 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -3,18 +3,18 @@
 #include "file_functions.h"
 
 #include <QDir>
-#include <QStandardPaths>
 #include <QRegExp>
+#include <QStandardPaths>
 
 #ifdef BASE_OVERRIDE
 #include "base_override.h"
 #endif
 
-//this is a quite broad generalization
-//the most common OSes(mac and windows) are _usually_ case insensitive
-//however, there do exist mac installations with case sensitive filesystems
-//in that case, define CASE_SENSITIVE_FILESYSTEM and compile on a mac
-#if (defined (LINUX) || defined (__linux__))
+// this is a quite broad generalization
+// the most common OSes(mac and windows) are _usually_ case insensitive
+// however, there do exist mac installations with case sensitive filesystems
+// in that case, define CASE_SENSITIVE_FILESYSTEM and compile on a mac
+#if (defined(LINUX) || defined(__linux__))
 #define CASE_SENSITIVE_FILESYSTEM
 #endif
 
@@ -23,7 +23,7 @@ QString AOApplication::get_base_path()
   QString base_path = "";
 #ifdef ANDROID
   QString sdcard_storage = getenv("SECONDARY_STORAGE");
-  if (dir_exists(sdcard_storage + "/AO2/")){
+  if (dir_exists(sdcard_storage + "/AO2/")) {
     base_path = sdcard_storage + "/AO2/";
   }
   else {
@@ -39,10 +39,7 @@ QString AOApplication::get_base_path()
   return base_path;
 }
 
-QString AOApplication::get_data_path()
-{
-  return get_base_path() + "data/";
-}
+QString AOApplication::get_data_path() { return get_base_path() + "data/"; }
 
 QString AOApplication::get_default_theme_path(QString p_file)
 {
@@ -104,39 +101,39 @@ QString AOApplication::get_music_path(QString p_song)
       return p_song;
   }
   else if (file_exists(opus_check))
-  {
-    #ifndef CASE_SENSITIVE_FILESYSTEM
-      return opus_check;
-    #else
-      return get_case_sensitive_path(opus_check);
-    #endif
+#ifndef CASE_SENSITIVE_FILESYSTEM
+    return opus_check;
+#else
+    return get_case_sensitive_path(opus_check);
+#endif
   }
-  else if (file_exists(mp3_check))
-  {
-    #ifndef CASE_SENSITIVE_FILESYSTEM
-      return mp3_check;
-    #else
-      return get_case_sensitive_path(mp3_check);
-    #endif
+  else if (file_exists(mp3_check)) {
+#ifndef CASE_SENSITIVE_FILESYSTEM
+    return mp3_check;
+#else
+    return get_case_sensitive_path(mp3_check);
+#endif
   }
-  else if (file_exists(withending_check))
-  {
-    #ifndef CASE_SENSITIVE_FILESYSTEM
-      return withending_check;
-    #else
-      return get_case_sensitive_path(withending_check);
-    #endif
+  else if (file_exists(withending_check)) {
+#ifndef CASE_SENSITIVE_FILESYSTEM
+    return withending_check;
+#else
+    return get_case_sensitive_path(withending_check);
+#endif
   }
 #ifndef CASE_SENSITIVE_FILESYSTEM
   return get_base_path() + "sounds/music/" + p_song + ".wav";
+  ;
 #else
-  return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + ".wav");
+  return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song +
+                                 ".wav");
 #endif
 }
 
 QString AOApplication::get_background_path(QString p_file)
 {
-  QString path = get_base_path() + "background/" + w_courtroom->get_current_background() + "/" + p_file;
+  QString path = get_base_path() + "background/" +
+                 w_courtroom->get_current_background() + "/" + p_file;
   if (courtroom_constructed) {
 #ifndef CASE_SENSITIVE_FILESYSTEM
     return path;
@@ -167,21 +164,25 @@ QString AOApplication::get_evidence_path(QString p_file)
 #endif
 }
 
-QString AOApplication::get_case_sensitive_path(QString p_file) {
-  //first, check to see if it's actually there (also serves as base case for recursion)
-  if (exists(p_file)) return p_file;
+QString AOApplication::get_case_sensitive_path(QString p_file)
+{
+  // first, check to see if it's actually there (also serves as base case for
+  // recursion)
+  if (exists(p_file))
+    return p_file;
 
   QFileInfo file(p_file);
 
   QString file_basename = file.fileName();
   QString file_parent_dir = get_case_sensitive_path(file.absolutePath());
 
-  //second, does it exist in the new parent dir?
+  // second, does it exist in the new parent dir?
   if (exists(file_parent_dir + "/" + file_basename))
     return file_parent_dir + "/" + file_basename;
 
-  //last resort, dirlist parent dir and find case insensitive match
-  QRegExp file_rx = QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString);
+  // last resort, dirlist parent dir and find case insensitive match
+  QRegExp file_rx =
+      QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString);
   QStringList files = QDir(file_parent_dir).entryList();
 
   int result = files.indexOf(file_rx);
@@ -189,6 +190,6 @@ QString AOApplication::get_case_sensitive_path(QString p_file) {
   if (result != -1)
     return file_parent_dir + "/" + files.at(result);
 
-  //if nothing is found, let the caller handle the missing file
+  // if nothing is found, let the caller handle the missing file
   return file_parent_dir + "/" + file_basename;
 }