mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-20 13:23:59 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -12,15 +12,18 @@
|
||||
#include <QtWidgets/QMainWindow>
|
||||
|
||||
#include <array>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
class Framework;
|
||||
class QDockWidget;
|
||||
class QLabel;
|
||||
class QPushButton;
|
||||
|
||||
namespace search { class Result; }
|
||||
namespace search
|
||||
{
|
||||
class Result;
|
||||
}
|
||||
|
||||
namespace qt
|
||||
{
|
||||
@@ -28,7 +31,9 @@ class DrawWidget;
|
||||
class PopupMenuHolder;
|
||||
struct ScreenshotParams;
|
||||
|
||||
class MainWindow : public QMainWindow, location::LocationObserver
|
||||
class MainWindow
|
||||
: public QMainWindow
|
||||
, location::LocationObserver
|
||||
{
|
||||
DrawWidget * m_pDrawWidget = nullptr;
|
||||
// TODO(mgsergio): Make indexing more informative.
|
||||
@@ -52,7 +57,7 @@ class MainWindow : public QMainWindow, location::LocationObserver
|
||||
{
|
||||
/// @todo Uncomment when we will integrate a traffic provider.
|
||||
// TRAFFIC = 0,
|
||||
TRANSIT = 0, // Metro scheme
|
||||
TRANSIT = 0, // Metro scheme
|
||||
ISOLINES,
|
||||
OUTDOORS,
|
||||
};
|
||||
@@ -68,17 +73,17 @@ class MainWindow : public QMainWindow, location::LocationObserver
|
||||
QAction * m_pGetStatisticsAction = nullptr;
|
||||
QAction * m_pRunTestsAction = nullptr;
|
||||
QAction * m_pBuildPhonePackAction = nullptr;
|
||||
#endif // BUILD_DESIGNER
|
||||
#endif // BUILD_DESIGNER
|
||||
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
MainWindow(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams,
|
||||
QRect const & screenGeometry
|
||||
MainWindow(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams, QRect const & screenGeometry
|
||||
#ifdef BUILD_DESIGNER
|
||||
, QString const & mapcssFilePath = QString()
|
||||
,
|
||||
QString const & mapcssFilePath = QString()
|
||||
#endif
|
||||
);
|
||||
);
|
||||
|
||||
protected:
|
||||
Framework & GetFramework() const;
|
||||
@@ -87,8 +92,8 @@ protected:
|
||||
void OnLocationUpdated(location::GpsInfo const & info) override;
|
||||
void LocationStateModeChanged(location::EMyPositionMode mode);
|
||||
|
||||
void CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name,
|
||||
QKeySequence const & hotkey, char const * slot);
|
||||
void CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name, QKeySequence const & hotkey,
|
||||
char const * slot);
|
||||
void CreateNavigationBar();
|
||||
void CreateSearchBarAndPanel();
|
||||
void CreateCountryStatusControls();
|
||||
@@ -105,7 +110,7 @@ protected:
|
||||
protected Q_SLOTS:
|
||||
#ifndef NO_DOWNLOADER
|
||||
void ShowUpdateDialog();
|
||||
#endif // NO_DOWNLOADER
|
||||
#endif // NO_DOWNLOADER
|
||||
|
||||
void OnPreferences();
|
||||
void OnAbout();
|
||||
@@ -142,6 +147,6 @@ protected Q_SLOTS:
|
||||
void OnGetStatistics();
|
||||
void OnRunTests();
|
||||
void OnBuildPhonePackage();
|
||||
#endif // BUILD_DESIGNER
|
||||
#endif // BUILD_DESIGNER
|
||||
};
|
||||
} // namespace qt
|
||||
|
||||
Reference in New Issue
Block a user