0032662: Coding - Missing header file in AIS_DataMapOfSelStat.hxx

Removed obsolete header files AIS_DataMapOfSelStat.hxx and AIS_DataMapIteratorOfDataMapOfSelStat.hxx.
Removed obsolete types AIS_DataMapofIntegerListOfinteractive, AIS_ClearMode, AIS_ConnectStatus,
AIS_IndexedDataMapOfOwnerPrs, AIS_MapOfInteractive.

diff --git a/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp b/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
index a5d6824..f822186 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
@@ -814,18 +814,18 @@ void COcafDoc::OnObjectDelete()
 
        D->NewCommand();
 
-       AIS_SequenceOfInteractive aSequence;
-       for(myAISContext->InitSelected();
-      myAISContext->MoreSelected();
-      myAISContext->NextSelected())
-        aSequence.Append(myAISContext->SelectedInteractive());
-       
-       for(int iter=1;iter <=aSequence.Length();iter++)
+       AIS_ListOfInteractive aList;
+       for (myAISContext->InitSelected(); myAISContext->MoreSelected(); myAISContext->NextSelected())
+  {
+               aList.Append(myAISContext->SelectedInteractive());
+  }
+
+       for (AIS_ListOfInteractive::Iterator anIter (aList); anIter.More(); anIter.Next())
        {
-               if (myAISContext->DisplayStatus(aSequence(iter)) == AIS_DS_Displayed)
+               Handle(AIS_InteractiveObject) aPrs = anIter.Value();
+               if (myAISContext->DisplayStatus (aPrs) == AIS_DS_Displayed)
                {
-                       Handle(TPrsStd_AISPresentation) CurrentPrs
-                               = Handle(TPrsStd_AISPresentation)::DownCast(aSequence(iter)->GetOwner()); 
+                       Handle(TPrsStd_AISPresentation) CurrentPrs = Handle(TPrsStd_AISPresentation)::DownCast(aPrs->GetOwner());
                        TDataStd_Integer::Set(CurrentPrs->Label(), 0);
                        CurrentPrs->Erase(1);
                }

diff --git a/samples/mfc/standard/06_Ocaf/src/StdAfx.h b/samples/mfc/standard/06_Ocaf/src/StdAfx.h
index b11842a..a4fad16 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/StdAfx.h
+++ b/samples/mfc/standard/06_Ocaf/src/StdAfx.h
@@ -28,14 +28,11 @@
 # define true TRUE
 #endif
 
-#pragma warning(  disable : 4244 )        // Issue warning 4244
 #include <Standard_ShortReal.hxx>
-#pragma warning(  default : 4244 )        // Issue warning 4244
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_Shape.hxx>
-#include <AIS_SequenceOfInteractive.hxx>
 #include <AIS_Trihedron.hxx>
 
 #include <Aspect_Background.hxx>

diff --git a/src/AIS/AIS_ClearMode.hxx b/src/AIS/AIS_ClearMode.hxx
deleted file mode 100644 (file)
index a94a754..0000000
--- a/src/AIS/AIS_ClearMode.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-// Created on: 1996-12-11
-// Created by: Robert COUBLANC
-// Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_ClearMode_HeaderFile
-#define _AIS_ClearMode_HeaderFile
-
-//! Declares which entities in an opened local context
-//! are to be cleared of mode settings. Temporary
-//! graphic presentations such as those for sub-shapes,
-//! for example, are only created for the selection
-//! process. By means of these enumerations, they can
-//! be cleared from local context.
-enum AIS_ClearMode
-{
-AIS_CM_All,
-AIS_CM_Interactive,
-AIS_CM_Filters,
-AIS_CM_StandardModes,
-AIS_CM_TemporaryShapePrs
-};
-
-#endif // _AIS_ClearMode_HeaderFile

diff --git a/src/AIS/AIS_ConnectStatus.hxx b/src/AIS/AIS_ConnectStatus.hxx
deleted file mode 100644 (file)
index 2e8cd59..0000000
--- a/src/AIS/AIS_ConnectStatus.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-// Created on: 1996-12-11
-// Created by: Robert COUBLANC
-// Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_ConnectStatus_HeaderFile
-#define _AIS_ConnectStatus_HeaderFile
-
-//! Gives the status of connection of an Interactive
-//! Object. This will be one of the following:
-//! -   No connection
-//! -   Connection
-//! -   Transformation
-//! -   Both connection and transformation
-//! This enumeration is used in
-//! AIS_ConnectedInteractive. Transform indicates
-//! that the Interactive Object reference geometry has
-//! changed location relative to the reference geometry.
-enum AIS_ConnectStatus
-{
-AIS_CS_None,
-AIS_CS_Connection,
-AIS_CS_Transform,
-AIS_CS_Both
-};
-
-#endif // _AIS_ConnectStatus_HeaderFile

diff --git a/src/AIS/AIS_DataMapIteratorOfDataMapOfSelStat.hxx b/src/AIS/AIS_DataMapIteratorOfDataMapOfSelStat.hxx
deleted file mode 100644 (file)
index a4be8b9..0000000
--- a/src/AIS/AIS_DataMapIteratorOfDataMapOfSelStat.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2015 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#ifndef AIS_DataMapIteratorOfDataMapOfSelStat_HeaderFile
-#define AIS_DataMapIteratorOfDataMapOfSelStat_HeaderFile
-
-#include <AIS_DataMapOfSelStat.hxx>
-
-#endif

diff --git a/src/AIS/AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive.hxx b/src/AIS/AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive.hxx
deleted file mode 100644 (file)
index 7574480..0000000
--- a/src/AIS/AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2015 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#ifndef AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive_HeaderFile
-#define AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive_HeaderFile
-
-#include <AIS_DataMapofIntegerListOfinteractive.hxx>
-
-#endif

diff --git a/src/AIS/AIS_DataMapOfSelStat.hxx b/src/AIS/AIS_DataMapOfSelStat.hxx
deleted file mode 100644 (file)
index df82bc3..0000000
--- a/src/AIS/AIS_DataMapOfSelStat.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-// Created on: 1996-12-11
-// Created by: Robert COUBLANC
-// Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef AIS_DataMapOfSelStat_HeaderFile
-#define AIS_DataMapOfSelStat_HeaderFile
-
-#include <SelectMgr_SelectableObject.hxx>
-#include <AIS_LocalStatus.hxx>
-#include <TColStd_MapTransientHasher.hxx>
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject),Handle(AIS_LocalStatus),TColStd_MapTransientHasher> AIS_DataMapOfSelStat;
-typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject),Handle(AIS_LocalStatus),TColStd_MapTransientHasher>::Iterator AIS_DataMapIteratorOfDataMapOfSelStat;
-
-
-#endif

diff --git a/src/AIS/AIS_DataMapofIntegerListOfinteractive.hxx b/src/AIS/AIS_DataMapofIntegerListOfinteractive.hxx
deleted file mode 100644 (file)
index 6aa2f0e..0000000
--- a/src/AIS/AIS_DataMapofIntegerListOfinteractive.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-// Created on: 1996-12-11
-// Created by: Robert COUBLANC
-// Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef AIS_DataMapofIntegerListOfinteractive_HeaderFile
-#define AIS_DataMapofIntegerListOfinteractive_HeaderFile
-
-#include <Standard_Integer.hxx>
-#include <AIS_ListOfInteractive.hxx>
-#include <TColStd_MapIntegerHasher.hxx>
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Standard_Integer,AIS_ListOfInteractive,TColStd_MapIntegerHasher> AIS_DataMapofIntegerListOfinteractive;
-typedef NCollection_DataMap<Standard_Integer,AIS_ListOfInteractive,TColStd_MapIntegerHasher>::Iterator AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive;
-
-
-#endif

diff --git a/src/AIS/AIS_IndexedDataMapOfOwnerPrs.hxx b/src/AIS/AIS_IndexedDataMapOfOwnerPrs.hxx
deleted file mode 100644 (file)
index 72753bf..0000000
--- a/src/AIS/AIS_IndexedDataMapOfOwnerPrs.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Created on: 1996-12-11
-// Created by: Robert COUBLANC
-// Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef AIS_IndexedDataMapOfOwnerPrs_HeaderFile
-#define AIS_IndexedDataMapOfOwnerPrs_HeaderFile
-
-#include <SelectMgr_EntityOwner.hxx>
-#include <Prs3d_Presentation.hxx>
-#include <TColStd_MapTransientHasher.hxx>
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap<Handle(SelectMgr_EntityOwner),Handle(Prs3d_Presentation),TColStd_MapTransientHasher> AIS_IndexedDataMapOfOwnerPrs;
-
-
-#endif

diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx
index 76db018..fe47b0c 100644 (file)
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -20,7 +20,6 @@
 #include <AIS_DataMapOfIOStatus.hxx>
 #include <AIS_DisplayMode.hxx>
 #include <AIS_DisplayStatus.hxx>
-#include <AIS_ClearMode.hxx>
 #include <AIS_KindOfInteractive.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_Selection.hxx>

diff --git a/src/AIS/AIS_MapIteratorOfMapOfInteractive.hxx b/src/AIS/AIS_MapIteratorOfMapOfInteractive.hxx
deleted file mode 100644 (file)
index 3db7fe6..0000000
--- a/src/AIS/AIS_MapIteratorOfMapOfInteractive.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2015 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#ifndef AIS_MapIteratorOfMapOfInteractive_HeaderFile
-#define AIS_MapIteratorOfMapOfInteractive_HeaderFile
-
-#include <AIS_MapOfInteractive.hxx>
-
-#endif

diff --git a/src/AIS/AIS_MapOfInteractive.hxx b/src/AIS/AIS_MapOfInteractive.hxx
deleted file mode 100644 (file)
index b03767f..0000000
--- a/src/AIS/AIS_MapOfInteractive.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Created on: 1996-12-11
-// Created by: Robert COUBLANC
-// Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef AIS_MapOfInteractive_HeaderFile
-#define AIS_MapOfInteractive_HeaderFile
-
-#include <AIS_InteractiveObject.hxx>
-#include <TColStd_MapTransientHasher.hxx>
-#include <NCollection_Map.hxx>
-
-typedef NCollection_Map<Handle(AIS_InteractiveObject),TColStd_MapTransientHasher> AIS_MapOfInteractive;
-typedef NCollection_Map<Handle(AIS_InteractiveObject),TColStd_MapTransientHasher>::Iterator AIS_MapIteratorOfMapOfInteractive;
-
-
-#endif

diff --git a/src/AIS/FILES b/src/AIS/FILES
index c9998c9..8b67040 100644 (file)
--- a/src/AIS/FILES
+++ b/src/AIS/FILES
@@ -18,7 +18,6 @@ AIS_CameraFrustum.cxx
 AIS_CameraFrustum.hxx
 AIS_Circle.cxx
 AIS_Circle.hxx
-AIS_ClearMode.hxx
 AIS_ColoredDrawer.hxx
 AIS_ColoredShape.cxx
 AIS_ColoredShape.hxx
@@ -27,13 +26,8 @@ AIS_ColorScale.cxx
 AIS_ColorScale.hxx
 AIS_ConnectedInteractive.cxx
 AIS_ConnectedInteractive.hxx
-AIS_ConnectStatus.hxx
-AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive.hxx
 AIS_DataMapIteratorOfDataMapOfIOStatus.hxx
-AIS_DataMapIteratorOfDataMapOfSelStat.hxx
-AIS_DataMapofIntegerListOfinteractive.hxx
 AIS_DataMapOfIOStatus.hxx
-AIS_DataMapOfSelStat.hxx
 AIS_DisplayMode.hxx
 AIS_DisplayStatus.hxx
 AIS_DragAction.hxx
@@ -43,7 +37,6 @@ AIS_GlobalStatus.cxx
 AIS_GlobalStatus.hxx
 AIS_GraphicTool.cxx
 AIS_GraphicTool.hxx
-AIS_IndexedDataMapOfOwnerPrs.hxx
 AIS_InteractiveContext.cxx
 AIS_InteractiveContext.hxx
 AIS_InteractiveObject.cxx
@@ -60,8 +53,6 @@ AIS_Manipulator.cxx
 AIS_ManipulatorMode.hxx
 AIS_ManipulatorOwner.hxx
 AIS_ManipulatorOwner.cxx
-AIS_MapIteratorOfMapOfInteractive.hxx
-AIS_MapOfInteractive.hxx
 AIS_MediaPlayer.cxx
 AIS_MediaPlayer.hxx
 AIS_MouseGesture.hxx

diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx
index 7ea9843..1497516 100644 (file)
--- a/src/ViewerTest/ViewerTest.cxx
+++ b/src/ViewerTest/ViewerTest.cxx
@@ -535,7 +535,6 @@ static void GetTypeAndSignfromString (const char* theName,
 #include <AIS_Shape.hxx>
 #include <AIS_DisplayMode.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include <AIS_MapOfInteractive.hxx>
 #include <ViewerTest_DoubleMapOfInteractiveAndName.hxx>
 #include <ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName.hxx>
 #include <ViewerTest_EventManager.hxx>

diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index b907983..67b894b 100644 (file)
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -41,7 +41,6 @@
 #include <AIS_DisplayMode.hxx>
 #include <AIS_PointCloud.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include <AIS_MapOfInteractive.hxx>
 #include <ViewerTest_AutoUpdater.hxx>
 #include <ViewerTest_DoubleMapOfInteractiveAndName.hxx>
 #include <ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName.hxx>

diff --git a/src/ViewerTest/ViewerTest_RelationCommands.cxx b/src/ViewerTest/ViewerTest_RelationCommands.cxx
index 86f7b55..1b5f656 100644 (file)
--- a/src/ViewerTest/ViewerTest_RelationCommands.cxx
+++ b/src/ViewerTest/ViewerTest_RelationCommands.cxx
@@ -19,9 +19,6 @@
 #include <AIS_Circle.hxx>
 #include <AIS_DisplayMode.hxx>
 #include <AIS_InteractiveContext.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <AIS_ListOfInteractive.hxx>
-#include <AIS_MapOfInteractive.hxx>
 #include <AIS_Point.hxx>
 #include <AIS_Shape.hxx>
 #include <PrsDim_AngleDimension.hxx>