Common UP

fastogt · Feb 5, 2017 · 5b026ce · 5b026ce
1 parent 79b78e1
commit 5b026ce
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+1.6.0 /
+[Alexandr Topilski]
+
 1.5.0 / Fabruary 2, 2017
 [Alexandr Topilski]
 - [Redis] Pub/Sub dialog

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0) # deb package fix in 3.3.0
 ###################### Branding ##########################
 
 SET(BRANDING_PROJECT_NAME "FastoNoSQL" CACHE STRING "Branding for ${BRANDING_PROJECT_NAME}") #default
-SET(BRANDING_PROJECT_VERSION "1.5.0.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default
-SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "release" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default
+SET(BRANDING_PROJECT_VERSION "1.6.0.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default
+SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "alfa" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default
   #possible variables: alfa, beta, rc, release
 
 SET(BRANDING_PROJECT_DOMAIN "http://www.fastonosql.com" CACHE STRING "Branding domain url for ${BRANDING_PROJECT_NAME}") #default

diff --git a/FASTOREDIS_CHANELOG b/FASTOREDIS_CHANELOG
@@ -1,3 +1,6 @@
+1.6.0 /
+[Alexandr Topilski]
+
 1.5.0 / Fabruary 2, 2017
 [Alexandr Topilski]
 - Pub/Sub dialog

diff --git a/src/core/logger.cpp b/src/core/logger.cpp
@@ -33,7 +33,7 @@ void Logger::print(const char* mess, common::logging::LEVEL_LOG level, bool noti
 }
 
 void Logger::print(const std::string& mess, common::logging::LEVEL_LOG level, bool notify) {
-  DEBUG_MSG(level, mess);
+  RUNTIME_LOG(level) << mess;
   if (g_watcher) {
     g_watcher(level, mess, notify);
   }

diff --git a/src/gui/editor/fasto_editor_output.cpp b/src/gui/editor/fasto_editor_output.cpp
@@ -185,7 +185,7 @@ bool FastoEditorOutput::setData(const QModelIndex& index, const QVariant& value,
     return false;
   }
 
-  return model_->setData(index, value);
+  return model_->setData(index, value, role);
 }
 
 int FastoEditorOutput::viewMethod() const {

diff --git a/src/main.cpp b/src/main.cpp
@@ -43,16 +43,16 @@ int main(int argc, char* argv[]) {
   file.open(QFile::ReadOnly);
   QString styleSheet = QLatin1String(file.readAll());
   app.setStyleSheet(styleSheet);
-#if defined(LOG_TO_FILE)
-  std::string log_path = common::file_system::prepare_path("~/" PROJECT_NAME_LOWERCASE ".log");
-  INIT_LOGGER(PROJECT_NAME_TITLE, log_path);
+#if defined(NDEBUG)
+  common::logging::LEVEL_LOG level = common::logging::L_INFO;
 #else
-  INIT_LOGGER(PROJECT_NAME_TITLE);
+  common::logging::LEVEL_LOG level = common::logging::L_DEBUG;
 #endif
-#if defined(NDEBUG)
-  SET_LOG_LEVEL(common::logging::L_INFO);
+#if defined(LOG_TO_FILE)
+  std::string log_path = common::file_system::prepare_path("~/" PROJECT_NAME_LOWERCASE ".log");
+  INIT_LOGGER(PROJECT_NAME_TITLE, log_path, level);
 #else
-  SET_LOG_LEVEL(common::logging::L_DEBUG);
+  INIT_LOGGER(PROJECT_NAME_TITLE, level);
 #endif
 
   INIT_TRANSLATION(PROJECT_NAME_LOWERCASE);