Skip to content

Commit ea9e487

Browse files
tedwainetedwaine
committed
Clang format
1 parent 5f224e8 commit ea9e487

File tree

104 files changed

+1617
-1282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1617
-1282
lines changed

‎include/xstudio/plugin_manager/plugin_base.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace plugin {
6464
const Imath::M44f &transform_viewport_to_image_space,
6565
const float viewport_du_dpixel,
6666
const float device_pixel_ratio,
67-
const xstudio::media_reader::ImageBufPtr &frame){};
67+
const xstudio::media_reader::ImageBufPtr &frame) {};
6868

6969
/* An overlay can render visuals to the viewport without an associated
7070
image via this method. */
@@ -73,7 +73,7 @@ namespace plugin {
7373
const Imath::M44f &transform_viewport_to_normalised_coords,
7474
const media_reader::ImageBufDisplaySetPtr &on_screen_frames,
7575
const float viewport_du_dpixel,
76-
const float device_pixel_ratio){};
76+
const float device_pixel_ratio) {};
7777

7878
[[nodiscard]] virtual RenderPass preferred_render_pass() const { return AfterImage; }
7979

@@ -177,7 +177,8 @@ namespace plugin {
177177

178178
/* Function signature for current playhead playing status change - reimplement to
179179
receive this event */
180-
virtual void on_playhead_playing_changed(const bool // is playing
180+
virtual void on_playhead_playing_changed(
181+
const bool // is playing
181182
) {}
182183

183184
/* Reimplement to receive this notification telling us when the playhead driving a given

‎include/xstudio/ui/canvas/stroke.hpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,16 @@ namespace ui {
7979
[[nodiscard]] float opacity_sensitivity() const { return _opacity_sensitivity; }
8080
[[nodiscard]] StrokeType type() const { return _type; }
8181
[[nodiscard]] size_t hash() const { return _hash; }
82-
const utility::ColourTriplet & colour() const { return _colour; }
83-
const utility::Uuid & id() const { return _id; }
82+
const utility::ColourTriplet &colour() const { return _colour; }
83+
const utility::Uuid &id() const { return _id; }
8484

8585
friend void from_json(const nlohmann::json &j, Stroke &s);
8686
friend void to_json(nlohmann::json &j, const Stroke &s);
8787

88-
private:
88+
private:
89+
void update_hash(const bool update_with_last_point_only = false);
8990

90-
void update_hash(const bool update_with_last_point_only=false);
91-
92-
size_t _hash {0};
91+
size_t _hash{0};
9392
float _opacity{1.0f};
9493
float _thickness{0.0f};
9594
float _softness{0.0f};
@@ -101,7 +100,6 @@ namespace ui {
101100
// Type type{Type::Unknown};
102101
StrokeType _type{StrokeType_Pen};
103102
std::vector<Point> _points;
104-
105103
};
106104

107105
void from_json(const nlohmann::json &j, Stroke &s);

‎include/xstudio/ui/qml/QTreeModelToTableModel.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ class QAbstractItemModel;
3939
class HELPER_QML_EXPORT QTreeModelToTableModel : public QAbstractItemModel {
4040
Q_OBJECT
4141
Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged FINAL)
42-
Q_PROPERTY(QModelIndex rootIndex READ rootIndex WRITE setRootIndex RESET resetRootIndex
43-
NOTIFY rootIndexChanged FINAL)
42+
Q_PROPERTY(
43+
QModelIndex rootIndex READ rootIndex WRITE setRootIndex RESET resetRootIndex NOTIFY
44+
rootIndexChanged FINAL)
4445
Q_PROPERTY(int count READ length NOTIFY lengthChanged)
4546
Q_PROPERTY(int length READ length NOTIFY lengthChanged)
4647

‎include/xstudio/ui/qml/bookmark_model_ui.hpp‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,23 @@ class BOOKMARK_QML_EXPORT BookmarkFilterModel : public QSortFilterProxyModel {
5252

5353
Q_PROPERTY(
5454
QVariantMap mediaOrder READ mediaOrder WRITE setMediaOrder NOTIFY mediaOrderChanged)
55-
Q_PROPERTY(QVariant currentMedia READ currentMedia WRITE setCurrentMedia NOTIFY
56-
currentMediaChanged)
55+
Q_PROPERTY(
56+
QVariant currentMedia READ currentMedia WRITE setCurrentMedia NOTIFY
57+
currentMediaChanged)
5758

5859
Q_PROPERTY(int depth READ depth WRITE setDepth NOTIFY depthChanged)
5960
Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged)
6061
Q_PROPERTY(
6162
QString showUserType READ showUserType WRITE setShowUserType NOTIFY showUserTypeChanged)
62-
Q_PROPERTY(QStringList excludedCategories READ excludedCategories WRITE
63-
setExcludedCategories NOTIFY excludedCategoriesChanged)
64-
Q_PROPERTY(QStringList includedCategories READ includedCategories WRITE
65-
setIncludedCategories NOTIFY includedCategoriesChanged)
66-
Q_PROPERTY(bool sortbyCreated READ sortbyCreated WRITE setsortbyCreated NOTIFY
67-
sortbyCreatedChanged)
63+
Q_PROPERTY(
64+
QStringList excludedCategories READ excludedCategories WRITE setExcludedCategories
65+
NOTIFY excludedCategoriesChanged)
66+
Q_PROPERTY(
67+
QStringList includedCategories READ includedCategories WRITE setIncludedCategories
68+
NOTIFY includedCategoriesChanged)
69+
Q_PROPERTY(
70+
bool sortbyCreated READ sortbyCreated WRITE setsortbyCreated NOTIFY
71+
sortbyCreatedChanged)
6872
Q_PROPERTY(int length READ length NOTIFY lengthChanged)
6973

7074

@@ -138,8 +142,9 @@ class BOOKMARK_QML_EXPORT BookmarkFilterModel : public QSortFilterProxyModel {
138142
class BOOKMARK_QML_EXPORT BookmarkModel : public caf::mixin::actor_object<JSONTreeModel> {
139143
Q_OBJECT
140144

141-
Q_PROPERTY(QString bookmarkActorAddr READ bookmarkActorAddr WRITE setBookmarkActorAddr
142-
NOTIFY bookmarkActorAddrChanged)
145+
Q_PROPERTY(
146+
QString bookmarkActorAddr READ bookmarkActorAddr WRITE setBookmarkActorAddr NOTIFY
147+
bookmarkActorAddrChanged)
143148
Q_PROPERTY(int length READ length NOTIFY lengthChanged)
144149

145150
public:

‎include/xstudio/ui/qml/embedded_python_ui.hpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ namespace ui {
2727
// Q_PROPERTY(int length READ length NOTIFY lengthChanged)
2828
// Q_PROPERTY(int count READ length NOTIFY lengthChanged)
2929

30-
Q_PROPERTY(QString snippetType READ snippetType WRITE setSnippetType NOTIFY
31-
snippetTypeChanged)
30+
Q_PROPERTY(
31+
QString snippetType READ snippetType WRITE setSnippetType NOTIFY
32+
snippetTypeChanged)
3233

3334
public:
3435
using super = QSortFilterProxyModel;
@@ -71,13 +72,16 @@ namespace ui {
7172
Q_PROPERTY(bool waiting READ waiting NOTIFY waitingChanged)
7273
Q_PROPERTY(QUuid sessionId READ sessionId NOTIFY sessionIdChanged)
7374

74-
Q_PROPERTY(QObject *applicationMenuModel READ applicationMenuModel NOTIFY
75-
applicationMenuModelChanged)
76-
Q_PROPERTY(QObject *playlistMenuModel READ playlistMenuModel NOTIFY
77-
playlistMenuModelChanged)
75+
Q_PROPERTY(
76+
QObject *applicationMenuModel READ applicationMenuModel NOTIFY
77+
applicationMenuModelChanged)
78+
Q_PROPERTY(
79+
QObject *playlistMenuModel READ playlistMenuModel NOTIFY
80+
playlistMenuModelChanged)
7881
Q_PROPERTY(QObject *mediaMenuModel READ mediaMenuModel NOTIFY mediaMenuModelChanged)
79-
Q_PROPERTY(QObject *sequenceMenuModel READ sequenceMenuModel NOTIFY
80-
sequenceMenuModelChanged)
82+
Q_PROPERTY(
83+
QObject *sequenceMenuModel READ sequenceMenuModel NOTIFY
84+
sequenceMenuModelChanged)
8185
Q_PROPERTY(QObject *trackMenuModel READ trackMenuModel NOTIFY trackMenuModelChanged)
8286
Q_PROPERTY(QObject *clipMenuModel READ clipMenuModel NOTIFY clipMenuModelChanged)
8387

‎include/xstudio/ui/qml/helper_ui.hpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ namespace ui {
9292
Q_PROPERTY(
9393
double frameRate READ frameRate WRITE setFrameRate NOTIFY timeCodeChanged)
9494
Q_PROPERTY(bool dropFrame READ dropFrame WRITE setDropFrame NOTIFY timeCodeChanged)
95-
Q_PROPERTY(unsigned int totalFrames READ totalFrames WRITE setTotalFrames NOTIFY
96-
timeCodeChanged)
95+
Q_PROPERTY(
96+
unsigned int totalFrames READ totalFrames WRITE setTotalFrames NOTIFY
97+
timeCodeChanged)
9798
Q_PROPERTY(QString timeCode READ timeCode NOTIFY timeCodeChanged)
9899

99100
public:
@@ -970,8 +971,9 @@ namespace ui {
970971
class HELPER_QML_EXPORT ClipboardProxy : public QObject {
971972
Q_OBJECT
972973
Q_PROPERTY(QString text READ dataText WRITE setDataText NOTIFY dataChanged)
973-
Q_PROPERTY(QString selectionText READ selectionText WRITE setSelectionText NOTIFY
974-
selectionChanged)
974+
Q_PROPERTY(
975+
QString selectionText READ selectionText WRITE setSelectionText NOTIFY
976+
selectionChanged)
975977
Q_PROPERTY(QVariant data READ data WRITE setData NOTIFY dataChanged)
976978
Q_PROPERTY(QString html READ html WRITE setHtml NOTIFY dataChanged)
977979
public:
@@ -1121,8 +1123,9 @@ namespace ui {
11211123
class HELPER_QML_EXPORT MarkerModel : public JSONTreeModel {
11221124
Q_OBJECT
11231125

1124-
Q_PROPERTY(QVariant markerData READ markerData WRITE setMarkerData NOTIFY
1125-
markerDataChanged)
1126+
Q_PROPERTY(
1127+
QVariant markerData READ markerData WRITE setMarkerData NOTIFY
1128+
markerDataChanged)
11261129

11271130
public:
11281131
enum Roles {
@@ -1169,8 +1172,9 @@ namespace ui {
11691172

11701173
Q_PROPERTY(QVariant propertyValue READ propertyValue NOTIFY propertyValueChanged)
11711174
Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
1172-
Q_PROPERTY(QString propertyName READ propertyName WRITE setPropertyName NOTIFY
1173-
propertyNameChanged)
1175+
Q_PROPERTY(
1176+
QString propertyName READ propertyName WRITE setPropertyName NOTIFY
1177+
propertyNameChanged)
11741178

11751179
public:
11761180
PropertyFollower(QObject *parent = nullptr) : QObject(parent) {}

‎include/xstudio/ui/qml/hotkey_ui.hpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ namespace ui {
5353

5454
Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged)
5555
Q_PROPERTY(QStringList categories READ categories NOTIFY categoriesChanged)
56-
Q_PROPERTY(QString currentCategory READ currentCategory WRITE setCurrentCategory
57-
NOTIFY currentCategoryChanged)
56+
Q_PROPERTY(
57+
QString currentCategory READ currentCategory WRITE setCurrentCategory NOTIFY
58+
currentCategoryChanged)
5859

5960
HotkeysUI(QObject *parent = nullptr);
6061
~HotkeysUI() override = default;
@@ -118,10 +119,12 @@ namespace ui {
118119

119120
Q_PROPERTY(QString sequence READ sequence WRITE setSequence NOTIFY sequenceChanged)
120121
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
121-
Q_PROPERTY(QString componentName READ componentName WRITE setComponentName NOTIFY
122-
componentNameChanged)
123-
Q_PROPERTY(QString description READ description WRITE setDescription NOTIFY
124-
descriptionChanged)
122+
Q_PROPERTY(
123+
QString componentName READ componentName WRITE setComponentName NOTIFY
124+
componentNameChanged)
125+
Q_PROPERTY(
126+
QString description READ description WRITE setDescription NOTIFY
127+
descriptionChanged)
125128
Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorMessageChanged)
126129
Q_PROPERTY(QString context READ context WRITE setContext NOTIFY contextChanged)
127130
Q_PROPERTY(

‎include/xstudio/ui/qml/json_store_ui.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ namespace ui {
1818
class JsonStoreUI : public QMLActor {
1919

2020
Q_OBJECT
21-
Q_PROPERTY(QString json_string READ json_string WRITE set_json_string NOTIFY
22-
json_string_changed)
21+
Q_PROPERTY(
22+
QString json_string READ json_string WRITE set_json_string NOTIFY
23+
json_string_changed)
2324

2425
public:
2526
explicit JsonStoreUI(QObject *parent = nullptr);

‎include/xstudio/ui/qml/json_tree_model_ui.hpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,15 @@ class HELPER_QML_EXPORT JSONTreeFilterModel : public QSortFilterProxyModel {
283283
Q_PROPERTY(int count READ length NOTIFY lengthChanged)
284284
Q_PROPERTY(bool invert READ invert WRITE setInvert NOTIFY invertChanged)
285285

286-
Q_PROPERTY(bool sortAscending READ sortAscending WRITE setSortAscending NOTIFY
287-
sortAscendingChanged)
286+
Q_PROPERTY(
287+
bool sortAscending READ sortAscending WRITE setSortAscending NOTIFY
288+
sortAscendingChanged)
288289
Q_PROPERTY(
289290
QString sortRoleName READ sortRoleName WRITE setSortRoleName NOTIFY sortRoleNameChanged)
290291

291-
Q_PROPERTY(QString filterRoleName READ filterRoleName WRITE setFilterRoleName NOTIFY
292-
filterRoleNameChanged)
292+
Q_PROPERTY(
293+
QString filterRoleName READ filterRoleName WRITE setFilterRoleName NOTIFY
294+
filterRoleNameChanged)
293295

294296
public:
295297
JSONTreeFilterModel(QObject *parent = nullptr) : QSortFilterProxyModel(parent) {

‎include/xstudio/ui/qml/model_data_ui.hpp‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ class HELPER_QML_EXPORT UIModelData : public caf::mixin::actor_object<JSONTreeMo
2121

2222
Q_OBJECT
2323

24-
Q_PROPERTY(QString modelDataName READ modelDataName WRITE setModelDataName NOTIFY
25-
modelDataNameChanged)
24+
Q_PROPERTY(
25+
QString modelDataName READ modelDataName WRITE setModelDataName NOTIFY
26+
modelDataNameChanged)
2627

2728
public:
2829
using super = caf::mixin::actor_object<JSONTreeModel>;
@@ -207,23 +208,28 @@ class HELPER_QML_EXPORT MenuModelItem : public caf::mixin::actor_object<QObject>
207208
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
208209
Q_PROPERTY(
209210
QString menuModelName READ menuModelName WRITE setMenuName NOTIFY menuNameChanged)
210-
Q_PROPERTY(float menuItemPosition READ menuItemPosition WRITE setMenuItemPosition NOTIFY
211-
menuItemPositionChanged)
211+
Q_PROPERTY(
212+
float menuItemPosition READ menuItemPosition WRITE setMenuItemPosition NOTIFY
213+
menuItemPositionChanged)
212214
Q_PROPERTY(QStringList choices READ choices WRITE setChoices NOTIFY choicesChanged)
213-
Q_PROPERTY(QString currentChoice READ currentChoice WRITE setCurrentChoice NOTIFY
214-
currentChoiceChanged)
215+
Q_PROPERTY(
216+
QString currentChoice READ currentChoice WRITE setCurrentChoice NOTIFY
217+
currentChoiceChanged)
215218
Q_PROPERTY(bool isChecked READ isChecked WRITE setIsChecked NOTIFY isCheckedChanged)
216219
Q_PROPERTY(QUuid hotkeyUuid READ hotkeyUuid WRITE setHotkeyUuid NOTIFY hotkeyUuidChanged)
217220
Q_PROPERTY(
218221
QString menuItemType READ menuItemType WRITE setMenuItemType NOTIFY menuItemTypeChanged)
219-
Q_PROPERTY(QString menuCustomIcon READ menuCustomIcon WRITE setMenuCustomIcon NOTIFY
220-
menuCustomIconChanged)
221-
Q_PROPERTY(QString customMenuQml READ customMenuQml WRITE setCustomMenuQml NOTIFY
222-
customMenuQmlChanged)
222+
Q_PROPERTY(
223+
QString menuCustomIcon READ menuCustomIcon WRITE setMenuCustomIcon NOTIFY
224+
menuCustomIconChanged)
225+
Q_PROPERTY(
226+
QString customMenuQml READ customMenuQml WRITE setCustomMenuQml NOTIFY
227+
customMenuQmlChanged)
223228
Q_PROPERTY(QVariant userData READ userData WRITE setUserData NOTIFY userDataChanged)
224229
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
225-
Q_PROPERTY(QObject *panelContext READ panelContext WRITE setPanelContext NOTIFY
226-
panelContextChanged)
230+
Q_PROPERTY(
231+
QObject *panelContext READ panelContext WRITE setPanelContext NOTIFY
232+
panelContextChanged)
227233
Q_PROPERTY(
228234
QString menuToolTip READ menuToolTip WRITE setMenuToolTip NOTIFY menuToolTipChanged)
229235

0 commit comments

Comments
 (0)