From a9f4ff6d612c1d2f3e30b8a30dc26b36b131d935 Mon Sep 17 00:00:00 2001 From: Mikhail Gorbushin Date: Sat, 15 Jun 2019 19:08:40 +0300 Subject: [PATCH] [qt] move anonymous namespace from namespace qt {} --- qt/mainwindow.cpp | 97 +++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index d352c33887..7f5deab10f 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -64,6 +64,45 @@ namespace { using namespace qt; +struct button_t +{ + QString name; + char const * icon; + char const * slot; +}; + +void add_buttons(QToolBar * pBar, button_t buttons[], size_t count, QObject * pReceiver) +{ + for (size_t i = 0; i < count; ++i) + { + if (buttons[i].icon) + pBar->addAction(QIcon(buttons[i].icon), buttons[i].name, pReceiver, buttons[i].slot); + else + pBar->addSeparator(); + } +} + +void FormatMapSize(uint64_t sizeInBytes, string & units, size_t & sizeToDownload) +{ + int const mbInBytes = 1024 * 1024; + int const kbInBytes = 1024; + if (sizeInBytes > mbInBytes) + { + sizeToDownload = (sizeInBytes + mbInBytes - 1) / mbInBytes; + units = "MB"; + } + else if (sizeInBytes > kbInBytes) + { + sizeToDownload = (sizeInBytes + kbInBytes -1) / kbInBytes; + units = "KB"; + } + else + { + sizeToDownload = sizeInBytes; + units = "B"; + } +} + DrawWidget::SelectionMode ConvertFromMwmsBordersSelection(qt::MwmsBordersSelection::Response mode) { switch (mode) @@ -96,6 +135,14 @@ DrawWidget::SelectionMode ConvertFromMwmsBordersSelection(qt::MwmsBordersSelecti UNREACHABLE(); } } + +bool IsMwmsBordersSelectionMode(DrawWidget::SelectionMode mode) +{ + return mode == DrawWidget::SelectionMode::MwmsBordersByPolyFiles || + mode == DrawWidget::SelectionMode::MwmsBordersWithVerticesByPolyFiles || + mode == DrawWidget::SelectionMode::MwmsBordersByPackedPolygon || + mode == DrawWidget::SelectionMode::MwmsBordersWithVerticesByPackedPolygon; +} } // namespace namespace qt @@ -269,56 +316,6 @@ void MainWindow::LocationStateModeChanged(location::EMyPositionMode mode) m_pMyPositionAction->setToolTip(tr("My Position")); } -namespace -{ -struct button_t -{ - QString name; - char const * icon; - char const * slot; -}; - -void add_buttons(QToolBar * pBar, button_t buttons[], size_t count, QObject * pReceiver) -{ - for (size_t i = 0; i < count; ++i) - { - if (buttons[i].icon) - pBar->addAction(QIcon(buttons[i].icon), buttons[i].name, pReceiver, buttons[i].slot); - else - pBar->addSeparator(); - } -} - -void FormatMapSize(uint64_t sizeInBytes, string & units, size_t & sizeToDownload) -{ - int const mbInBytes = 1024 * 1024; - int const kbInBytes = 1024; - if (sizeInBytes > mbInBytes) - { - sizeToDownload = (sizeInBytes + mbInBytes - 1) / mbInBytes; - units = "MB"; - } - else if (sizeInBytes > kbInBytes) - { - sizeToDownload = (sizeInBytes + kbInBytes -1) / kbInBytes; - units = "KB"; - } - else - { - sizeToDownload = sizeInBytes; - units = "B"; - } -} - -bool IsMwmsBordersSelectionMode(DrawWidget::SelectionMode mode) -{ - return mode == DrawWidget::SelectionMode::MwmsBordersByPolyFiles || - mode == DrawWidget::SelectionMode::MwmsBordersWithVerticesByPolyFiles || - mode == DrawWidget::SelectionMode::MwmsBordersByPackedPolygon || - mode == DrawWidget::SelectionMode::MwmsBordersWithVerticesByPackedPolygon; -} -} // namespace - void MainWindow::CreateNavigationBar() { QToolBar * pToolBar = new QToolBar(tr("Navigation Bar"), this);