aboutsummaryrefslogtreecommitdiff
path: root/include/aoscene.h
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2020-05-22 01:18:24 +0300
committerCrystalwarrior <varsash@gmail.com>2020-05-22 01:18:24 +0300
commitc8e12558cdd3fd0769b81679ad09edf1f29b780f (patch)
tree7dae2225e574c3ee55d6b82a1d2f399db4ace5c0 /include/aoscene.h
parentdfac0652c8eb9bd48ceea7ae755e9c2f7e5cb1a2 (diff)
Clang-ify the code with this styling using Visual Studio Code:
{ BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Stroustrup, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All } (this is the Visual Studio preset with only "BreakBeforeBraces" changed from Allman to Stroustrup)
Diffstat (limited to 'include/aoscene.h')
-rw-r--r--include/aoscene.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/include/aoscene.h b/include/aoscene.h
index 46d8c3b8..3093b0fb 100644
--- a/include/aoscene.h
+++ b/include/aoscene.h
@@ -1,39 +1,39 @@
#ifndef AOSCENE_H
#define AOSCENE_H
-#include <QLabel>
#include <QDebug>
+#include <QLabel>
#include <QMovie>
class Courtroom;
class AOApplication;
-class AOScene : public QLabel
-{
- Q_OBJECT
+class AOScene : public QLabel {
+ Q_OBJECT
public:
- explicit AOScene(QWidget *parent, AOApplication *p_ao_app);
+ explicit AOScene(QWidget *parent, AOApplication *p_ao_app);
+
+ void set_image(QString p_image);
+ void set_legacy_desk(QString p_image);
- void set_image(QString p_image);
- void set_legacy_desk(QString p_image);
+ //Move the label itself around
+ void move(int ax, int ay);
- //Move the label itself around
- void move(int ax, int ay);
+ //This is somewhat pointless now as there's no "QMovie" object to resize, aka no "combo" to speak of
+ void combo_resize(int w, int h);
- //This is somewhat pointless now as there's no "QMovie" object to resize, aka no "combo" to speak of
- void combo_resize(int w, int h);
private:
- QWidget *m_parent;
- QMovie *m_movie;
- AOApplication *ao_app;
- QString last_image;
-
- // These are the X and Y values before they are fixed based on the sprite's width.
- int x = 0;
- int y = 0;
- // These are the width and height values before they are fixed based on the sprite's width.
- int f_w = 0;
- int f_h = 0;
+ QWidget *m_parent;
+ QMovie *m_movie;
+ AOApplication *ao_app;
+ QString last_image;
+
+ // These are the X and Y values before they are fixed based on the sprite's width.
+ int x = 0;
+ int y = 0;
+ // These are the width and height values before they are fixed based on the sprite's width.
+ int f_w = 0;
+ int f_h = 0;
};
#endif // AOSCENE_H