diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
| commit | bbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (patch) | |
| tree | 8e8892d24684f005b0e18624677957791e1738b7 /include/aoevidencedisplay.h | |
| parent | 1e2d71fb96ca85fa50c172c2f1cf22b2620bacd2 (diff) | |
| parent | 992c0b14e155059a7e22ad72c0309b620c850a46 (diff) | |
Merge branch '2.7-rc'
Includes full code reformat.
# Conflicts:
# src/aomusicplayer.cpp
# src/path_functions.cpp
Diffstat (limited to 'include/aoevidencedisplay.h')
| -rw-r--r-- | include/aoevidencedisplay.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/aoevidencedisplay.h b/include/aoevidencedisplay.h index 13ca00d..1d6280d 100644 --- a/include/aoevidencedisplay.h +++ b/include/aoevidencedisplay.h @@ -4,19 +4,18 @@ #include "aoapplication.h" #include "aosfxplayer.h" +#include <QDebug> #include <QLabel> #include <QMovie> -#include <QDebug> -class AOEvidenceDisplay : public QLabel -{ +class AOEvidenceDisplay : public QLabel { Q_OBJECT public: AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app); void show_evidence(QString p_evidence_image, bool is_left_side, int p_volume); - QLabel* get_evidence_icon(); + QLabel *get_evidence_icon(); void reset(); private: |