mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-27 06:01:14 +01:00
fix rebase errors
This commit is contained in:
+6
-4
@@ -56,12 +56,14 @@ class SimulatorBase : public QMainWindow {
|
||||
void showEvent(QShowEvent* event);
|
||||
void closeEvent(QCloseEvent* event);
|
||||
|
||||
private:
|
||||
Web_socket_wrapper* m_web_socket;
|
||||
|
||||
QTimer* timer_update;
|
||||
uint32_t refresh_rate;
|
||||
NetworkError* error_dialog;
|
||||
bool closed = false;
|
||||
QTimer* m_timer_update;
|
||||
uint32_t m_refresh_rate;
|
||||
NetworkError* m_error_dialog;
|
||||
bool m_open = false;
|
||||
std::vector<QWidget*>m_ui_lookup;
|
||||
};
|
||||
|
||||
#endif // SIMULATORBASE_H
|
||||
|
||||
Reference in New Issue
Block a user