Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qt
diff options
context:
space:
mode:
authorAlex Zolotarev <alex@maps.me>2016-03-13 23:34:07 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:53:23 +0300
commitaa380f763b17b4c7fa37b8c1506e8f7d0c9d448f (patch)
treef869ae3c133a241bdefb343915c95ccbe8952e9d /qt
parent8b6991837a1fc8a9273a6e2acda9157e78ff99e3 (diff)
Lowercased settings namespace.
Diffstat (limited to 'qt')
-rw-r--r--qt/main.cpp4
-rw-r--r--qt/mainwindow.cpp8
-rw-r--r--qt/osm_auth_dialog.cpp12
-rw-r--r--qt/preferences_dialog.cpp8
4 files changed, 16 insertions, 16 deletions
diff --git a/qt/main.cpp b/qt/main.cpp
index 144420eee2..4ddc143999 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -83,7 +83,7 @@ int main(int argc, char * argv[])
// display EULA if needed
char const * settingsEULA = "EulaAccepted";
bool eulaAccepted = false;
- if (!Settings::Get(settingsEULA, eulaAccepted) || !eulaAccepted)
+ if (!settings::Get(settingsEULA, eulaAccepted) || !eulaAccepted)
{
QStringList buttons;
buttons << "Accept" << "Decline";
@@ -95,7 +95,7 @@ int main(int argc, char * argv[])
}
qt::InfoDialog eulaDialog("MAPS.ME End User Licensing Agreement", buffer.c_str(), NULL, buttons);
eulaAccepted = (eulaDialog.exec() == 1);
- Settings::Set(settingsEULA, eulaAccepted);
+ settings::Set(settingsEULA, eulaAccepted);
}
int returnCode = -1;
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 7a8b3ef1c4..5749469074 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -133,7 +133,7 @@ MainWindow::MainWindow() : m_locationService(CreateDesktopLocationService(*this)
#ifndef NO_DOWNLOADER
// Show intro dialog if necessary
bool bShow = true;
- (void)Settings::Get("ShowWelcome", bShow);
+ (void)settings::Get("ShowWelcome", bShow);
if (bShow)
{
@@ -155,7 +155,7 @@ MainWindow::MainWindow() : m_locationService(CreateDesktopLocationService(*this)
if (welcomeDlg.exec() == QDialog::Rejected)
bShowUpdateDialog = false;
}
- Settings::Set("ShowWelcome", false);
+ settings::Set("ShowWelcome", false);
if (bShowUpdateDialog)
ShowUpdateDialog();
@@ -494,8 +494,8 @@ void MainWindow::OnLoginMenuItem()
void MainWindow::OnUploadEditsMenuItem()
{
string key, secret;
- Settings::Get(kTokenKeySetting, key);
- Settings::Get(kTokenSecretSetting, secret);
+ settings::Get(kTokenKeySetting, key);
+ settings::Get(kTokenSecretSetting, secret);
if (key.empty() || secret.empty())
OnLoginMenuItem();
else
diff --git a/qt/osm_auth_dialog.cpp b/qt/osm_auth_dialog.cpp
index ea1305e0fa..8141717eab 100644
--- a/qt/osm_auth_dialog.cpp
+++ b/qt/osm_auth_dialog.cpp
@@ -24,8 +24,8 @@ char const * kLogoutDialogTitle = "Logout Dialog";
OsmAuthDialog::OsmAuthDialog(QWidget * parent)
{
string key, secret;
- Settings::Get(kTokenKeySetting, key);
- Settings::Get(kTokenSecretSetting, secret);
+ settings::Get(kTokenKeySetting, key);
+ settings::Get(kTokenSecretSetting, secret);
bool const isLoginDialog = key.empty() || secret.empty();
@@ -108,8 +108,8 @@ void OsmAuthDialog::OnAction()
if (auth.AuthorizePassword(login, password))
{
auto const token = auth.GetKeySecret();
- Settings::Set(kTokenKeySetting, token.first);
- Settings::Set(kTokenSecretSetting, token.second);
+ settings::Set(kTokenKeySetting, token.first);
+ settings::Set(kTokenSecretSetting, token.second);
SwitchToLogout(this);
}
@@ -127,8 +127,8 @@ void OsmAuthDialog::OnAction()
}
else
{
- Settings::Set(kTokenKeySetting, string());
- Settings::Set(kTokenSecretSetting, string());
+ settings::Set(kTokenKeySetting, string());
+ settings::Set(kTokenSecretSetting, string());
SwitchToLogin(this);
}
diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 98786f8f62..d7c3d84a5a 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -40,7 +40,7 @@ namespace qt
{
QHBoxLayout * pLayout = new QHBoxLayout();
- using namespace Settings;
+ using namespace settings;
QRadioButton * p = new QRadioButton("Metric");
pLayout->addWidget(p);
@@ -53,7 +53,7 @@ namespace qt
radioBox->setLayout(pLayout);
Units u;
- if (!Settings::Get(Settings::kMeasurementUnits, u))
+ if (!settings::Get(settings::kMeasurementUnits, u))
{
// set default measurement from system locale
if (QLocale::system().measurementSystem() == QLocale::MetricSystem)
@@ -92,7 +92,7 @@ namespace qt
void PreferencesDialog::OnUnitsChanged(int i)
{
- using namespace Settings;
+ using namespace settings;
Units u;
switch (i)
@@ -101,6 +101,6 @@ namespace qt
case 1: u = Foot; break;
}
- Settings::Set(kMeasurementUnits, u);
+ settings::Set(kMeasurementUnits, u);
}
}