[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1291323 by kuemmel:

fix merged build

 M  +1 -1      misc/mingw-release-download-deps.bat  
 M  +6 -6      src/libkstapp/viewitemmanager.cpp  


--- branches/work/kst/portto4/kst/misc/mingw-release-download-deps.bat #1291322:1291323
@@ -3,7 +3,7 @@
 mkdir      mingw-release-download-deps
 cd         mingw-release-download-deps
 
-cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
+cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
 mingw32-make -j
 mingw32-make install
--- branches/work/kst/portto4/kst/src/libkstapp/viewitemmanager.cpp #1291322:1291323
@@ -22,19 +22,19 @@
 
 namespace Kst {
 
-static ViewItemManager *_self = 0;
+static ViewItemManager *_vim_self = 0;
 
 void ViewItemManager::cleanup() {
-  delete _self;
-  _self = 0;
+  delete _vim_self;
+  _vim_self = 0;
 }
 
 ViewItemManager *ViewItemManager::self() {
-  if (!_self) {
-    _self = new ViewItemManager;
+  if (!_vim_self) {
+    _vim_self = new ViewItemManager;
     qAddPostRoutine(cleanup);
   }
-  return _self;
+  return _vim_self;
 }