Skip to content

Commit 8e3b3c7

Browse files
floppyhammerfloppyhammer
committed
Fix build error due to revector update
1 parent d5d1a0e commit 8e3b3c7

File tree

13 files changed

+186
-186
lines changed

13 files changed

+186
-186
lines changed

‎3rd/revector‎

Submodule revector updated 98 files

‎src/feature/video_stabilizer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Trajectory Q(pstd, pstd, pstd); // process noise covariance
3232
Trajectory R(cstd, cstd, cstd); // measurement noise covariance
3333

3434
cv::Mat VideoStabilizer::stabilize(cv::Mat prev, cv::Mat cur_grey) {
35-
auto timestamp = Flint::Timestamp("Aviateur");
35+
auto timestamp = revector::Timestamp("Aviateur");
3636

3737
prev_grey = prev;
3838

‎src/gui/control_panel.cpp‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -66,42 +66,42 @@ void ControlPanel::custom_ready() {
6666
keyPath = ini[CONFIG_ADAPTER][ADAPTER_CHANNEL_KEY];
6767
codec = ini[CONFIG_ADAPTER][ADAPTER_CHANNEL_CODEC];
6868

69-
auto default_theme = Flint::DefaultResource::get_singleton()->get_default_theme();
69+
auto default_theme = revector::DefaultResource::get_singleton()->get_default_theme();
7070
theme_bg_ = std::make_optional(default_theme->panel.styles["background"]);
7171
theme_bg_.value().corner_radius = 0;
7272
theme_bg_.value().border_width = 0;
7373
theme_bg_->border_width = 0;
7474

75-
set_anchor_flag(Flint::AnchorFlag::RightWide);
75+
set_anchor_flag(revector::AnchorFlag::RightWide);
7676

77-
tab_container_ = std::make_shared<Flint::TabContainer>();
77+
tab_container_ = std::make_shared<revector::TabContainer>();
7878
add_child(tab_container_);
79-
tab_container_->set_anchor_flag(Flint::AnchorFlag::FullRect);
79+
tab_container_->set_anchor_flag(revector::AnchorFlag::FullRect);
8080

8181
// Wi-Fi card tab
8282
{
83-
auto margin_container = std::make_shared<Flint::MarginContainer>();
83+
auto margin_container = std::make_shared<revector::MarginContainer>();
8484
margin_container->set_margin_all(8);
8585
tab_container_->add_child(margin_container);
8686
tab_container_->set_tab_title(0, FTR("wi-fi card"));
8787

88-
auto vbox_container = std::make_shared<Flint::VBoxContainer>();
88+
auto vbox_container = std::make_shared<revector::VBoxContainer>();
8989
vbox_container->set_separation(8);
9090
margin_container->add_child(vbox_container);
9191

9292
{
93-
auto hbox_container = std::make_shared<Flint::HBoxContainer>();
93+
auto hbox_container = std::make_shared<revector::HBoxContainer>();
9494
hbox_container->set_separation(8);
9595
vbox_container->add_child(hbox_container);
9696

97-
auto label = std::make_shared<Flint::Label>();
97+
auto label = std::make_shared<revector::Label>();
9898
label->set_text(FTR("net card"));
9999
hbox_container->add_child(label);
100100

101-
dongle_menu_button_ = std::make_shared<Flint::MenuButton>();
101+
dongle_menu_button_ = std::make_shared<revector::MenuButton>();
102102

103103
dongle_menu_button_->container_sizing.expand_h = true;
104-
dongle_menu_button_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
104+
dongle_menu_button_->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
105105
hbox_container->add_child(dongle_menu_button_);
106106

107107
// Do this before setting dongle button text.
@@ -111,8 +111,8 @@ void ControlPanel::custom_ready() {
111111
auto callback = [this](uint32_t) { net_card_name = dongle_menu_button_->get_selected_item_text(); };
112112
dongle_menu_button_->connect_signal("item_selected", callback);
113113

114-
refresh_dongle_button_ = std::make_shared<Flint::Button>();
115-
auto icon = std::make_shared<Flint::VectorImage>("assets/Refresh.svg");
114+
refresh_dongle_button_ = std::make_shared<revector::Button>();
115+
auto icon = std::make_shared<revector::VectorImage>("assets/Refresh.svg");
116116
refresh_dongle_button_->set_icon_normal(icon);
117117
refresh_dongle_button_->set_text("");
118118
hbox_container->add_child(refresh_dongle_button_);
@@ -122,16 +122,16 @@ void ControlPanel::custom_ready() {
122122
}
123123

124124
{
125-
auto hbox_container = std::make_shared<Flint::HBoxContainer>();
125+
auto hbox_container = std::make_shared<revector::HBoxContainer>();
126126
vbox_container->add_child(hbox_container);
127127

128-
auto label = std::make_shared<Flint::Label>();
128+
auto label = std::make_shared<revector::Label>();
129129
label->set_text(FTR("channel"));
130130
hbox_container->add_child(label);
131131

132-
channel_button_ = std::make_shared<Flint::MenuButton>();
132+
channel_button_ = std::make_shared<revector::MenuButton>();
133133
channel_button_->container_sizing.expand_h = true;
134-
channel_button_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
134+
channel_button_->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
135135
hbox_container->add_child(channel_button_);
136136

137137
{
@@ -153,16 +153,16 @@ void ControlPanel::custom_ready() {
153153
}
154154

155155
{
156-
auto hbox_container = std::make_shared<Flint::HBoxContainer>();
156+
auto hbox_container = std::make_shared<revector::HBoxContainer>();
157157
vbox_container->add_child(hbox_container);
158158

159-
auto label = std::make_shared<Flint::Label>();
159+
auto label = std::make_shared<revector::Label>();
160160
label->set_text(FTR("channel width"));
161161
hbox_container->add_child(label);
162162

163-
channel_width_button_ = std::make_shared<Flint::MenuButton>();
163+
channel_width_button_ = std::make_shared<revector::MenuButton>();
164164
channel_width_button_->container_sizing.expand_h = true;
165-
channel_width_button_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
165+
channel_width_button_->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
166166
hbox_container->add_child(channel_width_button_);
167167

168168
{
@@ -189,27 +189,27 @@ void ControlPanel::custom_ready() {
189189
}
190190

191191
{
192-
auto hbox_container = std::make_shared<Flint::HBoxContainer>();
192+
auto hbox_container = std::make_shared<revector::HBoxContainer>();
193193
vbox_container->add_child(hbox_container);
194194

195-
auto label = std::make_shared<Flint::Label>();
195+
auto label = std::make_shared<revector::Label>();
196196
label->set_text(FTR("key"));
197197
hbox_container->add_child(label);
198198

199-
auto text_edit = std::make_shared<Flint::TextEdit>();
199+
auto text_edit = std::make_shared<revector::TextEdit>();
200200
text_edit->set_editable(false);
201201
text_edit->set_text(std::filesystem::path(keyPath).filename().string());
202202
text_edit->container_sizing.expand_h = true;
203-
text_edit->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
203+
text_edit->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
204204
hbox_container->add_child(text_edit);
205205

206-
auto file_dialog = std::make_shared<Flint::FileDialog>();
206+
auto file_dialog = std::make_shared<revector::FileDialog>();
207207
add_child(file_dialog);
208208

209209
auto defaultKeyPath = std::filesystem::absolute(keyPath).string();
210210
file_dialog->set_default_path(defaultKeyPath);
211211

212-
auto select_button = std::make_shared<Flint::Button>();
212+
auto select_button = std::make_shared<revector::Button>();
213213
select_button->set_text(FTR("open"));
214214

215215
std::weak_ptr file_dialog_weak = file_dialog;
@@ -227,9 +227,9 @@ void ControlPanel::custom_ready() {
227227
}
228228

229229
{
230-
play_button_ = std::make_shared<Flint::Button>();
230+
play_button_ = std::make_shared<revector::Button>();
231231
play_button_->container_sizing.expand_h = true;
232-
play_button_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
232+
play_button_->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
233233
update_adapter_start_button_looking(true);
234234

235235
auto callback1 = [this] {
@@ -265,33 +265,33 @@ void ControlPanel::custom_ready() {
265265

266266
// Local tab
267267
{
268-
auto margin_container = std::make_shared<Flint::MarginContainer>();
268+
auto margin_container = std::make_shared<revector::MarginContainer>();
269269
margin_container->set_margin_all(8);
270270
tab_container_->add_child(margin_container);
271271
tab_container_->set_tab_title(1, FTR("streaming"));
272272

273-
auto vbox_container = std::make_shared<Flint::VBoxContainer>();
273+
auto vbox_container = std::make_shared<revector::VBoxContainer>();
274274
vbox_container->set_separation(8);
275275
margin_container->add_child(vbox_container);
276276

277-
auto hbox_container = std::make_shared<Flint::HBoxContainer>();
277+
auto hbox_container = std::make_shared<revector::HBoxContainer>();
278278
vbox_container->add_child(hbox_container);
279279

280-
auto label = std::make_shared<Flint::Label>();
280+
auto label = std::make_shared<revector::Label>();
281281
label->set_text("URL:");
282282
hbox_container->add_child(label);
283283

284-
url_edit_ = std::make_shared<Flint::TextEdit>();
284+
url_edit_ = std::make_shared<revector::TextEdit>();
285285
url_edit_->set_editable(true);
286286
url_edit_->set_text(GuiInterface::Instance().ini_[CONFIG_STREAMING][CONFIG_STREAMING_URL]);
287287
url_edit_->container_sizing.expand_h = true;
288-
url_edit_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
288+
url_edit_->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
289289
hbox_container->add_child(url_edit_);
290290

291291
{
292-
play_url_button_ = std::make_shared<Flint::Button>();
292+
play_url_button_ = std::make_shared<revector::Button>();
293293
play_url_button_->container_sizing.expand_h = true;
294-
play_url_button_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
294+
play_url_button_->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
295295
update_url_start_button_looking(true);
296296

297297
auto callback1 = [this] {
@@ -320,13 +320,13 @@ void ControlPanel::custom_ready() {
320320
}
321321
}
322322

323-
void ControlPanel::custom_input(Flint::InputEvent &event) {
324-
auto input_server = Flint::InputServer::get_singleton();
323+
void ControlPanel::custom_input(revector::InputEvent &event) {
324+
auto input_server = revector::InputServer::get_singleton();
325325

326-
if (event.type == Flint::InputEventType::Key) {
326+
if (event.type == revector::InputEventType::Key) {
327327
auto key_args = event.args.key;
328328

329-
if (key_args.key == Flint::KeyCode::F5) {
329+
if (key_args.key == revector::KeyCode::F5) {
330330
if (key_args.pressed) {
331331
if (tab_container_->get_current_tab().has_value()) {
332332
if (tab_container_->get_current_tab().value() == 0) {

‎src/gui/control_panel.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include "../gui_interface.h"
44
#include "app.h"
55

6-
class ControlPanel : public Flint::Container {
6+
class ControlPanel : public revector::Container {
77
public:
8-
std::shared_ptr<Flint::MenuButton> dongle_menu_button_;
9-
std::shared_ptr<Flint::MenuButton> channel_button_;
10-
std::shared_ptr<Flint::MenuButton> channel_width_button_;
11-
std::shared_ptr<Flint::Button> refresh_dongle_button_;
8+
std::shared_ptr<revector::MenuButton> dongle_menu_button_;
9+
std::shared_ptr<revector::MenuButton> channel_button_;
10+
std::shared_ptr<revector::MenuButton> channel_width_button_;
11+
std::shared_ptr<revector::Button> refresh_dongle_button_;
1212

1313
std::string net_card_name;
1414
std::optional<DeviceId> selected_net_card;
@@ -17,12 +17,12 @@ class ControlPanel : public Flint::Container {
1717
std::string keyPath;
1818
std::string codec;
1919

20-
std::shared_ptr<Flint::Button> play_button_;
20+
std::shared_ptr<revector::Button> play_button_;
2121

22-
std::shared_ptr<Flint::Button> play_url_button_;
23-
std::shared_ptr<Flint::TextEdit> url_edit_;
22+
std::shared_ptr<revector::Button> play_url_button_;
23+
std::shared_ptr<revector::TextEdit> url_edit_;
2424

25-
std::shared_ptr<Flint::TabContainer> tab_container_;
25+
std::shared_ptr<revector::TabContainer> tab_container_;
2626

2727
std::vector<DeviceId> devices_;
2828

@@ -34,5 +34,5 @@ class ControlPanel : public Flint::Container {
3434

3535
void custom_ready() override;
3636

37-
void custom_input(Flint::InputEvent &event) override;
37+
void custom_input(revector::InputEvent &event) override;
3838
};

0 commit comments

Comments
 (0)