Remove dead/useless code 24/10324/2
Sylvestre Ledru [Mon, 28 Jan 2013 08:19:24 +0000 (09:19 +0100)]
Change-Id: Ie0c72fb3a52b6a45d1b83dd6d0ca9f769e3ca454

scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/includes/gw_graphic_objects.h [deleted file]
scilab/modules/graphic_objects/locales/graphic_objects.pot
scilab/modules/graphic_objects/sci_gateway/c/gw_graphic_objects.c [deleted file]
scilab/modules/graphic_objects/sci_gateway/cpp/sci_graphicfunction.cpp [deleted file]
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters

index 7d675c4..5d80054 100644 (file)
@@ -78,10 +78,6 @@ BUILT_SOURCES += giws
 endif
 
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_graphic_objects.c
-
-GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_graphicfunction.cpp
-
 libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/cpp/ \
index 079ead4..3fc5161 100644 (file)
@@ -153,9 +153,7 @@ am__objects_2 = libscigraphic_objects_la-DataLoader_wrap.lo \
        libscigraphic_objects_la-ScilabNativeView_wrap.lo
 am__objects_3 = libscigraphic_objects_la-CallGraphicController.lo \
        libscigraphic_objects_la-GraphicObjectBuilder.lo
-am__objects_4 = libscigraphic_objects_la-gw_graphic_objects.lo
-am__objects_5 = libscigraphic_objects_la-sci_graphicfunction.lo
-am__objects_6 = libscigraphic_objects_la-createGraphicObject.lo \
+am__objects_4 = libscigraphic_objects_la-createGraphicObject.lo \
        libscigraphic_objects_la-getGraphicObjectProperty.lo \
        libscigraphic_objects_la-getConsoleIdentifier.lo \
        libscigraphic_objects_la-setGraphicObjectProperty.lo \
@@ -191,8 +189,7 @@ am__objects_6 = libscigraphic_objects_la-createGraphicObject.lo \
        libscigraphic_objects_la-CurrentObject.lo \
        libscigraphic_objects_la-CurrentSubwin.lo
 am_libscigraphic_objects_la_OBJECTS = $(am__objects_2) \
-       $(am__objects_3) $(am__objects_4) $(am__objects_5) \
-       $(am__objects_6)
+       $(am__objects_3) $(am__objects_4)
 libscigraphic_objects_la_OBJECTS =  \
        $(am_libscigraphic_objects_la_OBJECTS)
 libscigraphic_objects_la_LINK = $(LIBTOOL) --tag=CXX \
@@ -623,8 +620,6 @@ GRAPHIC_OBJECTS_CXX_SOURCES = src/cpp/createGraphicObject.cpp \
                                                                src/cpp/CurrentSubwin.cpp
 
 GIWS_WRAPPERS = src/jni/graphic_objects.giws.xml
-GATEWAY_C_SOURCES = sci_gateway/c/gw_graphic_objects.c
-GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_graphicfunction.cpp
 libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/cpp/ \
@@ -787,8 +782,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-getConsoleIdentifier.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Plo@am__quote@
 
 .c.o:
@@ -833,13 +826,6 @@ libscigraphic_objects_la-ScilabNativeView_wrap.lo: src/jni/ScilabNativeView_wrap
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-ScilabNativeView_wrap.lo `test -f 'src/jni/ScilabNativeView_wrap.c' || echo '$(srcdir)/'`src/jni/ScilabNativeView_wrap.c
 
-libscigraphic_objects_la-gw_graphic_objects.lo: sci_gateway/c/gw_graphic_objects.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-gw_graphic_objects.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Tpo -c -o libscigraphic_objects_la-gw_graphic_objects.lo `test -f 'sci_gateway/c/gw_graphic_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_objects.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Tpo $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_graphic_objects.c' object='libscigraphic_objects_la-gw_graphic_objects.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-gw_graphic_objects.lo `test -f 'sci_gateway/c/gw_graphic_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_objects.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -875,13 +861,6 @@ libscigraphic_objects_la-GraphicObjectBuilder.lo: src/jni/GraphicObjectBuilder.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-GraphicObjectBuilder.lo `test -f 'src/jni/GraphicObjectBuilder.cpp' || echo '$(srcdir)/'`src/jni/GraphicObjectBuilder.cpp
 
-libscigraphic_objects_la-sci_graphicfunction.lo: sci_gateway/cpp/sci_graphicfunction.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-sci_graphicfunction.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Tpo -c -o libscigraphic_objects_la-sci_graphicfunction.lo `test -f 'sci_gateway/cpp/sci_graphicfunction.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_graphicfunction.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Tpo $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_graphicfunction.cpp' object='libscigraphic_objects_la-sci_graphicfunction.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-sci_graphicfunction.lo `test -f 'sci_gateway/cpp/sci_graphicfunction.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_graphicfunction.cpp
-
 libscigraphic_objects_la-createGraphicObject.lo: src/cpp/createGraphicObject.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-createGraphicObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Tpo -c -o libscigraphic_objects_la-createGraphicObject.lo `test -f 'src/cpp/createGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/createGraphicObject.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Tpo $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo
diff --git a/scilab/modules/graphic_objects/includes/gw_graphic_objects.h b/scilab/modules/graphic_objects/includes/gw_graphic_objects.h
deleted file mode 100644 (file)
index 2800ae1..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2010 - DIGITEO - Allan CORNET
-* 
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at    
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __GW_GRAPHIC_OBJECTS_H__
-#define __GW_GRAPHIC_OBJECTS_H__
-/*--------------------------------------------------------------------------*/
-#include "dynlib_graphic_objects.h"
-/*--------------------------------------------------------------------------*/
-GRAPHIC_OBJECTS_IMPEXP int gw_graphic_objects(void);
-GRAPHIC_OBJECTS_IMPEXP int sci_graphicfunction(char* fname, unsigned long l);
-/*--------------------------------------------------------------------------*/
-#endif /* __GW_GRAPHIC_OBJECTS_H__ */
-/*--------------------------------------------------------------------------*/
index 00f97ec..6700525 100644 (file)
@@ -16,11 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Revision-Date: 2013-01-24 17:14+0100\n"
 
-# File: sci_gateway/c/gw_graphic_objects.c, line: 33
-#, c-format
-msgid "Scilab '%s' module disabled in -nogui or -nwni mode.\n"
-msgstr ""
-
 #
 # File: src/nographic_objects/nographic_objects.c, line: 20
 #, c-format
diff --git a/scilab/modules/graphic_objects/sci_gateway/c/gw_graphic_objects.c b/scilab/modules/graphic_objects/sci_gateway/c/gw_graphic_objects.c
deleted file mode 100644 (file)
index 3edd147..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010 - DIGITEO - Allan CORNET
- *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_graphic_objects.h"
-#include "api_scilab.h"
-#include "callFunctionFromGateway.h"
-#include "BOOL.h"
-#include "scilabmode.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "BOOL.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[]=
-{
-  {sci_graphicfunction, "graphicfunction"}
-};
-/*--------------------------------------------------------------------------*/
-int gw_graphic_objects(void)
-{
-       Rhs = Max(0, Rhs);
-
-       if ( getScilabMode() == SCILAB_NWNI)
-       {
-               Scierror(999,_("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "graphic_objects");
-               return 0;
-       }
-
-       callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphic_objects/sci_gateway/cpp/sci_graphicfunction.cpp b/scilab/modules/graphic_objects/sci_gateway/cpp/sci_graphicfunction.cpp
deleted file mode 100644 (file)
index 105461c..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2010 - DIGITEO - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-extern "C"
-{
-#include "gw_graphic_objects.h"
-#include "api_scilab.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "MALLOC.h"
-#include "freeArrayOfString.h"
-#include "sciprint.h"
-}
-
-/*--------------------------------------------------------------------------*/
-int sci_graphicfunction(char *fname,unsigned long fname_len)
-{
-       sciprint("from module graphic_objects, %s\n", fname);
-       
-       LhsVar(1) = 0;
-       PutLhsVar();
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index bc605da..4c82a10 100644 (file)
     <ClCompile Include="DllmainGraphic_objects.c" />
     <ClCompile Include="..\cpp\Fac3DDecomposer.cpp" />
     <ClCompile Include="..\cpp\getGraphicObjectProperty.cpp" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_graphic_objects.c" />
     <ClCompile Include="..\cpp\NgonData.cpp" />
     <ClCompile Include="..\cpp\NgonGeneralData.cpp" />
     <ClCompile Include="..\cpp\NgonGridData.cpp" />
     <ClCompile Include="..\cpp\NgonPolylineData.cpp" />
     <ClCompile Include="..\cpp\Plot3DDecomposer.cpp" />
     <ClCompile Include="..\cpp\PolylineDecomposer.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_graphicfunction.cpp" />
     <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp" />
     <ClCompile Include="..\cpp\TriangleMeshData.cpp" />
     <ClCompile Include="..\cpp\TriangleMeshFecData.cpp" />
     <ClInclude Include="..\..\includes\deleteGraphicObject.h" />
     <ClInclude Include="..\..\includes\dynlib_graphic_objects.h" />
     <ClInclude Include="..\..\includes\Fac3DDecomposer.hxx" />
-    <ClInclude Include="..\..\includes\gw_graphic_objects.h" />
     <ClInclude Include="..\..\includes\NgonData.hxx" />
     <ClInclude Include="..\..\includes\NgonGeneralData.hxx" />
     <ClInclude Include="..\..\includes\NgonGridData.hxx" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 62290ee..f2e410a 100644 (file)
@@ -59,9 +59,6 @@
     <ClCompile Include="..\cpp\getGraphicObjectProperty.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_graphic_objects.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cpp\NgonData.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -89,9 +86,6 @@
     <ClCompile Include="..\cpp\PolylineDecomposer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_graphicfunction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="..\..\includes\Fac3DDecomposer.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\gw_graphic_objects.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\NgonData.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
       <Filter>Swig Files</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>