Review Settings

fastogt · Mar 31, 2019 · 5d5fe83 · 5d5fe83
1 parent dc9e0a9
commit 5d5fe83
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2.2.1 /
+[Alexandr Topilski]
+
 2.2.0 / March 31, 2019
 [Alexandr Topilski]
 - Integrate KeyDB api database

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.6.3) # OPENSSL_USE_STATIC_LIBS
 ###################### Branding ##########################
 
 SET(BRANDING_PROJECT_NAME "FastoNoSQL" CACHE STRING "Branding for ${BRANDING_PROJECT_NAME}") #default
-SET(BRANDING_PROJECT_VERSION "2.2.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 "2.2.1.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_TYPE_VERSION "community" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default
   # possible variables: community, pro, enterprise

diff --git a/FASTOREDIS_CHANGELOG b/FASTOREDIS_CHANGELOG
@@ -1,4 +1,7 @@
-2.2.0 / March 31, 2019
+2.1.3 /
+[Alexandr Topilski]
+
+2.1.2 / March 31, 2019
 [Alexandr Topilski]
 - Update core lib
 

diff --git a/build/fastoredis.txt b/build/fastoredis.txt
@@ -11,7 +11,7 @@
 -DBUILD_WITH_KEYDB=OFF
 -DBRANDING_PROJECT_BUILD_TYPE_VERSION:STRING=release
 -DBRANDING_PROJECT_NAME:STRING=FastoRedis
--DBRANDING_PROJECT_VERSION:STRING=2.1.2.0
+-DBRANDING_PROJECT_VERSION:STRING=2.1.3.0
 -DBRANDING_PROJECT_DOMAIN:STRING=https://fastoredis.com
 -DBRANDING_PROJECT_DOWNLOAD_LINK:STRING=https://fastoredis.com/anonim_users_downloads
 -DBRANDING_PROJECT_DOWNLOAD_LINK_PRO:STRING=https://fastoredis.com/pro_users_downloads

diff --git a/src/gui/db/leveldb/connection_widget.h b/src/gui/db/leveldb/connection_widget.h
@@ -28,7 +28,7 @@ class ConnectionWidget : public ConnectionLocalWidgetDirectoryPath {
   Q_OBJECT
 
  public:
-  typedef ConnectionBaseWidget base_class;
+  typedef ConnectionLocalWidgetDirectoryPath base_class;
   template <typename T, typename... Args>
   friend T* gui::createWidget(Args&&... args);
 

diff --git a/src/gui/db/memcached/connection_widget.h b/src/gui/db/memcached/connection_widget.h
@@ -29,7 +29,7 @@ class ConnectionWidget : public ConnectionRemoteWidget {
   Q_OBJECT
 
  public:
-  typedef ConnectionBaseWidget base_class;
+  typedef ConnectionRemoteWidget base_class;
   template <typename T, typename... Args>
   friend T* gui::createWidget(Args&&... args);
 

diff --git a/src/gui/db/ssdb/connection_widget.h b/src/gui/db/ssdb/connection_widget.h
@@ -30,7 +30,7 @@ class ConnectionWidget : public ConnectionRemoteWidget {
   Q_OBJECT
 
  public:
-  typedef ConnectionBaseWidget base_class;
+  typedef ConnectionRemoteWidget base_class;
   template <typename T, typename... Args>
   friend T* gui::createWidget(Args&&... args);