* Bug #14448 fixed: removed havewindow() was still documented 70/18270/6
Samuel GOUGEON [Mon, 20 Jun 2016 23:39:11 +0000 (01:39 +0200)]
  Was poor. Used nowhere. Replaced with getscilabmode()=="STD"

Change-Id: Ic98a8f2cf455085b5969d245253d3615c7ca8933

scilab/CHANGES.md
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/core_gateway.xml
scilab/modules/graphics/help/en_US/window_control/havewindow.xml [deleted file]
scilab/modules/graphics/help/ja_JP/window_control/havewindow.xml [deleted file]
scilab/modules/graphics/help/pt_BR/window_control/havewindow.xml [deleted file]
scilab/modules/graphics/help/ru_RU/window_control/havewindow.xml [deleted file]
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/slint/src/cpp/DeprecatedChecker.cpp

index 393bea1..004848d 100644 (file)
@@ -207,6 +207,7 @@ Removed Functions
 * `lex_sort` has been removed. Please use `gsort(..,"lr")` instead
 * `gspec` was obsolete already in Scilab 4 and is now removed. Please use `spec` instead.
 * `gschur` was obsolete already in Scilab 4 and is now removed. Please use `schur` instead.
+* `havewindow` has been removed. Please use `getscilabmode()=="STD"` instead
 
 * Symbolic module functions have been removed: `addf`, `cmb_lin`, `ldivf`, `mulf`, `rdivf`, `solve`, `subf`, `trianfml`, `trisolve` and `block2exp`.
 * Functionnalities based on former Scilab stack have been removed:
@@ -228,9 +229,10 @@ Bug Fixes
 
 * [Bug #13597](http://bugzilla.scilab.org/show_bug.cgi?id=13597) fixed - `help format` claimed setting a number of digits instead of characters
 * [Bug #14192](http://bugzilla.scilab.org/show_bug.cgi?id=14192) fixed - `g_margin` error-ed for double integrator.
+* [Bug #14448](http://bugzilla.scilab.org/show_bug.cgi?id=14448) fixed - removed havewindow() was still documented
 * [Bug #14557](http://bugzilla.scilab.org/show_bug.cgi?id=14557) fixed - `csim` failed when the system has no state.
 * [Bug #14586](http://bugzilla.scilab.org/show_bug.cgi?id=14586) fixed - Xcos simulation stop button did not work.
-* [Bug #14587](http://bugzilla.scilab.org/show_bug.cgi?id=14587) fixed - Datatip textbox wrong clipping when loaded from *.scg file.
+* [Bug #14587](http://bugzilla.scilab.org/show_bug.cgi?id=14587) fixed - Datatip textbox wrong clipping when loaded from `*.scg` file.
 
 ### In 6.0.0 beta-2 and earlier:
 
index 55f4521..aaa4de5 100644 (file)
@@ -35,7 +35,6 @@ int C2F(sci_funptr)(char *fname, unsigned long fname_len);
 //int C2F(sci_macr2lst)(char *fname, unsigned long fname_len);
 int C2F(sci_whereis)(char *fname, unsigned long fname_len);
 int C2F(sci_where)(char *fname, void* pvApiCtx);
-int C2F(sci_havewindow)(char *fname, unsigned long fname_len);
 //int C2F(sci_stacksize)(char *fname, unsigned long fname_len);
 int C2F(sci_mtlb_mode)(char *fname, unsigned long fname_len);
 int C2F(sci_what)(char *fname, unsigned long fname_len);
index 2ec662b..1edabc6 100644 (file)
@@ -30,7 +30,7 @@
 
  Don't touch if you do not know what you are doing
 -->
-    
+
     <PRIMITIVE gatewayId="13" primitiveId="1" primitiveName="debug" />
     <PRIMITIVE gatewayId="13" primitiveId="2" primitiveName="who" />
     <PRIMITIVE gatewayId="13" primitiveId="3" primitiveName="warning" />
     <PRIMITIVE gatewayId="13" primitiveId="25" primitiveName="dispbpt" />
     <PRIMITIVE gatewayId="13" primitiveId="26" primitiveName="funcprot" />
     <PRIMITIVE gatewayId="13" primitiveId="27" primitiveName="where" />
-    <PRIMITIVE gatewayId="13" primitiveId="28" primitiveName="havewindow" />
-    <PRIMITIVE gatewayId="13" primitiveId="29" primitiveName="stacksize" />
-    <PRIMITIVE gatewayId="13" primitiveId="30" primitiveName="mtlb_mode" />
-    <PRIMITIVE gatewayId="13" primitiveId="31" primitiveName="clear" />
-    <PRIMITIVE gatewayId="13" primitiveId="32" primitiveName="what" />
-    <PRIMITIVE gatewayId="13" primitiveId="33" primitiveName="sciargs" />
-    <PRIMITIVE gatewayId="13" primitiveId="34" primitiveName="ieee" />
-    <PRIMITIVE gatewayId="13" primitiveId="35" primitiveName="typename" />
-    <PRIMITIVE gatewayId="13" primitiveId="36" primitiveName="global" />
-    <PRIMITIVE gatewayId="13" primitiveId="37" primitiveName="clearglobal" />
-    <PRIMITIVE gatewayId="13" primitiveId="38" primitiveName="isglobal" />
-    <PRIMITIVE gatewayId="13" primitiveId="39" primitiveName="gstacksize" />
-    <PRIMITIVE gatewayId="13" primitiveId="40" primitiveName="intppty" />
-    <PRIMITIVE gatewayId="13" primitiveId="41" primitiveName="lasterror" />
-    <PRIMITIVE gatewayId="13" primitiveId="42" primitiveName="getversion" />
-    <PRIMITIVE gatewayId="13" primitiveId="43" primitiveName="macr2tree" />
-    <PRIMITIVE gatewayId="13" primitiveId="44" primitiveName="getos" />
-    <PRIMITIVE gatewayId="13" primitiveId="45" primitiveName="banner" />
-    <PRIMITIVE gatewayId="13" primitiveId="46" primitiveName="getmemory" />
-    <PRIMITIVE gatewayId="13" primitiveId="47" primitiveName="getmd5" />
-    <PRIMITIVE gatewayId="13" primitiveId="48" primitiveName="getmodules" />
-    <PRIMITIVE gatewayId="13" primitiveId="49" primitiveName="with_module" />
-    <PRIMITIVE gatewayId="13" primitiveId="50" primitiveName="getdebuginfo" />
-    <PRIMITIVE gatewayId="13" primitiveId="51" primitiveName="readgateway" />
-    <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="exit" />
-    <PRIMITIVE gatewayId="13" primitiveId="53" primitiveName="oldEmptyBehaviour" />
-    
+    <PRIMITIVE gatewayId="13" primitiveId="28" primitiveName="stacksize" />
+    <PRIMITIVE gatewayId="13" primitiveId="29" primitiveName="mtlb_mode" />
+    <PRIMITIVE gatewayId="13" primitiveId="30" primitiveName="clear" />
+    <PRIMITIVE gatewayId="13" primitiveId="31" primitiveName="what" />
+    <PRIMITIVE gatewayId="13" primitiveId="32" primitiveName="sciargs" />
+    <PRIMITIVE gatewayId="13" primitiveId="33" primitiveName="ieee" />
+    <PRIMITIVE gatewayId="13" primitiveId="34" primitiveName="typename" />
+    <PRIMITIVE gatewayId="13" primitiveId="35" primitiveName="global" />
+    <PRIMITIVE gatewayId="13" primitiveId="36" primitiveName="clearglobal" />
+    <PRIMITIVE gatewayId="13" primitiveId="37" primitiveName="isglobal" />
+    <PRIMITIVE gatewayId="13" primitiveId="38" primitiveName="gstacksize" />
+    <PRIMITIVE gatewayId="13" primitiveId="39" primitiveName="intppty" />
+    <PRIMITIVE gatewayId="13" primitiveId="40" primitiveName="lasterror" />
+    <PRIMITIVE gatewayId="13" primitiveId="41" primitiveName="getversion" />
+    <PRIMITIVE gatewayId="13" primitiveId="42" primitiveName="macr2tree" />
+    <PRIMITIVE gatewayId="13" primitiveId="43" primitiveName="getos" />
+    <PRIMITIVE gatewayId="13" primitiveId="44" primitiveName="banner" />
+    <PRIMITIVE gatewayId="13" primitiveId="45" primitiveName="getmemory" />
+    <PRIMITIVE gatewayId="13" primitiveId="46" primitiveName="getmd5" />
+    <PRIMITIVE gatewayId="13" primitiveId="47" primitiveName="getmodules" />
+    <PRIMITIVE gatewayId="13" primitiveId="48" primitiveName="with_module" />
+    <PRIMITIVE gatewayId="13" primitiveId="49" primitiveName="getdebuginfo" />
+    <PRIMITIVE gatewayId="13" primitiveId="50" primitiveName="readgateway" />
+    <PRIMITIVE gatewayId="13" primitiveId="51" primitiveName="exit" />
+    <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="oldEmptyBehaviour" />
+
     <PRIMITIVE gatewayId="14" primitiveId="1" primitiveName="user" />
-    
+
 </GATEWAY>
diff --git a/scilab/modules/graphics/help/en_US/window_control/havewindow.xml b/scilab/modules/graphics/help/en_US/window_control/havewindow.xml
deleted file mode 100644 (file)
index 2c1c7d4..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * 
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="havewindow">
-    <refnamediv>
-        <refname>havewindow</refname>
-        <refpurpose>return scilab window mode</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>havewindow()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>havewindow()</code> returns <constant>%t</constant> if Scilab
-            has it own window and <constant>%f</constant> if not, i.e.
-            if Scilab has been invoked by <code>scilab -nw</code>. (<literal>nw</literal> stands for "no-window").
-        </para>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/window_control/havewindow.xml b/scilab/modules/graphics/help/ja_JP/window_control/havewindow.xml
deleted file mode 100644 (file)
index b52ee6c..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) INRIA
-
- * 
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
- *
-
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="havewindow">
-    
-    <refnamediv>
-        
-        <refname>havewindow</refname>
-        
-        <refpurpose>Scilabウインドウモードを返す</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>havewindow()</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>havewindow()</code>は,
-            
-            Scilabが独自のウインドウを有する場合に <constant>%t</constant>, 
-            
-            そうでない場合,例えば,Scilab が <code>scilab -nw</code>
-            
-            により起動された場合, に<constant>%f</constant>を返します.
-            
-            (<literal>nw</literal> は,"no-window"を意味します.
-            
-        </para>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/graphics/help/pt_BR/window_control/havewindow.xml b/scilab/modules/graphics/help/pt_BR/window_control/havewindow.xml
deleted file mode 100644 (file)
index be07a2e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * 
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="havewindow" xml:lang="en">
-    <refnamediv>
-        <refname>havewindow</refname>
-        <refpurpose>Retorna o modo de janela do Scilab</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>havewindow()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>Retorna %t se o Scilab possui a sua própria janela e %f se não, i.e.
-            se o Scilab foi chamado com "scilab -nw". (<literal>nw</literal> significa
-            "sem janela").
-        </para>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ru_RU/window_control/havewindow.xml b/scilab/modules/graphics/help/ru_RU/window_control/havewindow.xml
deleted file mode 100644 (file)
index d4c3316..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * 
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ru" xml:id="havewindow">
-    <refnamediv>
-        <refname>havewindow</refname>
-        <refpurpose>возвращает оконный режим Scilab'а</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Синтаксис</title>
-        <synopsis>havewindow()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <code>havewindow()</code> возвращает <constant>%t</constant>, если
-            у Scilab'а собственное окно, и <constant>%f</constant>, если нет, то есть, если Scilab был вызван командой <code>scilab -nw</code>. (<literal>nw</literal> указывает безоконный режим "no-window").
-        </para>
-    </refsection>
-</refentry>
index c998109..934db2f 100644 (file)
@@ -105,6 +105,7 @@ std::unordered_map<std::wstring, std::wstring> DeprecatedChecker::initDep()
     map.emplace(L"xget", L"get");
     map.emplace(L"isoview", L"");
     map.emplace(L"xclear", L"");
+    map.emplace(L"havewindow", L"getscilabmode");
     map.emplace(L"datatipSetStruct", L"");
     map.emplace(L"datatipGetStruct", L"");
     map.emplace(L"fcontour2d", L"contour2d");