Merge branch '2.7-rc'

Includes full code reformat.

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

1 files changed, 8 insertions, 11 deletions

diff --git a/src/aoevidencebutton.cpp b/src/aoevidencebutton.cpp
index 4dc0395..d0a6ac1 100644
--- a/src/aoevidencebutton.cpp
+++ b/src/aoevidencebutton.cpp
@@ -2,7 +2,9 @@
 
 #include "file_functions.h"
 
-AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent)
+AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app,
+                                   int p_x, int p_y)
+    : QPushButton(p_parent)
 {
   ao_app = p_ao_app;
   m_parent = p_parent;
@@ -39,13 +41,11 @@ void AOEvidenceButton::set_image(QString p_image)
 {
   QString image_path = ao_app->get_evidence_path(p_image);
 
-  if (file_exists(image_path))
-  {
+  if (file_exists(image_path)) {
     this->setText("");
     this->setStyleSheet("border-image:url(\"" + image_path + "\")");
   }
-  else
-  {
+  else {
     this->setText(p_image);
     this->setStyleSheet("");
   }
@@ -75,10 +75,7 @@ void AOEvidenceButton::set_selected(bool p_selected)
     ui_selected->hide();
 }
 
-void AOEvidenceButton::on_clicked()
-{
-  evidence_clicked(m_id);
-}
+void AOEvidenceButton::on_clicked() { evidence_clicked(m_id); }
 
 void AOEvidenceButton::mouseDoubleClickEvent(QMouseEvent *e)
 {
@@ -98,7 +95,7 @@ void AOEvidenceButton::dragEnterEvent(QMouseEvent *e)
 }
 */
 
-void AOEvidenceButton::enterEvent(QEvent * e)
+void AOEvidenceButton::enterEvent(QEvent *e)
 {
   ui_selector->show();
 
@@ -108,7 +105,7 @@ void AOEvidenceButton::enterEvent(QEvent * e)
   QPushButton::enterEvent(e);
 }
 
-void AOEvidenceButton::leaveEvent(QEvent * e)
+void AOEvidenceButton::leaveEvent(QEvent *e)
 {
   ui_selector->hide();