diff options
author | vng <viktor.govako@gmail.com> | 2013-02-21 23:17:52 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:22 +0300 |
commit | f4a9517f296862ee33899a8a5d3542d50b8075fc (patch) | |
tree | ec8ab2f12a86da9749e64b5c8030c97557819cbe /qt/main.cpp | |
parent | 04c48bb054e3062dda273a4bd3f35911dce5c449 (diff) |
- Remove version.pro generating;
- New HEADER format for mwm container with mwm data version;
- Increase mom version because of new search index format;
Diffstat (limited to 'qt/main.cpp')
-rw-r--r-- | qt/main.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/qt/main.cpp b/qt/main.cpp index d498210c14..d31e1c36dc 100644 --- a/qt/main.cpp +++ b/qt/main.cpp @@ -10,8 +10,6 @@ #include "../coding/file_reader.hpp" -#include "../version/version.hpp" - #include "../std/cstdio.hpp" #include <QtGui/QApplication> @@ -19,7 +17,6 @@ //#include <google/protobuf/stubs/common.h> -#define SETTING_EULA_ACCEPTED "EulaAccepted" namespace { @@ -63,9 +60,6 @@ int main(int argc, char * argv[]) InitializeFinalize mainGuard; UNUSED_VALUE(mainGuard); - LOG_SHORT(LINFO, ("Started MapsWithMe version", VERSION_STRING)); - LOG_SHORT(LINFO, ("Built on", VERSION_DATE_STRING)); - QApplication a(argc, argv); (void)GetPlatform(); @@ -86,8 +80,9 @@ int main(int argc, char * argv[]) Settings::Set("Units", u); // display EULA if needed + char const * settingsEULA = "EulaAccepted"; bool eulaAccepted = false; - if (!Settings::Get(SETTING_EULA_ACCEPTED, eulaAccepted) || !eulaAccepted) + if (!Settings::Get(settingsEULA, eulaAccepted) || !eulaAccepted) { QStringList buttons; buttons << "Accept" << "Decline"; @@ -99,7 +94,7 @@ int main(int argc, char * argv[]) } qt::InfoDialog eulaDialog("MapsWithMe End User Licensing Agreement", buffer.c_str(), NULL, buttons); eulaAccepted = (eulaDialog.exec() == 1); - Settings::Set(SETTING_EULA_ACCEPTED, eulaAccepted); + Settings::Set(settingsEULA, eulaAccepted); } int returnCode = -1; |