diff --git a/adm/scripts/migration_800/apply_typedef_cleanup.py b/adm/scripts/migration_800/apply_typedef_cleanup.py new file mode 100644 index 0000000000..c223c4dd6f --- /dev/null +++ b/adm/scripts/migration_800/apply_typedef_cleanup.py @@ -0,0 +1,382 @@ +#!/usr/bin/env python3 +# Copyright (c) 2025 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. + +""" +OCCT 8.0.0 Typedef Cleanup Apply Script + +Applies changes from the JSON file generated by collect_unused_typedefs.py: +- Deletes typedef-only header files +- Updates files that included deleted headers (adds includes and forward declarations) +- Removes unused typedef lines from files with other content + +Usage: + python3 apply_typedef_cleanup.py [options] + +Options: + --dry-run Show what would be done without making changes + --verbose Show detailed progress + --input Input JSON file (default: unused_typedefs.json) +""" + +import argparse +import json +import re +from pathlib import Path +from typing import Dict, List, Set +from dataclasses import dataclass, field + + +@dataclass +class ApplyResult: + """Result of apply operations.""" + files_deleted: List[str] = field(default_factory=list) + files_modified: List[str] = field(default_factory=list) + errors: List[str] = field(default_factory=list) + + +class TypedefCleanupApplier: + """Applies typedef cleanup changes from JSON.""" + + def __init__(self, src_dir: str, dry_run: bool = False, verbose: bool = False): + self.src_dir = Path(src_dir) + self.dry_run = dry_run + self.verbose = verbose + + def log(self, message: str): + """Print message if verbose.""" + if self.verbose: + print(message) + + def update_includer_file(self, filepath: Path, old_include: str, + new_includes: List[str], + forward_decls: List[str]) -> bool: + """ + Update a file that included a deleted typedef-only header: + - Replace the old include with the new includes + - Add forward declarations after all #include lines + """ + try: + content = filepath.read_text(encoding='utf-8', errors='replace') + except Exception as e: + self.log(f"Error reading {filepath}: {e}") + return False + + lines = content.split('\n') + new_lines = [] + include_pattern = re.compile( + r'#include\s*[<"]' + re.escape(old_include) + r'[>"]' + ) + + # Track the last #include line position for inserting forward decls + last_include_idx = -1 + include_replaced = False + + for line in lines: + stripped = line.strip() + + # Track last include position + if stripped.startswith('#include'): + last_include_idx = len(new_lines) + + # Check if this is the include to replace + if include_pattern.match(stripped): + # Replace with new includes (avoiding duplicates) + for new_inc in new_includes: + # Check if this include already exists in the file + inc_name = re.search(r'#include\s*[<"]([^>"]+)[>"]', new_inc) + if inc_name: + inc_file = inc_name.group(1) + if not re.search(r'#include\s*[<"]' + re.escape(inc_file) + r'[>"]', content): + new_lines.append(new_inc) + last_include_idx = len(new_lines) - 1 + include_replaced = True + else: + new_lines.append(line) + + if not include_replaced: + return False + + # Insert forward declarations after the last #include line + if forward_decls and last_include_idx >= 0: + # Find existing forward declarations to avoid duplicates + existing_fwd = set() + for line in new_lines: + fwd_match = re.match(r'^(class|struct)\s+(\w+)\s*;$', line.strip()) + if fwd_match: + existing_fwd.add(line.strip()) + + # Filter out duplicates + new_fwd_decls = [fd for fd in forward_decls if fd not in existing_fwd] + + if new_fwd_decls: + # Insert after last include with empty line before + insert_pos = last_include_idx + 1 + # Check if there's already an empty line + if insert_pos < len(new_lines) and new_lines[insert_pos].strip(): + new_lines.insert(insert_pos, '') + insert_pos += 1 + for fd in new_fwd_decls: + new_lines.insert(insert_pos, fd) + insert_pos += 1 + + new_content = '\n'.join(new_lines) + + # Clean up multiple blank lines + new_content = re.sub(r'\n{3,}', '\n\n', new_content) + + if new_content != content: + if not self.dry_run: + filepath.write_text(new_content, encoding='utf-8') + return True + + return False + + def delete_file(self, filepath: Path) -> bool: + """Delete a file.""" + if not self.dry_run: + try: + filepath.unlink() + return True + except Exception as e: + self.log(f"Error deleting {filepath}: {e}") + return False + return True # Dry run always succeeds + + def remove_from_files_cmake(self, filepath: Path) -> bool: + """Remove a file entry from the FILES.cmake in the same directory.""" + files_cmake = filepath.parent / "FILES.cmake" + if not files_cmake.exists(): + self.log(f" No FILES.cmake found in {filepath.parent}") + return False + + try: + content = files_cmake.read_text(encoding='utf-8', errors='replace') + except Exception as e: + self.log(f"Error reading {files_cmake}: {e}") + return False + + filename = filepath.name + lines = content.split('\n') + new_lines = [] + removed = False + + for line in lines: + # Check if this line contains the filename + # Handle both " filename.hxx" and " filename.hxx)" formats + stripped = line.strip() + if stripped == filename or stripped == filename + ')': + removed = True + # If line ends with ), we need to add ) to previous line + if stripped.endswith(')') and new_lines: + # Find the last non-empty line and add ) to it + for i in range(len(new_lines) - 1, -1, -1): + if new_lines[i].strip(): + if not new_lines[i].rstrip().endswith(')'): + new_lines[i] = new_lines[i].rstrip() + break + continue + new_lines.append(line) + + if removed: + new_content = '\n'.join(new_lines) + if not self.dry_run: + files_cmake.write_text(new_content, encoding='utf-8') + self.log(f" Removed {filename} from FILES.cmake") + return True + + return False + + def remove_typedefs_from_file(self, filepath: Path, + typedefs: List[Dict]) -> bool: + """Remove specified typedef lines from a file.""" + try: + content = filepath.read_text(encoding='utf-8', errors='replace') + except Exception as e: + self.log(f"Error reading {filepath}: {e}") + return False + + lines = content.split('\n') + + # Collect all line ranges to remove + lines_to_remove: Set[int] = set() + for typedef in typedefs: + for line_num in range(typedef['start_line'], typedef['end_line'] + 1): + lines_to_remove.add(line_num) + + # Build new content without the typedef lines + new_lines = [] + for i, line in enumerate(lines, 1): + if i not in lines_to_remove: + new_lines.append(line) + + new_content = '\n'.join(new_lines) + + # Clean up multiple blank lines + new_content = re.sub(r'\n{3,}', '\n\n', new_content) + + if new_content != content: + if not self.dry_run: + filepath.write_text(new_content, encoding='utf-8') + return True + + return False + + def apply(self, data: Dict) -> ApplyResult: + """Apply changes from the JSON data.""" + result = ApplyResult() + + files_to_delete = data.get('files_to_delete', []) + files_to_modify = data.get('files_to_modify', []) + + # Process typedef-only files first (delete and propagate includes) + if files_to_delete: + print(f"\n{'DRY RUN: ' if self.dry_run else ''}Deleting {len(files_to_delete)} typedef-only header files...") + + for file_info in files_to_delete: + rel_path = file_info['file'] + filepath = self.src_dir / rel_path + header_name = filepath.name + + includes = file_info.get('includes', []) + forward_decls = file_info.get('forward_decls', []) + includers = file_info.get('includers', []) + + self.log(f" {header_name}: {len(includers)} includers") + + # Update includer files + for includer_path in includers: + includer_filepath = self.src_dir / includer_path + if self.update_includer_file(includer_filepath, header_name, + includes, forward_decls): + if str(includer_filepath) not in result.files_modified: + result.files_modified.append(str(includer_filepath)) + self.log(f" Updated: {includer_path}") + + # Delete the typedef-only file and remove from FILES.cmake + if filepath.exists(): + if self.delete_file(filepath): + result.files_deleted.append(rel_path) + self.log(f" Deleted: {rel_path}") + # Also remove from FILES.cmake + self.remove_from_files_cmake(filepath) + else: + self.log(f" File not found (already deleted?): {rel_path}") + + # Remove unused typedefs from remaining files + if files_to_modify: + print(f"\n{'DRY RUN: ' if self.dry_run else ''}Removing unused typedefs from {len(files_to_modify)} files...") + + for file_info in files_to_modify: + rel_path = file_info['file'] + filepath = self.src_dir / rel_path + typedefs = file_info.get('typedefs', []) + + if filepath.exists(): + if self.remove_typedefs_from_file(filepath, typedefs): + result.files_modified.append(str(filepath)) + typedef_names = [t['name'] for t in typedefs] + self.log(f" Modified: {rel_path} (removed: {', '.join(typedef_names)})") + else: + self.log(f" File not found: {rel_path}") + + return result + + +def print_summary(result: ApplyResult, dry_run: bool): + """Print apply summary.""" + print("\n" + "=" * 60) + print("TYPEDEF CLEANUP APPLY SUMMARY") + print("=" * 60) + + if dry_run: + print("(DRY RUN - no files were modified)") + + print(f"\nFiles {'to be ' if dry_run else ''}deleted: {len(result.files_deleted)}") + print(f"Files {'to be ' if dry_run else ''}modified: {len(result.files_modified)}") + + if result.errors: + print(f"\nErrors: {len(result.errors)}") + for error in result.errors[:10]: + print(f" {error}") + + +def main(): + parser = argparse.ArgumentParser( + description='OCCT 8.0.0 Typedef Cleanup Apply Script' + ) + parser.add_argument( + 'src_directory', + nargs='?', + default='.', + help='Source directory (default: current directory)' + ) + parser.add_argument( + '--dry-run', + action='store_true', + help='Preview changes without modifying files' + ) + parser.add_argument( + '--verbose', '-v', + action='store_true', + help='Show detailed progress' + ) + parser.add_argument( + '--input', '-i', + default=None, + help='Input JSON file (default: unused_typedefs.json)' + ) + + args = parser.parse_args() + + print("OCCT Typedef Cleanup Applier") + print("=" * 60) + + # Load JSON data + script_dir = Path(__file__).parent + input_file = args.input or (script_dir / 'unused_typedefs.json') + + try: + with open(input_file, 'r', encoding='utf-8') as f: + data = json.load(f) + except FileNotFoundError: + print(f"Error: Input file not found: {input_file}") + print("Run collect_unused_typedefs.py first to generate the JSON file.") + return 1 + except json.JSONDecodeError as e: + print(f"Error: Invalid JSON in {input_file}: {e}") + return 1 + + print(f"Loaded: {input_file}") + print(f" Files to delete: {len(data.get('files_to_delete', []))}") + print(f" Files to modify: {len(data.get('files_to_modify', []))}") + + applier = TypedefCleanupApplier( + src_dir=args.src_directory, + dry_run=args.dry_run, + verbose=args.verbose + ) + + result = applier.apply(data) + + # Print summary + print_summary(result, args.dry_run) + + if args.dry_run: + print("\nRun without --dry-run to apply changes") + + return 0 + + +if __name__ == '__main__': + exit(main()) diff --git a/adm/scripts/migration_800/collect_unused_typedefs.py b/adm/scripts/migration_800/collect_unused_typedefs.py new file mode 100644 index 0000000000..f05b3634ea --- /dev/null +++ b/adm/scripts/migration_800/collect_unused_typedefs.py @@ -0,0 +1,581 @@ +#!/usr/bin/env python3 +# Copyright (c) 2025 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. + +""" +OCCT 8.0.0 Unused Typedef Collection Script + +Scans source files and collects information about unused NCollection typedef declarations. +Outputs a JSON file that can be used by: +- apply_typedef_cleanup.py to remove unused typedefs from OCCT +- External projects to update their code (replace typedef names with actual types) + +The output JSON contains: +- typedef name and replacement type for find-and-replace operations +- includes and forward declarations needed when typedef header is removed +- list of files that will be modified + +Usage: + python3 collect_unused_typedefs.py [options] + +Options: + --verbose Show detailed progress + --output Output JSON file (default: unused_typedefs.json) +""" + +import argparse +import json +import os +import re +from pathlib import Path +from typing import Dict, List, Optional, Set +from dataclasses import dataclass, field + + +@dataclass +class TypedefInfo: + """Information about a typedef declaration.""" + name: str + replacement: str # The type that replaces this typedef + start_line: int + end_line: int + content: str # Full typedef text (may span multiple lines) + file_path: str + is_ncollection: bool = False + + +@dataclass +class TypedefOnlyFileInfo: + """Information about a header file containing only typedef(s).""" + file_path: str + includes: List[str] # #include directives (full lines) + forward_decls: List[str] # Forward declarations (class/struct Name;) + typedefs: List[TypedefInfo] + + +@dataclass +class CollectionResult: + """Result of collection operations.""" + unused_typedefs: List[Dict] = field(default_factory=list) + files_to_delete: List[Dict] = field(default_factory=list) + files_to_modify: List[Dict] = field(default_factory=list) + errors: List[str] = field(default_factory=list) + + +class UnusedTypedefCollector: + """Collects information about unused typedef declarations.""" + + # Extensions that require global usage check + GLOBAL_CHECK_EXTENSIONS = {'.hxx', '.lxx'} + + # Extensions that require local usage check only + LOCAL_CHECK_EXTENSIONS = {'.cxx', '.pxx', '.gxx', '.c', '.mm'} + + SKIP_DIRS = {'build', 'install', '.git', '__pycache__', 'mac64', 'win64', 'lin64'} + + def __init__(self, src_dir: str, verbose: bool = False): + self.src_dir = Path(src_dir) + self.verbose = verbose + # Build global index: typedef_name -> set of files where it's used + self.global_usage: Dict[str, Set[str]] = {} + self.all_typedefs: List[TypedefInfo] = [] + # Store file contents for include propagation + self.file_contents: Dict[str, str] = {} + + def log(self, message: str): + """Print message if verbose.""" + if self.verbose: + print(message) + + def get_source_files(self) -> List[Path]: + """Get all source files.""" + all_extensions = self.GLOBAL_CHECK_EXTENSIONS | self.LOCAL_CHECK_EXTENSIONS + files = [] + for root, dirs, filenames in os.walk(self.src_dir): + dirs[:] = [d for d in dirs if d not in self.SKIP_DIRS] + for filename in filenames: + if any(filename.endswith(ext) for ext in all_extensions): + files.append(Path(root) / filename) + return sorted(files) + + @staticmethod + def _line_has_semicolon(line: str) -> bool: + """Check if line contains a semicolon (ignoring comments).""" + # Remove C++ style comments + comment_pos = line.find('//') + if comment_pos != -1: + line = line[:comment_pos] + return ';' in line + + @staticmethod + def extract_replacement_type(typedef_content: str) -> str: + """ + Extract the replacement type from a typedef declaration. + + Example: + typedef NCollection_IndexedMap> Select3D_IndexedMapOfEntity; + Returns: + NCollection_IndexedMap> + """ + # Normalize whitespace + content = ' '.join(typedef_content.split()) + + # Remove 'typedef ' prefix + if content.startswith('typedef '): + content = content[8:] + + # Find the typedef name (last identifier before semicolon) + # We need to handle template types like NCollection_Map + + # Remove trailing semicolon and whitespace + content = content.rstrip('; \t\n') + + # The replacement type is everything except the last identifier + # Split from the right to find the typedef name + # Handle cases like: NCollection_DataMap TypedefName + + # Find the last space that's not inside angle brackets + depth = 0 + last_space_pos = -1 + for i, char in enumerate(content): + if char == '<': + depth += 1 + elif char == '>': + depth -= 1 + elif char == ' ' and depth == 0: + last_space_pos = i + + if last_space_pos > 0: + return content[:last_space_pos].strip() + + return content + + def find_typedefs_in_file(self, filepath: Path, content: str) -> List[TypedefInfo]: + """Find all typedef declarations in a file, including multi-line ones.""" + typedefs = [] + try: + rel_path = str(filepath.relative_to(self.src_dir)) + except ValueError: + rel_path = str(filepath) + + lines = content.split('\n') + i = 0 + while i < len(lines): + line = lines[i] + stripped = line.strip() + + # Check if line starts with typedef at column 0 (not indented - skip class members) + # Only process typedefs that start at the beginning of the line (top-level) + if line.startswith('typedef ') or (stripped.startswith('typedef ') and not line[0].isspace()): + start_line = i + 1 # 1-based + typedef_lines = [line] + + # Check if typedef continues to next lines (no semicolon) + while not self._line_has_semicolon(line) and i + 1 < len(lines): + i += 1 + line = lines[i] + typedef_lines.append(line) + + end_line = i + 1 # 1-based + typedef_content = '\n'.join(typedef_lines) + + # Extract typedef name (last identifier before semicolon) + # Handle: typedef NCollection_Sequence<...> TypeName; + name_match = re.search(r'\b(\w+)\s*;', typedef_content) + if name_match: + typedef_name = name_match.group(1) + + # Skip standard types + if typedef_name.startswith('Standard_') or typedef_name.startswith('Handle_'): + i += 1 + continue + + # Check if it's NCollection typedef (base type starts with NCollection_) + is_ncollection = bool(re.search( + r'typedef\s+NCollection_\w+', + typedef_content + )) + + # Extract the replacement type + replacement = self.extract_replacement_type(typedef_content) + + typedefs.append(TypedefInfo( + name=typedef_name, + replacement=replacement, + start_line=start_line, + end_line=end_line, + content=typedef_content, + file_path=rel_path, + is_ncollection=is_ncollection + )) + + i += 1 + + return typedefs + + def build_global_usage_index(self, files: List[Path]): + """Build index of all typedef usages across all files in single pass.""" + print("Building global usage index...") + + # First pass: collect all typedefs + for filepath in files: + try: + content = filepath.read_text(encoding='utf-8', errors='replace') + rel_path = str(filepath.relative_to(self.src_dir)) + self.file_contents[rel_path] = content + + typedefs = self.find_typedefs_in_file(filepath, content) + self.all_typedefs.extend(typedefs) + except Exception as e: + print(f"Error reading {filepath}: {e}") + + print(f"Found {len(self.all_typedefs)} typedefs total") + + # Filter to only NCollection typedefs + ncollection_typedefs = [t for t in self.all_typedefs if t.is_ncollection] + print(f"Processing {len(ncollection_typedefs)} NCollection typedefs") + + # Build combined pattern for all typedef names + typedef_names = list(set(t.name for t in ncollection_typedefs)) + if not typedef_names: + return + + # Sort by length (longest first) for correct matching + typedef_names.sort(key=len, reverse=True) + + # Initialize usage dict + for name in typedef_names: + self.global_usage[name] = set() + + # Single pass through all files to find usages + pattern = re.compile(r'\b(' + '|'.join(re.escape(n) for n in typedef_names) + r')\b') + + for rel_path, content in self.file_contents.items(): + # Remove #include lines to avoid counting includes as usage + content_without_includes = '\n'.join( + line for line in content.split('\n') + if not line.strip().startswith('#include') + ) + for match in pattern.finditer(content_without_includes): + typedef_name = match.group(1) + self.global_usage[typedef_name].add(rel_path) + + print("Global usage index built") + + def is_typedef_used(self, typedef: TypedefInfo, file_content: str) -> bool: + """Check if typedef is used (considers global vs local based on file type).""" + ext = Path(typedef.file_path).suffix + + if ext in self.GLOBAL_CHECK_EXTENSIONS: + # Check global usage + usage_files = self.global_usage.get(typedef.name, set()) + + # Remove self-references (the typedef definition itself) + # Check if used in any other file OR used elsewhere in same file + other_files = usage_files - {typedef.file_path} + if other_files: + return True + + # Check if used elsewhere in the same file (not just definition) + # Exclude #include lines and the typedef definition itself + lines = file_content.split('\n') + content_without_typedef = '\n'.join( + line for i, line in enumerate(lines, 1) + if (i < typedef.start_line or i > typedef.end_line) + and not line.strip().startswith('#include') + ) + pattern = r'\b' + re.escape(typedef.name) + r'\b' + return bool(re.search(pattern, content_without_typedef)) + else: + # Local check only + # Exclude #include lines and the typedef definition itself + lines = file_content.split('\n') + content_without_typedef = '\n'.join( + line for i, line in enumerate(lines, 1) + if (i < typedef.start_line or i > typedef.end_line) + and not line.strip().startswith('#include') + ) + pattern = r'\b' + re.escape(typedef.name) + r'\b' + return bool(re.search(pattern, content_without_typedef)) + + def is_typedef_only_header(self, filepath: Path, content: str, + typedefs: List[TypedefInfo]) -> Optional[TypedefOnlyFileInfo]: + """ + Check if a header file contains only typedef(s), includes, and forward declarations. + Returns TypedefOnlyFileInfo if it's a typedef-only file, None otherwise. + """ + if filepath.suffix not in self.GLOBAL_CHECK_EXTENSIONS: + return None + + lines = content.split('\n') + includes: List[str] = [] + forward_decls: List[str] = [] + + # Line ranges occupied by typedefs + typedef_lines: Set[int] = set() + for td in typedefs: + for line_num in range(td.start_line, td.end_line + 1): + typedef_lines.add(line_num) + + for i, line in enumerate(lines, 1): + stripped = line.strip() + + # Skip empty lines, comments, header guards + if not stripped: + continue + if stripped.startswith('//'): + continue + if stripped.startswith('/*') or stripped.startswith('*') or stripped.endswith('*/'): + continue + if stripped.startswith('#ifndef') or stripped.startswith('#define') or stripped.startswith('#endif'): + continue + if stripped.startswith('#pragma'): + continue + + # Check if line is part of a typedef + if i in typedef_lines: + continue + + # Check for includes + if stripped.startswith('#include'): + includes.append(stripped) + continue + + # Check for forward declarations (class/struct Name;) + fwd_match = re.match(r'^(class|struct)\s+(\w+)\s*;$', stripped) + if fwd_match: + forward_decls.append(stripped) + continue + + # Any other code means this is not a typedef-only file + return None + + # Must have at least one typedef + if not typedefs: + return None + + try: + rel_path = str(filepath.relative_to(self.src_dir)) + except ValueError: + rel_path = str(filepath) + + return TypedefOnlyFileInfo( + file_path=rel_path, + includes=includes, + forward_decls=forward_decls, + typedefs=typedefs + ) + + def find_files_including(self, header_name: str) -> List[str]: + """Find all files that include the given header.""" + # Match both #include
and #include "header" + pattern = re.compile( + r'#include\s*[<"]' + re.escape(header_name) + r'[>"]' + ) + includers = [] + for rel_path, content in self.file_contents.items(): + if pattern.search(content): + includers.append(rel_path) + return includers + + def run(self) -> CollectionResult: + """Run the collection process.""" + result = CollectionResult() + + # Get all source files + files = self.get_source_files() + print(f"Found {len(files)} source files") + + # Build global usage index (single pass) + self.build_global_usage_index(files) + + # Group typedefs by file + typedefs_by_file: Dict[str, List[TypedefInfo]] = {} + for typedef in self.all_typedefs: + if typedef.is_ncollection: + if typedef.file_path not in typedefs_by_file: + typedefs_by_file[typedef.file_path] = [] + typedefs_by_file[typedef.file_path].append(typedef) + + # Process each file - identify unused typedefs and typedef-only files + for rel_path, typedefs in typedefs_by_file.items(): + filepath = self.src_dir / rel_path + try: + content = filepath.read_text(encoding='utf-8', errors='replace') + except Exception: + continue + + unused_typedefs = [] + for typedef in typedefs: + if not self.is_typedef_used(typedef, content): + unused_typedefs.append(typedef) + self.log(f" Unused: {typedef.name} in {rel_path}:{typedef.start_line}") + + if unused_typedefs: + # Check if this is a typedef-only header file + # where ALL typedefs are unused + if len(unused_typedefs) == len(typedefs): + typedef_only_info = self.is_typedef_only_header(filepath, content, typedefs) + if typedef_only_info: + header_name = filepath.name + includers = self.find_files_including(header_name) + # Remove self from includers + includers = [inc for inc in includers if inc != rel_path] + + self.log(f" Typedef-only file to delete: {rel_path}") + + # Add to files_to_delete + result.files_to_delete.append({ + 'file': rel_path, + 'typedefs': [ + { + 'name': t.name, + 'replacement': t.replacement, + 'content': t.content + } + for t in typedef_only_info.typedefs + ], + 'includes': typedef_only_info.includes, + 'forward_decls': typedef_only_info.forward_decls, + 'includers': includers + }) + + # Add typedefs to unused list + for typedef in unused_typedefs: + result.unused_typedefs.append({ + 'name': typedef.name, + 'replacement': typedef.replacement, + 'file': typedef.file_path, + 'start_line': typedef.start_line, + 'end_line': typedef.end_line, + 'content': typedef.content, + 'file_will_be_deleted': True + }) + continue + + # File has other content, just remove the typedef lines + result.files_to_modify.append({ + 'file': rel_path, + 'typedefs': [ + { + 'name': t.name, + 'replacement': t.replacement, + 'start_line': t.start_line, + 'end_line': t.end_line, + 'content': t.content + } + for t in unused_typedefs + ] + }) + + for typedef in unused_typedefs: + result.unused_typedefs.append({ + 'name': typedef.name, + 'replacement': typedef.replacement, + 'file': typedef.file_path, + 'start_line': typedef.start_line, + 'end_line': typedef.end_line, + 'content': typedef.content, + 'file_will_be_deleted': False + }) + + return result + + +def print_summary(result: CollectionResult): + """Print collection summary.""" + print("\n" + "=" * 60) + print("UNUSED TYPEDEF COLLECTION SUMMARY") + print("=" * 60) + + print(f"\nTotal unused typedefs found: {len(result.unused_typedefs)}") + print(f"Typedef-only files to delete: {len(result.files_to_delete)}") + print(f"Files to modify (remove typedefs): {len(result.files_to_modify)}") + + if result.files_to_delete: + print(f"\nTypedef-only files to delete (first 10):") + for fd in result.files_to_delete[:10]: + typedef_names = [t['name'] for t in fd['typedefs']] + print(f" {fd['file']}") + print(f" Typedefs: {', '.join(typedef_names)}") + print(f" -> Replacement: {fd['typedefs'][0]['replacement']}") + print(f" Includers: {len(fd['includers'])}") + if len(result.files_to_delete) > 10: + print(f" ... and {len(result.files_to_delete) - 10} more") + + if result.files_to_modify: + print(f"\nFiles to modify (first 10):") + for fm in result.files_to_modify[:10]: + typedef_names = [t['name'] for t in fm['typedefs']] + print(f" {fm['file']}: {', '.join(typedef_names)}") + if len(result.files_to_modify) > 10: + print(f" ... and {len(result.files_to_modify) - 10} more") + + +def main(): + parser = argparse.ArgumentParser( + description='OCCT 8.0.0 Unused Typedef Collection Script' + ) + parser.add_argument( + 'src_directory', + nargs='?', + default='.', + help='Source directory (default: current directory)' + ) + parser.add_argument( + '--verbose', '-v', + action='store_true', + help='Show detailed progress' + ) + parser.add_argument( + '--output', '-o', + default=None, + help='Output JSON file for results' + ) + + args = parser.parse_args() + + print("OCCT Unused Typedef Collector") + print("=" * 60) + + collector = UnusedTypedefCollector( + src_dir=args.src_directory, + verbose=args.verbose + ) + + result = collector.run() + + # Print summary + print_summary(result) + + # Save results + script_dir = Path(__file__).parent + output_file = args.output or (script_dir / 'unused_typedefs.json') + with open(output_file, 'w', encoding='utf-8') as f: + json.dump({ + 'description': 'Unused NCollection typedefs in OCCT. Use replacement field to update external code.', + 'unused_typedefs': result.unused_typedefs, + 'files_to_delete': result.files_to_delete, + 'files_to_modify': result.files_to_modify, + 'errors': result.errors + }, f, indent=2, ensure_ascii=False) + print(f"\nResults saved to: {output_file}") + print("\nUse apply_typedef_cleanup.py to apply changes to OCCT source") + print("Use unused_typedefs.json to update external projects:") + print(" - Replace typedef names with 'replacement' values") + print(" - Add includes from 'files_to_delete[].includes'") + print(" - Add forward declarations from 'files_to_delete[].forward_decls'") + + +if __name__ == '__main__': + main() diff --git a/adm/scripts/migration_800/unused_typedefs.json b/adm/scripts/migration_800/unused_typedefs.json index 9120bd1223..cada4e1ccf 100644 --- a/adm/scripts/migration_800/unused_typedefs.json +++ b/adm/scripts/migration_800/unused_typedefs.json @@ -1,884 +1,815 @@ { - "typedefs_removed": [ + "description": "Unused NCollection typedefs in OCCT. Use replacement field to update external code.", + "unused_typedefs": [ { - "name": "TNaming_MapOfShape", - "file": "ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx", - "start_line": 75, - "end_line": 75, - "is_ncollection": true - }, - { - "name": "TNaming_MapIteratorOfMapOfShape", - "file": "ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx", - "start_line": 76, - "end_line": 76, - "is_ncollection": true - }, - { - "name": "TNaming_DataMapOfShapeMapOfShape", - "file": "ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx", - "start_line": 77, - "end_line": 77, - "is_ncollection": true - }, - { - "name": "TNaming_DataMapIteratorOfDataMapOfShapeMapOfShape", - "file": "ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx", - "start_line": 78, - "end_line": 79, - "is_ncollection": true - }, - { - "name": "CDM_DataMapIteratorOfMetaDataLookUpTable", + "name": "CDM_MetaDataLookUpTable", + "replacement": "NCollection_DataMap>", "file": "ApplicationFramework/TKCDF/CDM/CDM_MetaDataLookUpTable.hxx", - "start_line": 26, - "end_line": 27, - "is_ncollection": true + "start_line": 24, + "end_line": 25, + "content": "typedef NCollection_DataMap>\n CDM_MetaDataLookUpTable;", + "file_will_be_deleted": true }, { - "name": "TDF_Array1OfAttributeIDelta", - "file": "ApplicationFramework/TKLCAF/TDF/TDF_Data.cxx", - "start_line": 36, - "end_line": 36, - "is_ncollection": true - }, - { - "name": "StdPersistent_HArray1OfShape1", - "file": "ApplicationFramework/TKStd/StdPersistent/StdPersistent_HArray1.hxx", + "name": "TDF_AttributeIndexedMap", + "replacement": "NCollection_IndexedMap>", + "file": "ApplicationFramework/TKLCAF/TDF/TDF_AttributeIndexedMap.hxx", "start_line": 22, "end_line": 22, - "is_ncollection": true + "content": "typedef NCollection_IndexedMap> TDF_AttributeIndexedMap;", + "file_will_be_deleted": true }, { - "name": "StdLPersistent_HArray1OfPersistent", - "file": "ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray1.hxx", - "start_line": 33, - "end_line": 33, - "is_ncollection": true + "name": "StdObjMgt_TransientPersistentMap", + "replacement": "NCollection_DataMap, occ::handle>", + "file": "ApplicationFramework/TKStdL/StdObjMgt/StdObjMgt_TransientPersistentMap.hxx", + "start_line": 22, + "end_line": 23, + "content": "typedef NCollection_DataMap, occ::handle>\n StdObjMgt_TransientPersistentMap;", + "file_will_be_deleted": true }, { - "name": "StdLPersistent_HArray2OfPersistent", - "file": "ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray2.hxx", - "start_line": 31, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "TObj_HSequenceOfObject", + "name": "TObj_SequenceOfObject", + "replacement": "NCollection_Sequence>", "file": "ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx", - "start_line": 26, - "end_line": 26, - "is_ncollection": true - }, - { - "name": "TObj_TIntSparseArray_VecOfData", - "file": "ApplicationFramework/TKTObj/TObj/TObj_TIntSparseArray.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "TObj_TIntSparseArray_MapOfData", - "file": "ApplicationFramework/TKTObj/TObj/TObj_TIntSparseArray.hxx", "start_line": 25, "end_line": 25, - "is_ncollection": true + "content": "typedef NCollection_Sequence> TObj_SequenceOfObject;", + "file_will_be_deleted": true }, { - "name": "DE_ResourceMap", - "file": "DataExchange/TKDE/DE/DE_ConfigurationContext.hxx", - "start_line": 21, - "end_line": 21, - "is_ncollection": true + "name": "XCAFDimTolObjects_DatumObjectSequence", + "replacement": "NCollection_Sequence>", + "file": "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObjectSequence.hxx", + "start_line": 22, + "end_line": 23, + "content": "typedef NCollection_Sequence>\n XCAFDimTolObjects_DatumObjectSequence;", + "file_will_be_deleted": true }, { - "name": "DE_ConfigurationVendorMap", - "file": "DataExchange/TKDE/DE/DE_Wrapper.hxx", - "start_line": 31, - "end_line": 32, - "is_ncollection": true + "name": "XCAFDimTolObjects_DimensionObjectSequence", + "replacement": "NCollection_Sequence>", + "file": "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObjectSequence.hxx", + "start_line": 22, + "end_line": 23, + "content": "typedef NCollection_Sequence>\n XCAFDimTolObjects_DimensionObjectSequence;", + "file_will_be_deleted": true }, { - "name": "DE_ConfigurationFormatMap", - "file": "DataExchange/TKDE/DE/DE_Wrapper.hxx", - "start_line": 33, - "end_line": 34, - "is_ncollection": true + "name": "XCAFDimTolObjects_GeomToleranceObjectSequence", + "replacement": "NCollection_Sequence>", + "file": "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObjectSequence.hxx", + "start_line": 22, + "end_line": 23, + "content": "typedef NCollection_Sequence>\n XCAFDimTolObjects_GeomToleranceObjectSequence;", + "file_will_be_deleted": true }, { - "name": "RWGltf_GltfFaceList", - "file": "DataExchange/TKDEGLTF/RWGltf/RWGltf_GltfFace.hxx", - "start_line": 44, - "end_line": 44, - "is_ncollection": true + "name": "XCAFDoc_GraphNodeSequence", + "replacement": "NCollection_Sequence>", + "file": "DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx", + "start_line": 22, + "end_line": 22, + "content": "typedef NCollection_Sequence> XCAFDoc_GraphNodeSequence;", + "file_will_be_deleted": true }, { - "name": "StepDimTol_HArray1OfDatumReferenceElement", - "file": "DataExchange/TKDESTEP/StepDimTol/StepDimTol_DatumOrCommonDatum.hxx", - "start_line": 30, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "StepVisual_VectorOfHSequenceOfInteger", - "file": "DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedCurveSet.hxx", - "start_line": 30, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "StepVisual_Array1OfTessellatedItem", - "file": "DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedGeometricSet.hxx", - "start_line": 26, - "end_line": 26, - "is_ncollection": true - }, - { - "name": "RWMesh_NodeAttributeMap", - "file": "DataExchange/TKRWMesh/RWMesh/RWMesh_NodeAttributes.hxx", - "start_line": 34, - "end_line": 35, - "is_ncollection": true - }, - { - "name": "MoniTool_DataMapIteratorOfDataMapOfTimer", + "name": "MoniTool_DataMapOfTimer", + "replacement": "NCollection_DataMap, Standard_CStringHasher>", "file": "DataExchange/TKXSBase/MoniTool/MoniTool_DataMapOfTimer.hxx", - "start_line": 27, - "end_line": 28, - "is_ncollection": true + "start_line": 25, + "end_line": 26, + "content": "typedef NCollection_DataMap, Standard_CStringHasher>\n MoniTool_DataMapOfTimer;", + "file_will_be_deleted": true }, { - "name": "DisplayModeFiltersMap", - "file": "Draw/TKIVtkDraw/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx", - "start_line": 37, - "end_line": 38, - "is_ncollection": true - }, - { - "name": "SubShapesFiltersMap", - "file": "Draw/TKIVtkDraw/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx", - "start_line": 39, - "end_line": 40, - "is_ncollection": true - }, - { - "name": "SequenceOfDocNames", - "file": "Draw/TKQADraw/QABugs/QABugs_20.cxx", - "start_line": 3270, - "end_line": 3270, - "is_ncollection": true - }, - { - "name": "ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName", + "name": "ViewerTest_DoubleMapOfInteractiveAndName", + "replacement": "NCollection_DoubleMap, TCollection_AsciiString>", "file": "Draw/TKViewerTest/ViewerTest/ViewerTest_DoubleMapOfInteractiveAndName.hxx", - "start_line": 27, - "end_line": 28, - "is_ncollection": true + "start_line": 25, + "end_line": 26, + "content": "typedef NCollection_DoubleMap, TCollection_AsciiString>\n ViewerTest_DoubleMapOfInteractiveAndName;", + "file_will_be_deleted": true }, { - "name": "Array1OfPnt", - "file": "FoundationClasses/TKMath/BSplCLib/BSplCLib.cxx", - "start_line": 45, - "end_line": 45, - "is_ncollection": true + "name": "gp_TrsfNLerp", + "replacement": "NCollection_Lerp", + "file": "FoundationClasses/TKMath/gp/gp_TrsfNLerp.hxx", + "start_line": 89, + "end_line": 89, + "content": "typedef NCollection_Lerp gp_TrsfNLerp;", + "file_will_be_deleted": false }, { - "name": "Poly_BaseIteratorOfCoherentTriangle", - "file": "FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx", - "start_line": 29, - "end_line": 29, - "is_ncollection": true - }, - { - "name": "Poly_BaseIteratorOfCoherentNode", - "file": "FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx", - "start_line": 30, - "end_line": 30, - "is_ncollection": true - }, - { - "name": "Poly_BaseIteratorOfCoherentLink", - "file": "FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx", - "start_line": 31, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "NCollection_Utf8Iter", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfIterator.hxx", - "start_line": 261, - "end_line": 261, - "is_ncollection": true - }, - { - "name": "NCollection_Utf16Iter", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfIterator.hxx", - "start_line": 262, - "end_line": 262, - "is_ncollection": true - }, - { - "name": "NCollection_Utf32Iter", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfIterator.hxx", - "start_line": 263, - "end_line": 263, - "is_ncollection": true - }, - { - "name": "NCollection_UtfWideIter", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfIterator.hxx", - "start_line": 264, - "end_line": 264, - "is_ncollection": true - }, - { - "name": "NCollection_Utf8String", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfString.hxx", - "start_line": 330, - "end_line": 330, - "is_ncollection": true - }, - { - "name": "NCollection_Utf16String", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfString.hxx", - "start_line": 331, - "end_line": 331, - "is_ncollection": true - }, - { - "name": "NCollection_Utf32String", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfString.hxx", - "start_line": 332, - "end_line": 332, - "is_ncollection": true - }, - { - "name": "NCollection_UtfWideString", - "file": "FoundationClasses/TKernel/NCollection/NCollection_UtfString.hxx", - "start_line": 333, - "end_line": 333, - "is_ncollection": true - }, - { - "name": "Storage_ArrayOfSchema", - "file": "FoundationClasses/TKernel/Storage/Storage_ArrayOfSchema.hxx", + "name": "BOPDS_ListOfPaveBlock", + "replacement": "NCollection_List>", + "file": "ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx", "start_line": 23, "end_line": 23, - "is_ncollection": true + "content": "typedef NCollection_List> BOPDS_ListOfPaveBlock;", + "file_will_be_deleted": true }, { - "name": "BOPAlgo_ListOfEdgeInfo", - "file": "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter.lxx", - "start_line": 72, - "end_line": 72, - "is_ncollection": true + "name": "Expr_Array1OfNamedUnknown", + "replacement": "NCollection_Array1>", + "file": "ModelingAlgorithms/TKExpress/Expr/Expr_Array1OfNamedUnknown.hxx", + "start_line": 23, + "end_line": 23, + "content": "typedef NCollection_Array1> Expr_Array1OfNamedUnknown;", + "file_will_be_deleted": true }, { - "name": "BOPAlgo_ListIteratorOfListOfEdgeInfo", - "file": "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter.lxx", - "start_line": 73, - "end_line": 73, - "is_ncollection": true + "name": "ShapeAnalysis_BoxBndTree", + "replacement": "NCollection_UBTree", + "file": "ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx", + "start_line": 33, + "end_line": 33, + "content": "typedef NCollection_UBTree ShapeAnalysis_BoxBndTree;", + "file_will_be_deleted": false }, { - "name": "BOPAlgo_IndexedDataMapOfShapeListOfEdgeInfo", - "file": "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter.lxx", - "start_line": 78, - "end_line": 79, - "is_ncollection": true + "name": "BRepClass3d_BndBoxTree", + "replacement": "NCollection_UBTree", + "file": "ModelingAlgorithms/TKTopAlgo/BRepClass3d/BRepClass3d_BndBoxTree.hxx", + "start_line": 31, + "end_line": 31, + "content": "typedef NCollection_UBTree BRepClass3d_BndBoxTree;", + "file_will_be_deleted": false }, { - "name": "TopTools_DataMapOfShapeReal", - "file": "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter_1.cxx", - "start_line": 915, - "end_line": 916, - "is_ncollection": true - }, - { - "name": "TopTools_DataMapIteratorOfDataMapOfShapeReal", - "file": "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter_1.cxx", - "start_line": 917, - "end_line": 917, - "is_ncollection": true - }, - { - "name": "BOPDS_ListIteratorOfListOfPaveBlock", - "file": "ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "IntPolyh_ArrayOfInteger", - "file": "ModelingAlgorithms/TKGeomAlgo/IntPolyh/IntPolyh_MaillageAffinage.cxx", - "start_line": 52, - "end_line": 52, - "is_ncollection": true - }, - { - "name": "BRepOffset_DataMapOfShapeMapOfShape", - "file": "ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_MakeOffset_1.cxx", - "start_line": 71, - "end_line": 72, - "is_ncollection": true - }, - { - "name": "BRepBuilderAPI_BndBoxTree", - "file": "ModelingAlgorithms/TKTopAlgo/BRepBuilderAPI/BRepBuilderAPI_BndBoxTreeSelector.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "BRepExtrema_CellFilter", - "file": "ModelingAlgorithms/TKTopAlgo/BRepExtrema/BRepExtrema_ProximityValueTool.hxx", - "start_line": 68, - "end_line": 68, - "is_ncollection": true - }, - { - "name": "BRepExtrema_ShapeList", - "file": "ModelingAlgorithms/TKTopAlgo/BRepExtrema/BRepExtrema_TriangleSet.hxx", - "start_line": 28, - "end_line": 28, - "is_ncollection": true - }, - { - "name": "TopoDS_ListIteratorOfListOfShape", + "name": "TopoDS_ListOfShape", + "replacement": "NCollection_List", "file": "ModelingData/TKBRep/TopoDS/TopoDS_ListOfShape.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true + "start_line": 23, + "end_line": 23, + "content": "typedef NCollection_List TopoDS_ListOfShape;", + "file_will_be_deleted": true }, { - "name": "Array2OfInteger", - "file": "ModelingData/TKGeomBase/GeomConvert/GeomConvert_1.cxx", - "start_line": 64, - "end_line": 64, - "is_ncollection": true + "name": "Geom2dConvert_SequenceOfPPoint", + "replacement": "NCollection_Sequence", + "file": "ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_SequenceOfPPoint.hxx", + "start_line": 23, + "end_line": 23, + "content": "typedef NCollection_Sequence Geom2dConvert_SequenceOfPPoint;", + "file_will_be_deleted": true }, { - "name": "Array1OfPnt", - "file": "ModelingData/TKGeomBase/GeomConvert/GeomConvert_1.cxx", - "start_line": 66, - "end_line": 66, - "is_ncollection": true - }, - { - "name": "IVtk_ShapePtrList", - "file": "Visualization/TKIVtk/IVtk/IVtk_IShape.hxx", - "start_line": 44, - "end_line": 44, - "is_ncollection": true - }, - { - "name": "IVtk_ShapeIdList", - "file": "Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "start_line": 45, - "end_line": 45, - "is_ncollection": true - }, - { - "name": "IVtk_PointIdList", - "file": "Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "start_line": 46, - "end_line": 46, - "is_ncollection": true - }, - { - "name": "IVtk_SubShapeMap", - "file": "Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "start_line": 48, - "end_line": 48, - "is_ncollection": true - }, - { - "name": "IVtk_IdTypeMap", - "file": "Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "start_line": 49, - "end_line": 49, - "is_ncollection": true - }, - { - "name": "IVtk_Pnt2dList", - "file": "Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "start_line": 51, - "end_line": 51, - "is_ncollection": true - }, - { - "name": "IVtk_SelectionModeList", - "file": "Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "start_line": 73, - "end_line": 73, - "is_ncollection": true - }, - { - "name": "IVtk_ShapeTypeMap", - "file": "Visualization/TKIVtk/IVtkOCC/IVtkOCC_ShapeMesher.hxx", - "start_line": 31, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "IVtk_Polyline", - "file": "Visualization/TKIVtk/IVtkOCC/IVtkOCC_ShapeMesher.hxx", - "start_line": 32, - "end_line": 32, - "is_ncollection": true - }, - { - "name": "IVtk_PolylineList", - "file": "Visualization/TKIVtk/IVtkOCC/IVtkOCC_ShapeMesher.hxx", - "start_line": 33, - "end_line": 33, - "is_ncollection": true - }, - { - "name": "MeshVS_PolyhedronVerts", - "file": "Visualization/TKMeshVS/MeshVS/MeshVS_SensitivePolyhedron.hxx", - "start_line": 29, - "end_line": 29, - "is_ncollection": true - }, - { - "name": "MeshVS_PolyhedronVertsIter", - "file": "Visualization/TKMeshVS/MeshVS/MeshVS_SensitivePolyhedron.hxx", - "start_line": 30, - "end_line": 30, - "is_ncollection": true - }, - { - "name": "OpenGl_ColorFormats", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx", - "start_line": 30, - "end_line": 30, - "is_ncollection": true - }, - { - "name": "OpenGl_MapOfHatchStylesAndIds", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_LineAttributes.hxx", - "start_line": 24, - "end_line": 25, - "is_ncollection": true - }, - { - "name": "OpenGl_MapOfShaderPrograms", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_SetOfShaderPrograms.hxx", - "start_line": 78, - "end_line": 79, - "is_ncollection": true - }, - { - "name": "OpenGl_ShaderProgramList", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_ShaderManager.hxx", - "start_line": 33, - "end_line": 33, - "is_ncollection": true - }, - { - "name": "OpenGl_ShaderList", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_ShaderProgram.hxx", - "start_line": 110, - "end_line": 110, - "is_ncollection": true - }, - { - "name": "OpenGl_SetterList", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_ShaderProgram.hxx", - "start_line": 113, - "end_line": 113, - "is_ncollection": true - }, - { - "name": "OpenGl_ListOfStructure", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Structure.hxx", - "start_line": 27, - "end_line": 27, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec2i", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 29, - "end_line": 29, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec3i", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 30, - "end_line": 30, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec4i", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 31, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec2b", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 33, - "end_line": 33, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec3b", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 34, - "end_line": 34, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec4b", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 35, - "end_line": 35, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec2u", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 37, - "end_line": 37, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec3u", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 38, - "end_line": 38, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec4u", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 39, - "end_line": 39, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec2ub", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 41, - "end_line": 41, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec3ub", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 42, - "end_line": 42, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec4ub", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 43, - "end_line": 43, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec2", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 45, - "end_line": 45, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec3", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 46, - "end_line": 46, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec4", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 47, - "end_line": 47, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec2d", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 49, - "end_line": 49, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec3d", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 50, - "end_line": 50, - "is_ncollection": true - }, - { - "name": "OpenGl_Vec4d", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 51, - "end_line": 51, - "is_ncollection": true - }, - { - "name": "OpenGl_Mat4", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 53, - "end_line": 53, - "is_ncollection": true - }, - { - "name": "OpenGl_Mat4d", - "file": "Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "start_line": 54, - "end_line": 54, - "is_ncollection": true - }, - { - "name": "Aspect_TrackedDevicePoseArray", - "file": "Visualization/TKService/Aspect/Aspect_TrackedDevicePose.hxx", - "start_line": 38, - "end_line": 38, - "is_ncollection": true - }, - { - "name": "Aspect_XRActionMap", - "file": "Visualization/TKService/Aspect/Aspect_XRAction.hxx", - "start_line": 58, - "end_line": 59, - "is_ncollection": true - }, - { - "name": "Aspect_XRActionSetMap", - "file": "Visualization/TKService/Aspect/Aspect_XRActionSet.hxx", - "start_line": 55, - "end_line": 56, - "is_ncollection": true - }, - { - "name": "Graphic3d_Array1OfAttribute", - "file": "Visualization/TKService/Graphic3d/Graphic3d_Buffer.hxx", - "start_line": 83, - "end_line": 83, - "is_ncollection": true - }, - { - "name": "Graphic3d_CameraLerp", - "file": "Visualization/TKService/Graphic3d/Graphic3d_Camera.hxx", - "start_line": 847, - "end_line": 847, - "is_ncollection": true - }, - { - "name": "Graphic3d_GraphicDriverFactoryList", - "file": "Visualization/TKService/Graphic3d/Graphic3d_GraphicDriverFactory.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "Graphic3d_IndexedMapOfStructure", - "file": "Visualization/TKService/Graphic3d/Graphic3d_Layer.hxx", - "start_line": 29, - "end_line": 29, - "is_ncollection": true - }, - { - "name": "Graphic3d_ShaderObjectList", - "file": "Visualization/TKService/Graphic3d/Graphic3d_ShaderProgram.hxx", - "start_line": 27, - "end_line": 27, - "is_ncollection": true - }, - { - "name": "Graphic3d_ShaderVariableList", - "file": "Visualization/TKService/Graphic3d/Graphic3d_ShaderProgram.hxx", - "start_line": 30, - "end_line": 30, - "is_ncollection": true - }, - { - "name": "Graphic3d_ShaderAttributeList", - "file": "Visualization/TKService/Graphic3d/Graphic3d_ShaderProgram.hxx", - "start_line": 33, - "end_line": 33, - "is_ncollection": true - }, - { - "name": "Graphic3d_IndexedMapOfView", - "file": "Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx", - "start_line": 35, - "end_line": 35, - "is_ncollection": true - }, - { - "name": "AIS_ManipulatorObjectSequence", - "file": "Visualization/TKV3d/AIS/AIS_Manipulator.hxx", - "start_line": 31, - "end_line": 31, - "is_ncollection": true - }, - { - "name": "AIS_MouseGestureMap", - "file": "Visualization/TKV3d/AIS/AIS_MouseGesture.hxx", - "start_line": 48, - "end_line": 48, - "is_ncollection": true - }, - { - "name": "AIS_MouseSelectionSchemeMap", - "file": "Visualization/TKV3d/AIS/AIS_MouseGesture.hxx", - "start_line": 49, - "end_line": 49, - "is_ncollection": true - }, - { - "name": "PrsMgr_ListOfPresentableObjectsIter", - "file": "Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx", - "start_line": 25, - "end_line": 26, - "is_ncollection": true - }, - { - "name": "Select3D_Vec3", - "file": "Visualization/TKV3d/Select3D/Select3D_BndBox3d.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "Select3D_EntitySequenceIter", - "file": "Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx", - "start_line": 21, - "end_line": 22, - "is_ncollection": true - }, - { - "name": "Select3D_VectorOfHPoly", - "file": "Visualization/TKV3d/Select3D/Select3D_InteriorSensitivePointSet.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "SelectMgr_IndexedMapOfHSensitive", - "file": "Visualization/TKV3d/SelectMgr/SelectMgr_SensitiveEntitySet.hxx", - "start_line": 25, - "end_line": 25, - "is_ncollection": true - }, - { - "name": "SelectMgr_MapOfOwners", - "file": "Visualization/TKV3d/SelectMgr/SelectMgr_SensitiveEntitySet.hxx", - "start_line": 26, - "end_line": 26, - "is_ncollection": true - }, - { - "name": "SelectMgr_TriangFrustums", - "file": "Visualization/TKV3d/SelectMgr/SelectMgr_TriangularFrustumSet.hxx", - "start_line": 24, - "end_line": 24, - "is_ncollection": true - }, - { - "name": "SelectMgr_MapOfObjectSensitives", - "file": "Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx", - "start_line": 48, - "end_line": 50, - "is_ncollection": true - }, - { - "name": "SelectMgr_MapOfObjectSensitivesIterator", - "file": "Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx", - "start_line": 51, - "end_line": 53, - "is_ncollection": true - }, - { - "name": "SelectMgr_FrustumCache", - "file": "Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx", - "start_line": 55, - "end_line": 56, - "is_ncollection": true - }, - { - "name": "V3d_ListOfViewIterator", - "file": "Visualization/TKV3d/V3d/V3d_ListOfView.hxx", - "start_line": 21, + "name": "Graphic3d_MapOfAspectsToAspects", + "replacement": "NCollection_DataMap, occ::handle>", + "file": "Visualization/TKService/Graphic3d/Graphic3d_MapOfAspectsToAspects.hxx", + "start_line": 20, "end_line": 21, - "is_ncollection": true + "content": "typedef NCollection_DataMap, occ::handle>\n Graphic3d_MapOfAspectsToAspects;", + "file_will_be_deleted": true + }, + { + "name": "Graphic3d_MapOfStructure", + "replacement": "NCollection_Map>", + "file": "Visualization/TKService/Graphic3d/Graphic3d_MapOfStructure.hxx", + "start_line": 22, + "end_line": 22, + "content": "typedef NCollection_Map> Graphic3d_MapOfStructure;", + "file_will_be_deleted": true + }, + { + "name": "PrsMgr_ListOfPresentableObjects", + "replacement": "NCollection_List>", + "file": "Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx", + "start_line": 24, + "end_line": 24, + "content": "typedef NCollection_List> PrsMgr_ListOfPresentableObjects;", + "file_will_be_deleted": false + }, + { + "name": "PrsMgr_Presentations", + "replacement": "NCollection_Sequence>", + "file": "Visualization/TKV3d/PrsMgr/PrsMgr_Presentations.hxx", + "start_line": 23, + "end_line": 23, + "content": "typedef NCollection_Sequence> PrsMgr_Presentations;", + "file_will_be_deleted": true + }, + { + "name": "Select3D_EntitySequence", + "replacement": "NCollection_Sequence>", + "file": "Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx", + "start_line": 20, + "end_line": 20, + "content": "typedef NCollection_Sequence> Select3D_EntitySequence;", + "file_will_be_deleted": true + }, + { + "name": "Select3D_IndexedMapOfEntity", + "replacement": "NCollection_IndexedMap>", + "file": "Visualization/TKV3d/Select3D/Select3D_IndexedMapOfEntity.hxx", + "start_line": 20, + "end_line": 20, + "content": "typedef NCollection_IndexedMap> Select3D_IndexedMapOfEntity;", + "file_will_be_deleted": true + }, + { + "name": "SelectMgr_IndexedMapOfOwner", + "replacement": "NCollection_Shared>>", + "file": "Visualization/TKV3d/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx", + "start_line": 24, + "end_line": 25, + "content": "typedef NCollection_Shared>>\n SelectMgr_IndexedMapOfOwner;", + "file_will_be_deleted": true + }, + { + "name": "SelectMgr_SequenceOfOwner", + "replacement": "NCollection_Sequence>", + "file": "Visualization/TKV3d/SelectMgr/SelectMgr_SequenceOfOwner.hxx", + "start_line": 24, + "end_line": 24, + "content": "typedef NCollection_Sequence> SelectMgr_SequenceOfOwner;", + "file_will_be_deleted": true + }, + { + "name": "V3d_ListOfView", + "replacement": "NCollection_List>", + "file": "Visualization/TKV3d/V3d/V3d_ListOfView.hxx", + "start_line": 20, + "end_line": 20, + "content": "typedef NCollection_List> V3d_ListOfView;", + "file_will_be_deleted": true } ], - "files_modified": [ - "src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx", - "src/ApplicationFramework/TKCDF/CDM/CDM_MetaDataLookUpTable.hxx", - "src/ApplicationFramework/TKLCAF/TDF/TDF_Data.cxx", - "src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_HArray1.hxx", - "src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray1.hxx", - "src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray2.hxx", - "src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx", - "src/ApplicationFramework/TKTObj/TObj/TObj_TIntSparseArray.hxx", - "src/DataExchange/TKDE/DE/DE_ConfigurationContext.hxx", - "src/DataExchange/TKDE/DE/DE_Wrapper.hxx", - "src/DataExchange/TKDEGLTF/RWGltf/RWGltf_GltfFace.hxx", - "src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_DatumOrCommonDatum.hxx", - "src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedCurveSet.hxx", - "src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedGeometricSet.hxx", - "src/DataExchange/TKRWMesh/RWMesh/RWMesh_NodeAttributes.hxx", - "src/DataExchange/TKXSBase/MoniTool/MoniTool_DataMapOfTimer.hxx", - "src/Draw/TKIVtkDraw/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx", - "src/Draw/TKQADraw/QABugs/QABugs_20.cxx", - "src/Draw/TKViewerTest/ViewerTest/ViewerTest_DoubleMapOfInteractiveAndName.hxx", - "src/FoundationClasses/TKMath/BSplCLib/BSplCLib.cxx", - "src/FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx", - "src/FoundationClasses/TKernel/NCollection/NCollection_UtfIterator.hxx", - "src/FoundationClasses/TKernel/NCollection/NCollection_UtfString.hxx", - "src/FoundationClasses/TKernel/Storage/Storage_ArrayOfSchema.hxx", - "src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter.lxx", - "src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter_1.cxx", - "src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx", - "src/ModelingAlgorithms/TKGeomAlgo/IntPolyh/IntPolyh_MaillageAffinage.cxx", - "src/ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_MakeOffset_1.cxx", - "src/ModelingAlgorithms/TKTopAlgo/BRepBuilderAPI/BRepBuilderAPI_BndBoxTreeSelector.hxx", - "src/ModelingAlgorithms/TKTopAlgo/BRepExtrema/BRepExtrema_ProximityValueTool.hxx", - "src/ModelingAlgorithms/TKTopAlgo/BRepExtrema/BRepExtrema_TriangleSet.hxx", - "src/ModelingData/TKBRep/TopoDS/TopoDS_ListOfShape.hxx", - "src/ModelingData/TKGeomBase/GeomConvert/GeomConvert_1.cxx", - "src/Visualization/TKIVtk/IVtk/IVtk_IShape.hxx", - "src/Visualization/TKIVtk/IVtk/IVtk_Types.hxx", - "src/Visualization/TKIVtk/IVtkOCC/IVtkOCC_ShapeMesher.hxx", - "src/Visualization/TKMeshVS/MeshVS/MeshVS_SensitivePolyhedron.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_LineAttributes.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_SetOfShaderPrograms.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_ShaderManager.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_ShaderProgram.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_Structure.hxx", - "src/Visualization/TKOpenGl/OpenGl/OpenGl_Vec.hxx", - "src/Visualization/TKService/Aspect/Aspect_TrackedDevicePose.hxx", - "src/Visualization/TKService/Aspect/Aspect_XRAction.hxx", - "src/Visualization/TKService/Aspect/Aspect_XRActionSet.hxx", - "src/Visualization/TKService/Graphic3d/Graphic3d_Buffer.hxx", - "src/Visualization/TKService/Graphic3d/Graphic3d_Camera.hxx", - "src/Visualization/TKService/Graphic3d/Graphic3d_GraphicDriverFactory.hxx", - "src/Visualization/TKService/Graphic3d/Graphic3d_Layer.hxx", - "src/Visualization/TKService/Graphic3d/Graphic3d_ShaderProgram.hxx", - "src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx", - "src/Visualization/TKV3d/AIS/AIS_Manipulator.hxx", - "src/Visualization/TKV3d/AIS/AIS_MouseGesture.hxx", - "src/Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx", - "src/Visualization/TKV3d/Select3D/Select3D_BndBox3d.hxx", - "src/Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx", - "src/Visualization/TKV3d/Select3D/Select3D_InteriorSensitivePointSet.hxx", - "src/Visualization/TKV3d/SelectMgr/SelectMgr_SensitiveEntitySet.hxx", - "src/Visualization/TKV3d/SelectMgr/SelectMgr_TriangularFrustumSet.hxx", - "src/Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx", - "src/Visualization/TKV3d/V3d/V3d_ListOfView.hxx" + "files_to_delete": [ + { + "file": "ApplicationFramework/TKCDF/CDM/CDM_MetaDataLookUpTable.hxx", + "typedefs": [ + { + "name": "CDM_MetaDataLookUpTable", + "replacement": "NCollection_DataMap>", + "content": "typedef NCollection_DataMap>\n CDM_MetaDataLookUpTable;" + } + ], + "includes": [ + "#include ", + "#include " + ], + "forward_decls": [ + "class CDM_MetaData;" + ], + "includers": [ + "ApplicationFramework/TKCDF/CDF/CDF_FWOSDriver.hxx", + "ApplicationFramework/TKCDF/CDM/CDM_Application.hxx", + "ApplicationFramework/TKCDF/CDM/CDM_Document.cxx", + "ApplicationFramework/TKCDF/CDM/CDM_MetaData.cxx", + "ApplicationFramework/TKCDF/CDM/CDM_MetaData.hxx", + "ApplicationFramework/TKCDF/PCDM/PCDM_ReferenceIterator.hxx" + ] + }, + { + "file": "ApplicationFramework/TKLCAF/TDF/TDF_AttributeIndexedMap.hxx", + "typedefs": [ + { + "name": "TDF_AttributeIndexedMap", + "replacement": "NCollection_IndexedMap>", + "content": "typedef NCollection_IndexedMap> TDF_AttributeIndexedMap;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class TDF_Attribute;" + ], + "includers": [ + "ApplicationFramework/TKCAF/TNaming/TNaming_Naming.hxx", + "ApplicationFramework/TKLCAF/TDF/TDF_Attribute.hxx", + "ApplicationFramework/TKLCAF/TDF/TDF_Label.hxx", + "Draw/TKDCAF/DDF/DDF_Browser.hxx" + ] + }, + { + "file": "ApplicationFramework/TKStdL/StdObjMgt/StdObjMgt_TransientPersistentMap.hxx", + "typedefs": [ + { + "name": "StdObjMgt_TransientPersistentMap", + "replacement": "NCollection_DataMap, occ::handle>", + "content": "typedef NCollection_DataMap, occ::handle>\n StdObjMgt_TransientPersistentMap;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Standard_Transient;", + "class StdObjMgt_Persistent;" + ], + "includers": [ + "ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_BRep.hxx", + "ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom.hxx", + "ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom_Curve.hxx", + "ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Poly.hxx", + "ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_TopoDS.hxx", + "ApplicationFramework/TKStd/StdObject/StdObject_Location.hxx", + "ApplicationFramework/TKStd/StdPersistent/StdPersistent_TopLoc.hxx" + ] + }, + { + "file": "ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx", + "typedefs": [ + { + "name": "TObj_SequenceOfObject", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence> TObj_SequenceOfObject;" + } + ], + "includes": [ + "#include ", + "#include " + ], + "forward_decls": [ + "class TObj_Object;" + ], + "includers": [ + "ApplicationFramework/TKTObj/TObj/TObj_Object.hxx", + "ApplicationFramework/TKTObj/TObj/TObj_Persistence.hxx", + "ApplicationFramework/TKTObj/TObj/TObj_SequenceIterator.hxx", + "ApplicationFramework/TKTObj/TObj/TObj_TNameContainer.hxx" + ] + }, + { + "file": "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObjectSequence.hxx", + "typedefs": [ + { + "name": "XCAFDimTolObjects_DatumObjectSequence", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence>\n XCAFDimTolObjects_DatumObjectSequence;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class XCAFDimTolObjects_DatumObject;" + ], + "includers": [ + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx", + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx", + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx" + ] + }, + { + "file": "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObjectSequence.hxx", + "typedefs": [ + { + "name": "XCAFDimTolObjects_DimensionObjectSequence", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence>\n XCAFDimTolObjects_DimensionObjectSequence;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class XCAFDimTolObjects_DimensionObject;" + ], + "includers": [ + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx", + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx", + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx" + ] + }, + { + "file": "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObjectSequence.hxx", + "typedefs": [ + { + "name": "XCAFDimTolObjects_GeomToleranceObjectSequence", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence>\n XCAFDimTolObjects_GeomToleranceObjectSequence;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class XCAFDimTolObjects_GeomToleranceObject;" + ], + "includers": [ + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx", + "DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx" + ] + }, + { + "file": "DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx", + "typedefs": [ + { + "name": "XCAFDoc_GraphNodeSequence", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence> XCAFDoc_GraphNodeSequence;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class XCAFDoc_GraphNode;" + ], + "includers": [ + "DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNode.hxx" + ] + }, + { + "file": "DataExchange/TKXSBase/MoniTool/MoniTool_DataMapOfTimer.hxx", + "typedefs": [ + { + "name": "MoniTool_DataMapOfTimer", + "replacement": "NCollection_DataMap, Standard_CStringHasher>", + "content": "typedef NCollection_DataMap, Standard_CStringHasher>\n MoniTool_DataMapOfTimer;" + } + ], + "includes": [ + "#include ", + "#include ", + "#include " + ], + "forward_decls": [ + "class MoniTool_Timer;" + ], + "includers": [ + "DataExchange/TKXSBase/MoniTool/MoniTool_Timer.cxx", + "DataExchange/TKXSBase/MoniTool/MoniTool_Timer.hxx" + ] + }, + { + "file": "Draw/TKViewerTest/ViewerTest/ViewerTest_DoubleMapOfInteractiveAndName.hxx", + "typedefs": [ + { + "name": "ViewerTest_DoubleMapOfInteractiveAndName", + "replacement": "NCollection_DoubleMap, TCollection_AsciiString>", + "content": "typedef NCollection_DoubleMap, TCollection_AsciiString>\n ViewerTest_DoubleMapOfInteractiveAndName;" + } + ], + "includes": [ + "#include ", + "#include ", + "#include " + ], + "forward_decls": [ + "class AIS_InteractiveObject;" + ], + "includers": [ + "Draw/TKQADraw/QABugs/QABugs_1.cxx", + "Draw/TKQADraw/QABugs/QABugs_11.cxx", + "Draw/TKQADraw/QABugs/QABugs_16.cxx", + "Draw/TKViewerTest/ViewerTest/ViewerTest.cxx", + "Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx", + "Draw/TKViewerTest/ViewerTest/ViewerTest_OpenGlCommands.cxx", + "Draw/TKViewerTest/ViewerTest/ViewerTest_RelationCommands.cxx", + "Draw/TKViewerTest/ViewerTest/ViewerTest_ViewerCommands.cxx" + ] + }, + { + "file": "ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx", + "typedefs": [ + { + "name": "BOPDS_ListOfPaveBlock", + "replacement": "NCollection_List>", + "content": "typedef NCollection_List> BOPDS_ListOfPaveBlock;" + } + ], + "includes": [ + "#include ", + "#include " + ], + "forward_decls": [ + "class BOPDS_PaveBlock;" + ], + "includers": [ + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Builder_1.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller.hxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_10.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_6.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_7.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_9.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Section.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.cxx", + "ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.hxx", + "ModelingAlgorithms/TKBO/BOPDS/BOPDS_CommonBlock.hxx", + "ModelingAlgorithms/TKBO/BOPDS/BOPDS_Curve.hxx", + "ModelingAlgorithms/TKBO/BOPDS/BOPDS_DS.hxx", + "ModelingAlgorithms/TKBO/BOPDS/BOPDS_PaveBlock.hxx", + "ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Builder.cxx" + ] + }, + { + "file": "ModelingAlgorithms/TKExpress/Expr/Expr_Array1OfNamedUnknown.hxx", + "typedefs": [ + { + "name": "Expr_Array1OfNamedUnknown", + "replacement": "NCollection_Array1>", + "content": "typedef NCollection_Array1> Expr_Array1OfNamedUnknown;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Expr_NamedUnknown;" + ], + "includers": [ + "ModelingAlgorithms/TKExpress/Expr/Expr_Absolute.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_ArcCosine.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_ArcSine.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_ArcTangent.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_ArgCosh.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_ArgSinh.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_ArgTanh.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.cxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Cosh.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Cosine.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Difference.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Division.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Exponential.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Exponentiate.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_FunctionDerivative.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_GeneralExpression.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_GeneralFunction.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_LogOf10.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_LogOfe.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_NamedConstant.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_NamedFunction.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_NamedUnknown.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_NumericValue.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.cxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Product.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Sign.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Sine.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Sinh.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Square.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_SquareRoot.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Sum.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Tangent.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_Tanh.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.cxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.hxx", + "ModelingAlgorithms/TKExpress/Expr/Expr_UnaryMinus.hxx", + "ModelingAlgorithms/TKExpress/ExprIntrp/ExprIntrp_yaccintrf.cxx" + ] + }, + { + "file": "ModelingData/TKBRep/TopoDS/TopoDS_ListOfShape.hxx", + "typedefs": [ + { + "name": "TopoDS_ListOfShape", + "replacement": "NCollection_List", + "content": "typedef NCollection_List TopoDS_ListOfShape;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class TopoDS_Shape;" + ], + "includers": [ + "ModelingData/TKBRep/TopoDS/TopoDS_Builder.cxx", + "ModelingData/TKBRep/TopoDS/TopoDS_Iterator.hxx", + "ModelingData/TKBRep/TopoDS/TopoDS_TShape.hxx" + ] + }, + { + "file": "ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_SequenceOfPPoint.hxx", + "typedefs": [ + { + "name": "Geom2dConvert_SequenceOfPPoint", + "replacement": "NCollection_Sequence", + "content": "typedef NCollection_Sequence Geom2dConvert_SequenceOfPPoint;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Geom2dConvert_PPoint;" + ], + "includers": [ + "ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_ApproxArcsSegments.hxx" + ] + }, + { + "file": "Visualization/TKService/Graphic3d/Graphic3d_MapOfAspectsToAspects.hxx", + "typedefs": [ + { + "name": "Graphic3d_MapOfAspectsToAspects", + "replacement": "NCollection_DataMap, occ::handle>", + "content": "typedef NCollection_DataMap, occ::handle>\n Graphic3d_MapOfAspectsToAspects;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Graphic3d_Aspects;" + ], + "includers": [ + "Visualization/TKService/Graphic3d/Graphic3d_Group.hxx" + ] + }, + { + "file": "Visualization/TKService/Graphic3d/Graphic3d_MapOfStructure.hxx", + "typedefs": [ + { + "name": "Graphic3d_MapOfStructure", + "replacement": "NCollection_Map>", + "content": "typedef NCollection_Map> Graphic3d_MapOfStructure;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Graphic3d_Structure;" + ], + "includers": [ + "Visualization/TKService/Graphic3d/Graphic3d_CView.cxx", + "Visualization/TKService/Graphic3d/Graphic3d_Structure.cxx", + "Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx", + "Visualization/TKService/Graphic3d/Graphic3d_StructureManager.cxx", + "Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx", + "Visualization/TKV3d/V3d/V3d_View.cxx" + ] + }, + { + "file": "Visualization/TKV3d/PrsMgr/PrsMgr_Presentations.hxx", + "typedefs": [ + { + "name": "PrsMgr_Presentations", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence> PrsMgr_Presentations;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class PrsMgr_Presentation;" + ], + "includers": [ + "Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx", + "Visualization/TKV3d/PrsMgr/PrsMgr_PresentationManager.cxx" + ] + }, + { + "file": "Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx", + "typedefs": [ + { + "name": "Select3D_EntitySequence", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence> Select3D_EntitySequence;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Select3D_SensitiveEntity;" + ], + "includers": [ + "Visualization/TKV3d/Select3D/Select3D_SensitiveGroup.hxx", + "Visualization/TKV3d/StdSelect/StdSelect_BRepSelectionTool.hxx" + ] + }, + { + "file": "Visualization/TKV3d/Select3D/Select3D_IndexedMapOfEntity.hxx", + "typedefs": [ + { + "name": "Select3D_IndexedMapOfEntity", + "replacement": "NCollection_IndexedMap>", + "content": "typedef NCollection_IndexedMap> Select3D_IndexedMapOfEntity;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class Select3D_SensitiveEntity;" + ], + "includers": [ + "Visualization/TKV3d/Select3D/Select3D_SensitiveGroup.hxx" + ] + }, + { + "file": "Visualization/TKV3d/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx", + "typedefs": [ + { + "name": "SelectMgr_IndexedMapOfOwner", + "replacement": "NCollection_Shared>>", + "content": "typedef NCollection_Shared>>\n SelectMgr_IndexedMapOfOwner;" + } + ], + "includes": [ + "#include ", + "#include " + ], + "forward_decls": [ + "class SelectMgr_EntityOwner;" + ], + "includers": [ + "Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx", + "Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.cxx", + "Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.hxx" + ] + }, + { + "file": "Visualization/TKV3d/SelectMgr/SelectMgr_SequenceOfOwner.hxx", + "typedefs": [ + { + "name": "SelectMgr_SequenceOfOwner", + "replacement": "NCollection_Sequence>", + "content": "typedef NCollection_Sequence> SelectMgr_SequenceOfOwner;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class SelectMgr_EntityOwner;" + ], + "includers": [ + "Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx", + "Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.hxx", + "Visualization/TKV3d/AIS/AIS_Manipulator.cxx", + "Visualization/TKV3d/AIS/AIS_ViewCube.cxx", + "Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.hxx" + ] + }, + { + "file": "Visualization/TKV3d/V3d/V3d_ListOfView.hxx", + "typedefs": [ + { + "name": "V3d_ListOfView", + "replacement": "NCollection_List>", + "content": "typedef NCollection_List> V3d_ListOfView;" + } + ], + "includes": [ + "#include " + ], + "forward_decls": [ + "class V3d_View;" + ], + "includers": [ + "Visualization/TKV3d/V3d/V3d_Viewer.hxx" + ] + } ], - "errors": [], - "dry_run": false + "files_to_modify": [ + { + "file": "FoundationClasses/TKMath/gp/gp_TrsfNLerp.hxx", + "typedefs": [ + { + "name": "gp_TrsfNLerp", + "replacement": "NCollection_Lerp", + "start_line": 89, + "end_line": 89, + "content": "typedef NCollection_Lerp gp_TrsfNLerp;" + } + ] + }, + { + "file": "ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx", + "typedefs": [ + { + "name": "ShapeAnalysis_BoxBndTree", + "replacement": "NCollection_UBTree", + "start_line": 33, + "end_line": 33, + "content": "typedef NCollection_UBTree ShapeAnalysis_BoxBndTree;" + } + ] + }, + { + "file": "ModelingAlgorithms/TKTopAlgo/BRepClass3d/BRepClass3d_BndBoxTree.hxx", + "typedefs": [ + { + "name": "BRepClass3d_BndBoxTree", + "replacement": "NCollection_UBTree", + "start_line": 31, + "end_line": 31, + "content": "typedef NCollection_UBTree BRepClass3d_BndBoxTree;" + } + ] + }, + { + "file": "Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx", + "typedefs": [ + { + "name": "PrsMgr_ListOfPresentableObjects", + "replacement": "NCollection_List>", + "start_line": 24, + "end_line": 24, + "content": "typedef NCollection_List> PrsMgr_ListOfPresentableObjects;" + } + ] + } + ], + "errors": [] } \ No newline at end of file diff --git a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.hxx b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.hxx index 245e44e1e4..0336a578b1 100644 --- a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.hxx +++ b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.hxx @@ -25,7 +25,9 @@ #include #include #include -#include +#include + +class TDF_Attribute; class Standard_GUID; class TDF_Label; class TNaming_NamedShape; diff --git a/src/ApplicationFramework/TKCDF/CDF/CDF_FWOSDriver.hxx b/src/ApplicationFramework/TKCDF/CDF/CDF_FWOSDriver.hxx index 338ef33adf..13eabf23e6 100644 --- a/src/ApplicationFramework/TKCDF/CDF/CDF_FWOSDriver.hxx +++ b/src/ApplicationFramework/TKCDF/CDF/CDF_FWOSDriver.hxx @@ -20,7 +20,8 @@ #include #include -#include +#include +#include class TCollection_ExtendedString; class CDM_MetaData; diff --git a/src/ApplicationFramework/TKCDF/CDM/CDM_Application.hxx b/src/ApplicationFramework/TKCDF/CDM/CDM_Application.hxx index 14fe1011ec..5d5889a59a 100644 --- a/src/ApplicationFramework/TKCDF/CDM/CDM_Application.hxx +++ b/src/ApplicationFramework/TKCDF/CDM/CDM_Application.hxx @@ -21,7 +21,8 @@ #include #include -#include +#include +#include #include class CDM_MetaData; diff --git a/src/ApplicationFramework/TKCDF/CDM/CDM_Document.cxx b/src/ApplicationFramework/TKCDF/CDM/CDM_Document.cxx index 537636dbd6..a02c940e15 100644 --- a/src/ApplicationFramework/TKCDF/CDM/CDM_Document.cxx +++ b/src/ApplicationFramework/TKCDF/CDM/CDM_Document.cxx @@ -17,7 +17,6 @@ // Modified by rmi, Tue Nov 18 08:17:41 1997 #include -#include #include #include #include @@ -33,6 +32,7 @@ #include #include #include +class CDM_MetaData; IMPLEMENT_STANDARD_RTTIEXT(CDM_Document, Standard_Transient) diff --git a/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.cxx b/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.cxx index be00688d3c..3637d9d424 100644 --- a/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.cxx +++ b/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.cxx @@ -17,13 +17,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include +class CDM_MetaData; IMPLEMENT_STANDARD_RTTIEXT(CDM_MetaData, Standard_Transient) diff --git a/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.hxx b/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.hxx index 4289260cb5..28fcdba816 100644 --- a/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.hxx +++ b/src/ApplicationFramework/TKCDF/CDM/CDM_MetaData.hxx @@ -27,7 +27,8 @@ #include #include #include -#include +#include +class CDM_MetaData; class CDM_MetaData : public Standard_Transient { diff --git a/src/ApplicationFramework/TKCDF/CDM/CDM_MetaDataLookUpTable.hxx b/src/ApplicationFramework/TKCDF/CDM/CDM_MetaDataLookUpTable.hxx deleted file mode 100644 index 0a587c2029..0000000000 --- a/src/ApplicationFramework/TKCDF/CDM/CDM_MetaDataLookUpTable.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 1997-05-06 -// Created by: Jean-Louis Frenkel, Remi Lequette -// Copyright (c) 1997-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 CDM_MetaDataLookUpTable_HeaderFile -#define CDM_MetaDataLookUpTable_HeaderFile - -#include -#include -class CDM_MetaData; - -typedef NCollection_DataMap> - CDM_MetaDataLookUpTable; - -#endif diff --git a/src/ApplicationFramework/TKCDF/CDM/FILES.cmake b/src/ApplicationFramework/TKCDF/CDM/FILES.cmake index 834de8b1f3..9b4a766b5a 100644 --- a/src/ApplicationFramework/TKCDF/CDM/FILES.cmake +++ b/src/ApplicationFramework/TKCDF/CDM/FILES.cmake @@ -12,7 +12,6 @@ set(OCCT_CDM_FILES CDM_MetaData.cxx CDM_MetaData.hxx - CDM_MetaDataLookUpTable.hxx CDM_Reference.cxx CDM_Reference.hxx diff --git a/src/ApplicationFramework/TKCDF/PCDM/PCDM_ReferenceIterator.hxx b/src/ApplicationFramework/TKCDF/PCDM/PCDM_ReferenceIterator.hxx index 0b16d2473e..f462dd8ab0 100644 --- a/src/ApplicationFramework/TKCDF/PCDM/PCDM_ReferenceIterator.hxx +++ b/src/ApplicationFramework/TKCDF/PCDM/PCDM_ReferenceIterator.hxx @@ -22,7 +22,8 @@ #include #include -#include +#include +#include class Message_Messenger; class CDM_Document; diff --git a/src/ApplicationFramework/TKLCAF/TDF/FILES.cmake b/src/ApplicationFramework/TKLCAF/TDF/FILES.cmake index d0aeb40cd8..d79513717d 100644 --- a/src/ApplicationFramework/TKLCAF/TDF/FILES.cmake +++ b/src/ApplicationFramework/TKLCAF/TDF/FILES.cmake @@ -11,7 +11,6 @@ set(OCCT_TDF_FILES TDF_AttributeDelta.cxx TDF_AttributeDelta.hxx - TDF_AttributeIndexedMap.hxx TDF_AttributeIterator.cxx TDF_AttributeIterator.hxx diff --git a/src/ApplicationFramework/TKLCAF/TDF/TDF_Attribute.hxx b/src/ApplicationFramework/TKLCAF/TDF/TDF_Attribute.hxx index d9edceb904..d89fe42c13 100644 --- a/src/ApplicationFramework/TKLCAF/TDF/TDF_Attribute.hxx +++ b/src/ApplicationFramework/TKLCAF/TDF/TDF_Attribute.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include class TDF_Label; class TDF_DeltaOnForget; class Standard_GUID; diff --git a/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeIndexedMap.hxx b/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeIndexedMap.hxx deleted file mode 100644 index 75b2c96334..0000000000 --- a/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeIndexedMap.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created by: DAUTRY Philippe -// Copyright (c) 1997-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 TDF_AttributeIndexedMap_HeaderFile -#define TDF_AttributeIndexedMap_HeaderFile - -#include - -class TDF_Attribute; -typedef NCollection_IndexedMap> TDF_AttributeIndexedMap; - -#endif diff --git a/src/ApplicationFramework/TKLCAF/TDF/TDF_Label.hxx b/src/ApplicationFramework/TKLCAF/TDF/TDF_Label.hxx index 9705018830..361926c235 100644 --- a/src/ApplicationFramework/TKLCAF/TDF/TDF_Label.hxx +++ b/src/ApplicationFramework/TKLCAF/TDF/TDF_Label.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include class TDF_Attribute; class TDF_Data; class Standard_GUID; diff --git a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_BRep.hxx b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_BRep.hxx index b2fb266267..339cc1f276 100644 --- a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_BRep.hxx +++ b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_BRep.hxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include @@ -27,6 +27,8 @@ #include #include +class Standard_Transient; +class StdObjMgt_Persistent; class BRep_PointRepresentation; class BRep_CurveRepresentation; diff --git a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom.hxx b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom.hxx index a5acc47eef..0792821de4 100644 --- a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom.hxx +++ b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom.hxx @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -31,6 +31,8 @@ #include #include #include +class Standard_Transient; +class StdObjMgt_Persistent; class ShapePersistent_Geom : public StdObjMgt_SharedObject { diff --git a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom_Curve.hxx b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom_Curve.hxx index a0f58b72a0..37ff7f838f 100644 --- a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom_Curve.hxx +++ b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Geom_Curve.hxx @@ -14,7 +14,7 @@ #ifndef _ShapePersistent_Geom_Curve_HeaderFile #define _ShapePersistent_Geom_Curve_HeaderFile -#include +#include #include #include @@ -34,6 +34,8 @@ #include #include #include +class Standard_Transient; +class StdObjMgt_Persistent; class ShapePersistent_Geom_Curve : private ShapePersistent_Geom { diff --git a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Poly.hxx b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Poly.hxx index 9b997a20fd..feb77c44eb 100644 --- a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Poly.hxx +++ b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_Poly.hxx @@ -15,8 +15,10 @@ #define _ShapePersistent_Poly_HeaderFile #include -#include +#include #include +class Standard_Transient; +class StdObjMgt_Persistent; class Poly_Polygon2D; class Poly_Polygon3D; diff --git a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_TopoDS.hxx b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_TopoDS.hxx index 3f9238b9dc..902d07ea29 100644 --- a/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_TopoDS.hxx +++ b/src/ApplicationFramework/TKStd/ShapePersistent/ShapePersistent_TopoDS.hxx @@ -19,13 +19,15 @@ #include #include #include -#include +#include #include #include #include #include #include +class Standard_Transient; +class StdObjMgt_Persistent; class ShapePersistent_TopoDS : public StdPersistent_TopoDS { diff --git a/src/ApplicationFramework/TKStd/StdObject/StdObject_Location.hxx b/src/ApplicationFramework/TKStd/StdObject/StdObject_Location.hxx index e3a1c89683..f457e6932b 100644 --- a/src/ApplicationFramework/TKStd/StdObject/StdObject_Location.hxx +++ b/src/ApplicationFramework/TKStd/StdObject/StdObject_Location.hxx @@ -17,9 +17,11 @@ #include #include #include -#include +#include #include +class Standard_Transient; +class StdObjMgt_Persistent; class StdObject_Location { diff --git a/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_TopLoc.hxx b/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_TopLoc.hxx index b7efc23e67..ee2962695a 100644 --- a/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_TopLoc.hxx +++ b/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_TopLoc.hxx @@ -17,10 +17,12 @@ #include #include #include -#include +#include #include #include +class Standard_Transient; +class StdObjMgt_Persistent; class StdPersistent_TopLoc { diff --git a/src/ApplicationFramework/TKStdL/StdObjMgt/FILES.cmake b/src/ApplicationFramework/TKStdL/StdObjMgt/FILES.cmake index 68f6e78858..5256ac1d38 100644 --- a/src/ApplicationFramework/TKStdL/StdObjMgt/FILES.cmake +++ b/src/ApplicationFramework/TKStdL/StdObjMgt/FILES.cmake @@ -11,5 +11,4 @@ set(OCCT_StdObjMgt_FILES StdObjMgt_WriteData.hxx StdObjMgt_WriteData.cxx StdObjMgt_SharedObject.hxx - StdObjMgt_TransientPersistentMap.hxx ) diff --git a/src/ApplicationFramework/TKStdL/StdObjMgt/StdObjMgt_TransientPersistentMap.hxx b/src/ApplicationFramework/TKStdL/StdObjMgt/StdObjMgt_TransientPersistentMap.hxx deleted file mode 100644 index d2257eb62d..0000000000 --- a/src/ApplicationFramework/TKStdL/StdObjMgt/StdObjMgt_TransientPersistentMap.hxx +++ /dev/null @@ -1,25 +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 _StdObjMgt_TransientPersistentMap_HeaderFile -#define _StdObjMgt_TransientPersistentMap_HeaderFile - -#include - -class Standard_Transient; -class StdObjMgt_Persistent; - -typedef NCollection_DataMap, occ::handle> - StdObjMgt_TransientPersistentMap; - -#endif // _StdObjMgt_TransientPersistentMap_HeaderFile diff --git a/src/ApplicationFramework/TKTObj/TObj/FILES.cmake b/src/ApplicationFramework/TKTObj/TObj/FILES.cmake index fc6d2008db..e2a370328c 100644 --- a/src/ApplicationFramework/TKTObj/TObj/FILES.cmake +++ b/src/ApplicationFramework/TKTObj/TObj/FILES.cmake @@ -33,7 +33,6 @@ set(OCCT_TObj_FILES TObj_SequenceIterator.cxx TObj_SequenceIterator.hxx - TObj_SequenceOfObject.hxx TObj_TIntSparseArray.cxx TObj_TIntSparseArray.hxx TObj_TModel.cxx diff --git a/src/ApplicationFramework/TKTObj/TObj/TObj_Object.hxx b/src/ApplicationFramework/TKTObj/TObj/TObj_Object.hxx index 81f9573522..bd0c8ce7bc 100644 --- a/src/ApplicationFramework/TKTObj/TObj/TObj_Object.hxx +++ b/src/ApplicationFramework/TKTObj/TObj/TObj_Object.hxx @@ -19,7 +19,8 @@ #define TObj_Object_HeaderFile #include -#include +#include +#include #include #include @@ -35,6 +36,7 @@ class TCollection_HAsciiString; #include #include #include +class TObj_Object; //! Basis class for transient objects in OCAF-based models diff --git a/src/ApplicationFramework/TKTObj/TObj/TObj_Persistence.hxx b/src/ApplicationFramework/TKTObj/TObj/TObj_Persistence.hxx index 6305b7e3bd..e456677125 100644 --- a/src/ApplicationFramework/TKTObj/TObj/TObj_Persistence.hxx +++ b/src/ApplicationFramework/TKTObj/TObj/TObj_Persistence.hxx @@ -22,7 +22,9 @@ #include #include #include -#include +#include +#include +class TObj_Object; class TDF_Label; diff --git a/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceIterator.hxx b/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceIterator.hxx index cd6182b86e..c184e8b69a 100644 --- a/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceIterator.hxx +++ b/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceIterator.hxx @@ -22,8 +22,10 @@ #include #include #include -#include +#include +#include #include +class TObj_Object; /** * This class is an iterator on sequence diff --git a/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx b/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx deleted file mode 100644 index 88efb03ce4..0000000000 --- a/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 2004-11-22 -// Created by: Pavel TELKOV -// Copyright (c) 2004-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. - -// The original implementation Copyright: (C) RINA S.p.A - -#ifndef TObj_SequenceOfObject_HeaderFile -#define TObj_SequenceOfObject_HeaderFile - -#include -#include - -class TObj_Object; -typedef NCollection_Sequence> TObj_SequenceOfObject; -#endif diff --git a/src/ApplicationFramework/TKTObj/TObj/TObj_TNameContainer.hxx b/src/ApplicationFramework/TKTObj/TObj/TObj_TNameContainer.hxx index 060bfc35d8..7343151f33 100644 --- a/src/ApplicationFramework/TKTObj/TObj/TObj_TNameContainer.hxx +++ b/src/ApplicationFramework/TKTObj/TObj/TObj_TNameContainer.hxx @@ -22,8 +22,10 @@ #include #include #include -#include +#include +#include #include +class TObj_Object; /** * This class provides OCAF Attribute to storing the unique names of object in diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/FILES.cmake b/src/DataExchange/TKXCAF/XCAFDimTolObjects/FILES.cmake index e4eafe7225..a766fca8c8 100644 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/FILES.cmake +++ b/src/DataExchange/TKXCAF/XCAFDimTolObjects/FILES.cmake @@ -25,9 +25,6 @@ set(OCCT_XCAFDimTolObjects_FILES XCAFDimTolObjects_GeomToleranceMatReqModif.hxx XCAFDimTolObjects_GeomToleranceZoneModif.hxx - XCAFDimTolObjects_DatumObjectSequence.hxx - XCAFDimTolObjects_DimensionObjectSequence.hxx - XCAFDimTolObjects_GeomToleranceObjectSequence.hxx XCAFDimTolObjects_ToleranceZoneAffectedPlane.hxx XCAFDimTolObjects_AngularQualifier.hxx diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx index 404edd0208..28c1f9195d 100644 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx +++ b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx @@ -18,7 +18,6 @@ #include -#include #include #include #include @@ -28,6 +27,7 @@ #include #include #include +class XCAFDimTolObjects_DatumObject; //! Access object to store datum class XCAFDimTolObjects_DatumObject : public Standard_Transient diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObjectSequence.hxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObjectSequence.hxx deleted file mode 100644 index 5b48ffc9ca..0000000000 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DatumObjectSequence.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 2015-08-06 -// Created by: Ilya Novikov -// Copyright (c) 2004-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 XCAFDimTolObjects_DatumObjectSequence_HeaderFile -#define XCAFDimTolObjects_DatumObjectSequence_HeaderFile - -#include - -class XCAFDimTolObjects_DatumObject; -typedef NCollection_Sequence> - XCAFDimTolObjects_DatumObjectSequence; - -#endif diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx index cf14ff29c2..c48c9e4cb4 100644 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx +++ b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +class XCAFDimTolObjects_DimensionObject; //! Access object to store dimension data class XCAFDimTolObjects_DimensionObject : public Standard_Transient diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObjectSequence.hxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObjectSequence.hxx deleted file mode 100644 index 699e2c4822..0000000000 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObjectSequence.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 2015-08-06 -// Created by: Ilya Novikov -// Copyright (c) 2004-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 XCAFDimTolObjects_DimensionObjectSequence_HeaderFile -#define XCAFDimTolObjects_DimensionObjectSequence_HeaderFile - -#include - -class XCAFDimTolObjects_DimensionObject; -typedef NCollection_Sequence> - XCAFDimTolObjects_DimensionObjectSequence; - -#endif diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObjectSequence.hxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObjectSequence.hxx deleted file mode 100644 index 3f20270216..0000000000 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObjectSequence.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 2015-08-06 -// Created by: Ilya Novikov -// Copyright (c) 2004-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 XCAFDimTolObjects_GeomToleranceObjectSequence_HeaderFile -#define XCAFDimTolObjects_GeomToleranceObjectSequence_HeaderFile - -#include - -class XCAFDimTolObjects_GeomToleranceObject; -typedef NCollection_Sequence> - XCAFDimTolObjects_GeomToleranceObjectSequence; - -#endif diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx index 5b846a6954..7feda9b4be 100644 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx +++ b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.cxx @@ -12,13 +12,10 @@ // commercial license or contractual agreement. #include -#include #include #include #include -#include #include -#include #include #include #include @@ -28,6 +25,10 @@ #include #include #include +class XCAFDimTolObjects_GeomToleranceObject; + +class XCAFDimTolObjects_DimensionObject; +class XCAFDimTolObjects_DatumObject; //================================================================================================= diff --git a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx index 1f6dcfd83c..016d38bff2 100644 --- a/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx +++ b/src/DataExchange/TKXCAF/XCAFDimTolObjects/XCAFDimTolObjects_Tool.hxx @@ -22,12 +22,15 @@ #include #include #include -#include -#include -#include +#include #include #include #include + +class XCAFDimTolObjects_GeomToleranceObject; +class XCAFDimTolObjects_DimensionObject; + +class XCAFDimTolObjects_DatumObject; class TDocStd_Document; class TopoDS_Shape; diff --git a/src/DataExchange/TKXCAF/XCAFDoc/FILES.cmake b/src/DataExchange/TKXCAF/XCAFDoc/FILES.cmake index b183d65517..97bd7491b8 100644 --- a/src/DataExchange/TKXCAF/XCAFDoc/FILES.cmake +++ b/src/DataExchange/TKXCAF/XCAFDoc/FILES.cmake @@ -44,7 +44,6 @@ set(OCCT_XCAFDoc_FILES XCAFDoc_Editor.hxx XCAFDoc_GraphNode.cxx XCAFDoc_GraphNode.hxx - XCAFDoc_GraphNodeSequence.hxx XCAFDoc_LayerTool.cxx XCAFDoc_LayerTool.hxx XCAFDoc_LengthUnit.cxx diff --git a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNode.hxx b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNode.hxx index f7c767e6fc..f1db3aa9c7 100644 --- a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNode.hxx +++ b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNode.hxx @@ -18,11 +18,13 @@ #include -#include +#include #include #include #include #include + +class XCAFDoc_GraphNode; class TDF_Label; class TDF_RelocationTable; class TDF_DataSet; diff --git a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx deleted file mode 100644 index d6edbfe8fe..0000000000 --- a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_GraphNodeSequence.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2000-08-08 -// Created by: data exchange team -// Copyright (c) 2000-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 XCAFDoc_GraphNodeSequence_HeaderFile -#define XCAFDoc_GraphNodeSequence_HeaderFile - -#include - -class XCAFDoc_GraphNode; -typedef NCollection_Sequence> XCAFDoc_GraphNodeSequence; - -#endif diff --git a/src/DataExchange/TKXSBase/MoniTool/FILES.cmake b/src/DataExchange/TKXSBase/MoniTool/FILES.cmake index 36aef85fea..5e2628e5a2 100644 --- a/src/DataExchange/TKXSBase/MoniTool/FILES.cmake +++ b/src/DataExchange/TKXSBase/MoniTool/FILES.cmake @@ -9,7 +9,6 @@ set(OCCT_MoniTool_FILES MoniTool_DataInfo.cxx MoniTool_DataInfo.hxx - MoniTool_DataMapOfTimer.hxx MoniTool_Element.cxx MoniTool_Element.hxx diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_DataMapOfTimer.hxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_DataMapOfTimer.hxx deleted file mode 100644 index a4ef85aaba..0000000000 --- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_DataMapOfTimer.hxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 1998-04-01 -// Created by: Christian CAILLET -// Copyright (c) 1998-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 MoniTool_DataMapOfTimer_HeaderFile -#define MoniTool_DataMapOfTimer_HeaderFile - -#include -#include -#include - -class MoniTool_Timer; -typedef NCollection_DataMap, Standard_CStringHasher> - MoniTool_DataMapOfTimer; - -#endif diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.cxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.cxx index 1ed30b868f..6b45627f14 100644 --- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.cxx +++ b/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.cxx @@ -11,13 +11,17 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include +#include +#include #include #include #include #include #include + +class MoniTool_Timer; IMPLEMENT_STANDARD_RTTIEXT(MoniTool_Timer, Standard_Transient) //================================================================================================= diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.hxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.hxx index 2e873be67e..af536b588c 100644 --- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.hxx +++ b/src/DataExchange/TKXSBase/MoniTool/MoniTool_Timer.hxx @@ -24,7 +24,8 @@ #include #include #include -#include +#include +#include //! Provides convenient service on global timers //! accessed by string name, mostly aimed for debugging purposes @@ -122,5 +123,6 @@ private: }; #include +class MoniTool_Timer; #endif // _MoniTool_Timer_HeaderFile diff --git a/src/Draw/TKDCAF/DDF/DDF_Browser.hxx b/src/Draw/TKDCAF/DDF/DDF_Browser.hxx index 3afe9f4ddb..21893134c0 100644 --- a/src/Draw/TKDCAF/DDF/DDF_Browser.hxx +++ b/src/Draw/TKDCAF/DDF/DDF_Browser.hxx @@ -19,11 +19,13 @@ #include #include -#include +#include #include #include #include #include + +class TDF_Attribute; class TDF_Data; class Draw_Display; class TCollection_AsciiString; diff --git a/src/Draw/TKQADraw/QABugs/QABugs_1.cxx b/src/Draw/TKQADraw/QABugs/QABugs_1.cxx index 7a10668781..40db83d769 100644 --- a/src/Draw/TKQADraw/QABugs/QABugs_1.cxx +++ b/src/Draw/TKQADraw/QABugs/QABugs_1.cxx @@ -21,7 +21,9 @@ #include #include -#include +#include +#include +#include #include #include @@ -381,6 +383,7 @@ static int OCC74bug_get(Draw_Interpretor& di, int argc, const char** argv) #include #include #include +class AIS_InteractiveObject; //======================================================================= // function : OCC30182 diff --git a/src/Draw/TKQADraw/QABugs/QABugs_11.cxx b/src/Draw/TKQADraw/QABugs/QABugs_11.cxx index 93f6ccb47b..82940b4327 100644 --- a/src/Draw/TKQADraw/QABugs/QABugs_11.cxx +++ b/src/Draw/TKQADraw/QABugs/QABugs_11.cxx @@ -73,7 +73,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -4649,6 +4650,7 @@ int OCC22301(Draw_Interpretor& di, int argc, const char** argv) } #include +class AIS_InteractiveObject; int OCC22744(Draw_Interpretor& di, int argc, const char** argv) { diff --git a/src/Draw/TKQADraw/QABugs/QABugs_16.cxx b/src/Draw/TKQADraw/QABugs/QABugs_16.cxx index ff0897e323..a9b3dcd5fd 100644 --- a/src/Draw/TKQADraw/QABugs/QABugs_16.cxx +++ b/src/Draw/TKQADraw/QABugs/QABugs_16.cxx @@ -40,7 +40,9 @@ #include #include #include -#include +#include +#include +#include #include #include @@ -657,6 +659,7 @@ static int OCC710(Draw_Interpretor& di, int argc, const char** argv) #include #include +class AIS_InteractiveObject; static int OCC904(Draw_Interpretor& di, int argc, const char** argv) { diff --git a/src/Draw/TKViewerTest/ViewerTest/FILES.cmake b/src/Draw/TKViewerTest/ViewerTest/FILES.cmake index 0ada73757e..4a293d9008 100644 --- a/src/Draw/TKViewerTest/ViewerTest/FILES.cmake +++ b/src/Draw/TKViewerTest/ViewerTest/FILES.cmake @@ -11,7 +11,6 @@ set(OCCT_ViewerTest_FILES ViewerTest_ContinuousRedrawer.cxx ViewerTest_ContinuousRedrawer.hxx - ViewerTest_DoubleMapOfInteractiveAndName.hxx ViewerTest_EventManager.cxx ViewerTest_EventManager.hxx ViewerTest_FilletCommands.cxx diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest.cxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest.cxx index 439a0437d2..9e9e17bc67 100644 --- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest.cxx +++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest.cxx @@ -492,7 +492,7 @@ static void GetTypeAndSignfromString(const char* theName, #include #include #include -#include +#include #include #include @@ -501,6 +501,7 @@ static void GetTypeAndSignfromString(const char* theName, #include #include +class AIS_InteractiveObject; //============================================================================== // VIEWER OBJECT MANAGEMENT GLOBAL VARIABLES diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_DoubleMapOfInteractiveAndName.hxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_DoubleMapOfInteractiveAndName.hxx deleted file mode 100644 index c3521def6c..0000000000 --- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_DoubleMapOfInteractiveAndName.hxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 1997-07-23 -// Created by: Henri JEANNIN -// Copyright (c) 1997-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 ViewerTest_DoubleMapOfInteractiveAndName_HeaderFile -#define ViewerTest_DoubleMapOfInteractiveAndName_HeaderFile - -#include -#include -#include - -class AIS_InteractiveObject; -typedef NCollection_DoubleMap, TCollection_AsciiString> - ViewerTest_DoubleMapOfInteractiveAndName; - -#endif diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx index 9bdf17deec..bb9522a481 100644 --- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -44,7 +44,8 @@ #include #include #include -#include +#include +#include #include #include @@ -2724,6 +2725,7 @@ static int VDrawText(Draw_Interpretor& theDI, int theArgsNb, const char** theArg #include #include +class AIS_InteractiveObject; //=============================================================================================== // function : CalculationOfSphere diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_OpenGlCommands.cxx index 70b33dfa34..6fd3496b09 100644 --- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_OpenGlCommands.cxx +++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_OpenGlCommands.cxx @@ -25,7 +25,10 @@ #include #include -#include +#include +#include +#include +class AIS_InteractiveObject; extern NCollection_DoubleMap, TCollection_AsciiString>& GetMapOfAIS(); diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_RelationCommands.cxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_RelationCommands.cxx index 2974c52c2a..c9e2b4f4cb 100644 --- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_RelationCommands.cxx +++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_RelationCommands.cxx @@ -73,7 +73,9 @@ #include #include #include -#include +#include +#include +class AIS_InteractiveObject; extern bool VDisplayAISObject(const TCollection_AsciiString& theName, const occ::handle& theAISObj, diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ViewerCommands.cxx index de693aacab..194030b0d9 100644 --- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -80,7 +80,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -107,6 +108,8 @@ #include #else #include + +class AIS_InteractiveObject; #endif //============================================================================== diff --git a/src/FoundationClasses/TKMath/gp/gp_TrsfNLerp.hxx b/src/FoundationClasses/TKMath/gp/gp_TrsfNLerp.hxx index 89e298f5b6..8824211f86 100644 --- a/src/FoundationClasses/TKMath/gp/gp_TrsfNLerp.hxx +++ b/src/FoundationClasses/TKMath/gp/gp_TrsfNLerp.hxx @@ -86,6 +86,4 @@ private: gp_Trsf myTrsfEnd; }; -typedef NCollection_Lerp gp_TrsfNLerp; - #endif // _gp_TrsfNLerp_HeaderFile diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Builder_1.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Builder_1.cxx index 3a75fd62f1..7e34e56b0c 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Builder_1.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Builder_1.cxx @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -33,6 +33,7 @@ #include #include #include +class BOPDS_PaveBlock; //================================================================================================= diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller.hxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller.hxx index 9507597727..d082da2148 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller.hxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller.hxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_10.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_10.cxx index 9ced90016f..62f54ebe22 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_10.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_10.cxx @@ -31,8 +31,10 @@ #include #include -#include +#include +#include #include +class BOPDS_PaveBlock; //================================================================================================= diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_6.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_6.cxx index 7964e03411..6bd2f2e8d5 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_6.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_6.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -75,6 +75,7 @@ #include #include #include +class BOPDS_PaveBlock; static double ToleranceFF(const BRepAdaptor_Surface& aBAS1, const BRepAdaptor_Surface& aBAS2); diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_7.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_7.cxx index fa81245121..03317fb6ee 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_7.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_7.cxx @@ -24,7 +24,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -56,6 +57,7 @@ #include #include #include +class BOPDS_PaveBlock; static bool IsBasedOnPlane(const TopoDS_Face& aF); diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_9.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_9.cxx index a919a8b866..85dff9a7dc 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_9.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_PaveFiller_9.cxx @@ -15,7 +15,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +class BOPDS_PaveBlock; // //================================================================================================= diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Section.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Section.cxx index b842c05c94..686281e264 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Section.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Section.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -31,6 +31,7 @@ #include #include #include +class BOPDS_PaveBlock; //================================================================================================= diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.cxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.cxx index ce01334595..766df6930a 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.cxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.cxx @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,6 +58,7 @@ #include #include +class BOPDS_PaveBlock; typedef NCollection_IndexedDataMap BOPAlgo_IndexedDataMapOfShapeDir; diff --git a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.hxx b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.hxx index 2444f4d7f7..6b6079470a 100644 --- a/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.hxx +++ b/src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_Tools.hxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_CommonBlock.hxx b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_CommonBlock.hxx index 9de76b6c55..f4ea79b896 100644 --- a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_CommonBlock.hxx +++ b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_CommonBlock.hxx @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_Curve.hxx b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_Curve.hxx index 3bcd68edae..cae252af07 100644 --- a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_Curve.hxx +++ b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_Curve.hxx @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_DS.hxx b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_DS.hxx index 0225b021d9..531e9f9114 100644 --- a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_DS.hxx +++ b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_DS.hxx @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx deleted file mode 100644 index c3e838c0b8..0000000000 --- a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_ListOfPaveBlock.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created by: Peter KURNEV -// 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 BOPDS_ListOfPaveBlock_HeaderFile -#define BOPDS_ListOfPaveBlock_HeaderFile - -#include -#include - -class BOPDS_PaveBlock; - -typedef NCollection_List> BOPDS_ListOfPaveBlock; - -#endif diff --git a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_PaveBlock.hxx b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_PaveBlock.hxx index a3839aa9e4..9d453556c8 100644 --- a/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_PaveBlock.hxx +++ b/src/ModelingAlgorithms/TKBO/BOPDS/BOPDS_PaveBlock.hxx @@ -20,11 +20,12 @@ #include #include #include -#include +#include #include #include #include #include +class BOPDS_PaveBlock; //! The class BOPDS_PaveBlock is to store //! the information about pave block on an edge. diff --git a/src/ModelingAlgorithms/TKBO/BOPDS/FILES.cmake b/src/ModelingAlgorithms/TKBO/BOPDS/FILES.cmake index f487474193..82e454fca1 100644 --- a/src/ModelingAlgorithms/TKBO/BOPDS/FILES.cmake +++ b/src/ModelingAlgorithms/TKBO/BOPDS/FILES.cmake @@ -23,7 +23,6 @@ set(OCCT_BOPDS_FILES BOPDS_IteratorSI.cxx BOPDS_IteratorSI.hxx - BOPDS_ListOfPaveBlock.hxx BOPDS_Pave.cxx BOPDS_Pave.hxx diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Absolute.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Absolute.hxx index bdee6ca3a0..00f7e6a22b 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Absolute.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Absolute.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcCosine.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcCosine.hxx index 1dcfd1374d..9682b03fe3 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcCosine.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcCosine.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcSine.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcSine.hxx index ad4b84af80..fb5041c34d 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcSine.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcSine.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcTangent.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcTangent.hxx index c22e6f6124..465a766947 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcTangent.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcTangent.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgCosh.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgCosh.hxx index d8389bf24f..cf13d8e794 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgCosh.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgCosh.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgSinh.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgSinh.hxx index 1146a72e8e..45fffd8c26 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgSinh.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgSinh.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgTanh.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgTanh.hxx index e2cd62eff5..290b577745 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgTanh.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgTanh.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Array1OfNamedUnknown.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Array1OfNamedUnknown.hxx deleted file mode 100644 index df4b401ee1..0000000000 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Array1OfNamedUnknown.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 1991-01-14 -// Created by: Arnaud BOUZY -// Copyright (c) 1991-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 Expr_Array1OfNamedUnknown_HeaderFile -#define Expr_Array1OfNamedUnknown_HeaderFile - -#include - -class Expr_NamedUnknown; -typedef NCollection_Array1> Expr_Array1OfNamedUnknown; - -#endif diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.cxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.cxx index fc86845ebe..b7ccd25f03 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.cxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include #include #include +class Expr_NamedUnknown; IMPLEMENT_STANDARD_RTTIEXT(Expr_BinaryFunction, Expr_BinaryExpression) diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.hxx index 06cc588a66..8c5a223057 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_BinaryFunction.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralFunction; class Expr_GeneralExpression; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosh.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosh.hxx index a494cec388..8f2397a49d 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosh.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosh.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosine.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosine.hxx index 1922d214df..3a4bb92658 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosine.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosine.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Difference.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Difference.hxx index 14cb6186c4..99eb8842ad 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Difference.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Difference.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Division.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Division.hxx index 82dda800b1..11fa83a6ab 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Division.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Division.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponential.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponential.hxx index 20e035d458..bd01841ac3 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponential.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponential.hxx @@ -20,7 +20,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponentiate.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponentiate.hxx index a502069263..e23bca7d70 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponentiate.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponentiate.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_FunctionDerivative.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_FunctionDerivative.hxx index fe7d93a3ce..696a51c6fa 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_FunctionDerivative.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_FunctionDerivative.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralExpression.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralExpression.hxx index dbe4ceb4b6..ac1022e3e8 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralExpression.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralExpression.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include class Expr_NamedUnknown; class TCollection_AsciiString; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralFunction.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralFunction.hxx index bbddeb42c3..541361543d 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralFunction.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_GeneralFunction.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include class Expr_NamedUnknown; class TCollection_AsciiString; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOf10.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOf10.hxx index edb8313929..5fbe82eff6 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOf10.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOf10.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOfe.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOfe.hxx index 0fe1be0d42..2924d0a405 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOfe.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOfe.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedConstant.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedConstant.hxx index 3d431a60fa..b035b510ce 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedConstant.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedConstant.hxx @@ -22,7 +22,6 @@ #include #include -#include #include class TCollection_AsciiString; class Expr_GeneralExpression; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedFunction.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedFunction.hxx index d2b3cbbf3b..758d849f19 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedFunction.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedFunction.hxx @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedUnknown.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedUnknown.hxx index 6cdf1b4992..dd68fe7b80 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedUnknown.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NamedUnknown.hxx @@ -22,7 +22,6 @@ #include #include -#include #include class Expr_GeneralExpression; class TCollection_AsciiString; @@ -101,5 +100,6 @@ private: }; #include +class Expr_NamedUnknown; #endif // _Expr_NamedUnknown_HeaderFile diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NumericValue.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NumericValue.hxx index 7b14385804..dfb1c1f237 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_NumericValue.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_NumericValue.hxx @@ -22,7 +22,6 @@ #include #include -#include #include class Expr_NamedUnknown; class TCollection_AsciiString; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.cxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.cxx index 10bc2e875f..30b5cb5922 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.cxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.cxx @@ -20,7 +20,7 @@ #endif #include -#include +#include #include #include #include @@ -31,6 +31,7 @@ #include #include #include +class Expr_NamedUnknown; IMPLEMENT_STANDARD_RTTIEXT(Expr_PolyFunction, Expr_PolyExpression) diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.hxx index ade6a5e492..f6ec999438 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_PolyFunction.hxx @@ -23,7 +23,6 @@ #include #include #include -#include class Expr_GeneralFunction; class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Product.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Product.hxx index 6f58d8deee..e442e90ff7 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Product.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Product.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sign.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sign.hxx index e78b569aba..af6a0637d4 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sign.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sign.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sine.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sine.hxx index 0e2d9b87ed..aca77e6120 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sine.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sine.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sinh.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sinh.hxx index 28e0cb9d61..25c037d370 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sinh.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sinh.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Square.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Square.hxx index 3153761cac..50f6b8e80c 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Square.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Square.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_SquareRoot.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_SquareRoot.hxx index 68ae152d4d..6f5d12ceba 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_SquareRoot.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_SquareRoot.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sum.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sum.hxx index 9d3b8e145f..57f3fac450 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sum.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Sum.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tangent.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tangent.hxx index c88524d349..ef297a314a 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tangent.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tangent.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tanh.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tanh.hxx index c5403f0eab..dc4d95f34a 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tanh.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_Tanh.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.cxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.cxx index 2d4873e454..736decad6e 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.cxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,7 @@ #include #include #include +class Expr_NamedUnknown; IMPLEMENT_STANDARD_RTTIEXT(Expr_UnaryFunction, Expr_UnaryExpression) diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.hxx index 75d57d0f20..78c926327f 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryFunction.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class Expr_GeneralFunction; class Expr_GeneralExpression; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryMinus.hxx b/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryMinus.hxx index f8d669129b..3420eb41d3 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryMinus.hxx +++ b/src/ModelingAlgorithms/TKExpress/Expr/Expr_UnaryMinus.hxx @@ -22,7 +22,6 @@ #include #include -#include #include class Expr_GeneralExpression; class Expr_NamedUnknown; diff --git a/src/ModelingAlgorithms/TKExpress/Expr/FILES.cmake b/src/ModelingAlgorithms/TKExpress/Expr/FILES.cmake index 870aed7018..aceaf52523 100644 --- a/src/ModelingAlgorithms/TKExpress/Expr/FILES.cmake +++ b/src/ModelingAlgorithms/TKExpress/Expr/FILES.cmake @@ -19,7 +19,6 @@ set(OCCT_Expr_FILES Expr_ArgTanh.cxx Expr_ArgTanh.hxx - Expr_Array1OfNamedUnknown.hxx Expr_BinaryExpression.cxx Expr_BinaryExpression.hxx diff --git a/src/ModelingAlgorithms/TKExpress/ExprIntrp/ExprIntrp_yaccintrf.cxx b/src/ModelingAlgorithms/TKExpress/ExprIntrp/ExprIntrp_yaccintrf.cxx index 31a07a82df..753b23b30b 100644 --- a/src/ModelingAlgorithms/TKExpress/ExprIntrp/ExprIntrp_yaccintrf.cxx +++ b/src/ModelingAlgorithms/TKExpress/ExprIntrp/ExprIntrp_yaccintrf.cxx @@ -48,8 +48,8 @@ #include #include #include -#include #include +class Expr_NamedUnknown; static TCollection_AsciiString ExprIntrp_assname; static TCollection_AsciiString ExprIntrp_funcdefname; diff --git a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Builder.cxx b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Builder.cxx index 69451d56c3..8c51721825 100644 --- a/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Builder.cxx +++ b/src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_Builder.cxx @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -37,6 +37,7 @@ #include #include #include +class BOPDS_PaveBlock; //================================================================================================= diff --git a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx index 030ff5ec01..593c438df4 100644 --- a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx +++ b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx @@ -30,8 +30,6 @@ #include #include -typedef NCollection_UBTree ShapeAnalysis_BoxBndTree; - class ShapeAnalysis_BoxBndTreeSelector : public NCollection_UBTree::Selector { public: diff --git a/src/ModelingAlgorithms/TKTopAlgo/BRepClass3d/BRepClass3d_BndBoxTree.hxx b/src/ModelingAlgorithms/TKTopAlgo/BRepClass3d/BRepClass3d_BndBoxTree.hxx index 31d10ad86c..d7e592be17 100644 --- a/src/ModelingAlgorithms/TKTopAlgo/BRepClass3d/BRepClass3d_BndBoxTree.hxx +++ b/src/ModelingAlgorithms/TKTopAlgo/BRepClass3d/BRepClass3d_BndBoxTree.hxx @@ -28,7 +28,6 @@ #include // Typedef to reduce code complexity. -typedef NCollection_UBTree BRepClass3d_BndBoxTree; // Class representing tree selector for point object. class BRepClass3d_BndBoxTreeSelectorPoint : public NCollection_UBTree::Selector diff --git a/src/ModelingData/TKBRep/TopoDS/FILES.cmake b/src/ModelingData/TKBRep/TopoDS/FILES.cmake index e18fc00e44..5b6d272ac0 100644 --- a/src/ModelingData/TKBRep/TopoDS/FILES.cmake +++ b/src/ModelingData/TKBRep/TopoDS/FILES.cmake @@ -19,7 +19,6 @@ set(OCCT_TopoDS_FILES TopoDS_Iterator.cxx TopoDS_Iterator.hxx - TopoDS_ListOfShape.hxx TopoDS_LockedShape.hxx TopoDS_Shape.cxx TopoDS_Shape.hxx diff --git a/src/ModelingData/TKBRep/TopoDS/TopoDS_Builder.cxx b/src/ModelingData/TKBRep/TopoDS/TopoDS_Builder.cxx index 3ae2af6e5d..d4db393966 100644 --- a/src/ModelingData/TKBRep/TopoDS/TopoDS_Builder.cxx +++ b/src/ModelingData/TKBRep/TopoDS/TopoDS_Builder.cxx @@ -17,11 +17,12 @@ #include #include #include -#include +#include #include #include #include #include +class TopoDS_Shape; //======================================================================= // function : MakeShape diff --git a/src/ModelingData/TKBRep/TopoDS/TopoDS_Iterator.hxx b/src/ModelingData/TKBRep/TopoDS/TopoDS_Iterator.hxx index c362c55693..719f1c501e 100644 --- a/src/ModelingData/TKBRep/TopoDS/TopoDS_Iterator.hxx +++ b/src/ModelingData/TKBRep/TopoDS/TopoDS_Iterator.hxx @@ -19,9 +19,10 @@ #include #include -#include +#include #include #include +class TopoDS_Shape; //! Iterates on the underlying shape underlying a given //! TopoDS_Shape object, providing access to its diff --git a/src/ModelingData/TKBRep/TopoDS/TopoDS_ListOfShape.hxx b/src/ModelingData/TKBRep/TopoDS/TopoDS_ListOfShape.hxx deleted file mode 100644 index ce23d11c63..0000000000 --- a/src/ModelingData/TKBRep/TopoDS/TopoDS_ListOfShape.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 1990-12-11 -// Created by: Remi Lequette -// Copyright (c) 1990-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 TopoDS_ListOfShape_HeaderFile -#define TopoDS_ListOfShape_HeaderFile - -#include - -class TopoDS_Shape; -typedef NCollection_List TopoDS_ListOfShape; - -#endif diff --git a/src/ModelingData/TKBRep/TopoDS/TopoDS_TShape.hxx b/src/ModelingData/TKBRep/TopoDS/TopoDS_TShape.hxx index a5dd8f8370..2faed7a7b9 100644 --- a/src/ModelingData/TKBRep/TopoDS/TopoDS_TShape.hxx +++ b/src/ModelingData/TKBRep/TopoDS/TopoDS_TShape.hxx @@ -19,7 +19,8 @@ #include #include -#include +#include +class TopoDS_Shape; // resolve name collisions with X11 headers #ifdef Convex diff --git a/src/ModelingData/TKGeomBase/Geom2dConvert/FILES.cmake b/src/ModelingData/TKGeomBase/Geom2dConvert/FILES.cmake index 3cb2015cb9..a933441ed2 100644 --- a/src/ModelingData/TKGeomBase/Geom2dConvert/FILES.cmake +++ b/src/ModelingData/TKGeomBase/Geom2dConvert/FILES.cmake @@ -16,5 +16,4 @@ set(OCCT_Geom2dConvert_FILES Geom2dConvert_CompCurveToBSplineCurve.hxx Geom2dConvert_PPoint.cxx Geom2dConvert_PPoint.hxx - Geom2dConvert_SequenceOfPPoint.hxx ) diff --git a/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_ApproxArcsSegments.hxx b/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_ApproxArcsSegments.hxx index 2ec51e2afb..f3193caada 100644 --- a/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_ApproxArcsSegments.hxx +++ b/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_ApproxArcsSegments.hxx @@ -20,8 +20,8 @@ #include #include #include -#include #include +class Geom2dConvert_PPoint; //! Approximation of a free-form curve by a sequence of arcs+segments. class Geom2dConvert_ApproxArcsSegments diff --git a/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_SequenceOfPPoint.hxx b/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_SequenceOfPPoint.hxx deleted file mode 100644 index 7eec699af2..0000000000 --- a/src/ModelingData/TKGeomBase/Geom2dConvert/Geom2dConvert_SequenceOfPPoint.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created: 2009-01-09 -// -// Copyright (c) 2009-2013 OPEN CASCADE SAS -// -// This file is part of commercial software by OPEN CASCADE SAS, -// furnished in accordance with the terms and conditions of the contract -// and with the inclusion of this copyright notice. -// This file or any part thereof may not be provided or otherwise -// made available to any third party. -// -// No ownership title to the software is transferred hereby. -// -// OPEN CASCADE SAS makes no representation or warranties with respect to the -// performance of this software, and specifically disclaims any responsibility -// for any damages, special or consequential, connected with its use. - -#ifndef _Geom2dConvert_SequenceOfPPoint_HeaderFile -#define _Geom2dConvert_SequenceOfPPoint_HeaderFile - -#include -class Geom2dConvert_PPoint; - -typedef NCollection_Sequence Geom2dConvert_SequenceOfPPoint; - -#endif diff --git a/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx b/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx index 3d46f7a72d..d16e78b2af 100644 --- a/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx +++ b/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx @@ -48,12 +48,13 @@ #include #include #include -#include +#include #include #include #include #include #include +class SelectMgr_EntityOwner; IMPLEMENT_STANDARD_RTTIEXT(MeshVS_Mesh, AIS_InteractiveObject) diff --git a/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.hxx b/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.hxx index bd4ca102a0..e4350f13f4 100644 --- a/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.hxx +++ b/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.hxx @@ -23,7 +23,6 @@ #include #include #include -#include class MeshVS_PrsBuilder; class TColStd_HPackedMapOfInteger; diff --git a/src/Visualization/TKService/Graphic3d/FILES.cmake b/src/Visualization/TKService/Graphic3d/FILES.cmake index 7e37fa6522..54993cfaa7 100644 --- a/src/Visualization/TKService/Graphic3d/FILES.cmake +++ b/src/Visualization/TKService/Graphic3d/FILES.cmake @@ -94,9 +94,7 @@ set(OCCT_Graphic3d_FILES Graphic3d_LevelOfTextureAnisotropy.hxx Graphic3d_LightSet.cxx Graphic3d_LightSet.hxx - Graphic3d_MapOfAspectsToAspects.hxx - Graphic3d_MapOfStructure.hxx Graphic3d_MarkerImage.cxx Graphic3d_MarkerImage.hxx Graphic3d_MarkerImage.pxx diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_CView.cxx b/src/Visualization/TKService/Graphic3d/Graphic3d_CView.cxx index bc2df3aaa5..3d0e00c265 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_CView.cxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_CView.cxx @@ -17,8 +17,9 @@ #include #include #include -#include +#include #include +class Graphic3d_Structure; IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CView, Graphic3d_DataStructureManager) diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_Group.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_Group.hxx index 8c815ab199..45a49fe0cc 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_Group.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_Group.hxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -31,6 +31,7 @@ #include #include #include +class Graphic3d_Aspects; class Graphic3d_Structure; class Graphic3d_ArrayOfPrimitives; diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_MapOfAspectsToAspects.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_MapOfAspectsToAspects.hxx deleted file mode 100644 index 76b5b95cca..0000000000 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_MapOfAspectsToAspects.hxx +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2019 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 _Graphic3d_MapOfAspectsToAspects_Header -#define _Graphic3d_MapOfAspectsToAspects_Header - -#include - -class Graphic3d_Aspects; -typedef NCollection_DataMap, occ::handle> - Graphic3d_MapOfAspectsToAspects; - -#endif // _Graphic3d_MapOfAspectsToAspects_Header diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_MapOfStructure.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_MapOfStructure.hxx deleted file mode 100644 index db8d6bb180..0000000000 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_MapOfStructure.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2014-12-18 -// Created by: Kirill Gavrilov -// Copyright (c) 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 _Graphic3d_MapOfStructure -#define _Graphic3d_MapOfStructure - -#include - -class Graphic3d_Structure; -typedef NCollection_Map> Graphic3d_MapOfStructure; - -#endif // _Graphic3d_MapOfStructure diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.cxx b/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.cxx index c5b4717d2f..a3ad9a2888 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.cxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.cxx @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,6 +27,7 @@ #include #include +class Graphic3d_Structure; IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Structure, Standard_Transient) diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx index 10797e261a..6d80b0e294 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx @@ -18,7 +18,7 @@ #define _Graphic3d_Structure_HeaderFile #include -#include +#include #include #include #include @@ -27,6 +27,7 @@ #include #include #include +class Graphic3d_Structure; class Graphic3d_StructureManager; class Graphic3d_DataStructureManager; diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.cxx b/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.cxx index 24312fb105..01b117160d 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.cxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.cxx @@ -21,8 +21,9 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_StructureManager, Standard_Transient) -#include +#include #include +class Graphic3d_Structure; //================================================================================================= diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx index 31c3a38c47..0e21a4b708 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_StructureManager.hxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx b/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx index 232c66d4c9..15a9a46820 100644 --- a/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx +++ b/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx @@ -37,7 +37,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -48,6 +49,7 @@ #include #include #include +class SelectMgr_EntityOwner; class V3d_Viewer; class V3d_View; diff --git a/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx b/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx index b3256fe22e..f609f58f69 100644 --- a/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx +++ b/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx @@ -31,10 +31,11 @@ #include #include #include -#include +#include #include #include #include +class SelectMgr_EntityOwner; #ifndef M_SQRT2 #define M_SQRT2 1.41421356237309504880168872420969808 diff --git a/src/Visualization/TKV3d/AIS/AIS_ViewCube.cxx b/src/Visualization/TKV3d/AIS/AIS_ViewCube.cxx index ff7508f024..541425189c 100644 --- a/src/Visualization/TKV3d/AIS/AIS_ViewCube.cxx +++ b/src/Visualization/TKV3d/AIS/AIS_ViewCube.cxx @@ -25,9 +25,10 @@ #include #include #include -#include +#include #include #include +class SelectMgr_EntityOwner; IMPLEMENT_STANDARD_RTTIEXT(AIS_ViewCube, AIS_InteractiveObject) IMPLEMENT_STANDARD_RTTIEXT(AIS_ViewCubeOwner, SelectMgr_EntityOwner) diff --git a/src/Visualization/TKV3d/PrsMgr/FILES.cmake b/src/Visualization/TKV3d/PrsMgr/FILES.cmake index b4d5100a48..bdc545c7fd 100644 --- a/src/Visualization/TKV3d/PrsMgr/FILES.cmake +++ b/src/Visualization/TKV3d/PrsMgr/FILES.cmake @@ -13,6 +13,5 @@ set(OCCT_PrsMgr_FILES PrsMgr_PresentationManager.cxx PrsMgr_PresentationManager.hxx - PrsMgr_Presentations.hxx PrsMgr_TypeOfPresentation3d.hxx ) diff --git a/src/Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx b/src/Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx index dd14b46dfa..722049a52d 100644 --- a/src/Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx +++ b/src/Visualization/TKV3d/PrsMgr/PrsMgr_ListOfPresentableObjects.hxx @@ -21,6 +21,5 @@ // clang-format off class PrsMgr_PresentableObject; // use forward declaration since PrsMgr_PresentableObject.hxx uses NCollection_List> // clang-format on -typedef NCollection_List> PrsMgr_ListOfPresentableObjects; #endif // _PrsMgr_ListOfPresentableObjects_HeaderFile diff --git a/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx b/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx index ebe59e1901..db237c0107 100644 --- a/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx +++ b/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx @@ -23,11 +23,12 @@ #include #include #include -#include +#include #include #include #include #include +class PrsMgr_Presentation; class PrsMgr_PresentationManager; diff --git a/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentationManager.cxx b/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentationManager.cxx index 7c8173bef4..70c2c334ec 100644 --- a/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentationManager.cxx +++ b/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentationManager.cxx @@ -18,9 +18,10 @@ #include #include #include -#include +#include #include #include +class PrsMgr_Presentation; IMPLEMENT_STANDARD_RTTIEXT(PrsMgr_PresentationManager, Standard_Transient) diff --git a/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentations.hxx b/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentations.hxx deleted file mode 100644 index e624a9109d..0000000000 --- a/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentations.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 1995-01-25 -// Created by: Jean-Louis Frenkel -// Copyright (c) 1995-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 PrsMgr_Presentations_HeaderFile -#define PrsMgr_Presentations_HeaderFile - -#include - -class PrsMgr_Presentation; -typedef NCollection_Sequence> PrsMgr_Presentations; - -#endif diff --git a/src/Visualization/TKV3d/Select3D/FILES.cmake b/src/Visualization/TKV3d/Select3D/FILES.cmake index ec34c40d63..5ca29a4694 100644 --- a/src/Visualization/TKV3d/Select3D/FILES.cmake +++ b/src/Visualization/TKV3d/Select3D/FILES.cmake @@ -5,8 +5,6 @@ set(OCCT_Select3D_FILES Select3D_BndBox3d.hxx Select3D_BVHBuilder3d.hxx Select3D_BVHIndexBuffer.hxx - Select3D_EntitySequence.hxx - Select3D_IndexedMapOfEntity.hxx Select3D_InteriorSensitivePointSet.cxx Select3D_InteriorSensitivePointSet.hxx Select3D_Pnt.hxx diff --git a/src/Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx b/src/Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx deleted file mode 100644 index 05c5ffa7dd..0000000000 --- a/src/Visualization/TKV3d/Select3D/Select3D_EntitySequence.hxx +++ /dev/null @@ -1,22 +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 _Select3D_EntitySequence_Header -#define _Select3D_EntitySequence_Header - -#include - -class Select3D_SensitiveEntity; -typedef NCollection_Sequence> Select3D_EntitySequence; - -#endif // _Select3D_EntitySequence_Header diff --git a/src/Visualization/TKV3d/Select3D/Select3D_IndexedMapOfEntity.hxx b/src/Visualization/TKV3d/Select3D/Select3D_IndexedMapOfEntity.hxx deleted file mode 100644 index 849b7ccdfb..0000000000 --- a/src/Visualization/TKV3d/Select3D/Select3D_IndexedMapOfEntity.hxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2017 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 _Select3D_IndexedMapOfEntity_Header -#define _Select3D_IndexedMapOfEntity_Header - -#include - -class Select3D_SensitiveEntity; -typedef NCollection_IndexedMap> Select3D_IndexedMapOfEntity; - -#endif // _Select3D_IndexedMapOfEntity_Header diff --git a/src/Visualization/TKV3d/Select3D/Select3D_SensitiveGroup.hxx b/src/Visualization/TKV3d/Select3D/Select3D_SensitiveGroup.hxx index a72a9f7f54..912d7039c8 100644 --- a/src/Visualization/TKV3d/Select3D/Select3D_SensitiveGroup.hxx +++ b/src/Visualization/TKV3d/Select3D/Select3D_SensitiveGroup.hxx @@ -17,10 +17,11 @@ #ifndef _Select3D_SensitiveGroup_HeaderFile #define _Select3D_SensitiveGroup_HeaderFile -#include -#include +#include +#include #include #include +class Select3D_SensitiveEntity; //! A framework to define selection of a sensitive group //! by a sensitive entity which is a set of 3D sensitive entities. diff --git a/src/Visualization/TKV3d/SelectMgr/FILES.cmake b/src/Visualization/TKV3d/SelectMgr/FILES.cmake index 0041144f46..8f977544bb 100644 --- a/src/Visualization/TKV3d/SelectMgr/FILES.cmake +++ b/src/Visualization/TKV3d/SelectMgr/FILES.cmake @@ -28,7 +28,6 @@ set(OCCT_SelectMgr_FILES SelectMgr_FrustumBuilder.cxx SelectMgr_FrustumBuilder.hxx - SelectMgr_IndexedMapOfOwner.hxx SelectMgr_OrFilter.cxx SelectMgr_OrFilter.hxx @@ -52,7 +51,6 @@ set(OCCT_SelectMgr_FILES SelectMgr_SensitiveEntity.hxx SelectMgr_SensitiveEntitySet.cxx SelectMgr_SensitiveEntitySet.hxx - SelectMgr_SequenceOfOwner.hxx SelectMgr_SortCriterion.hxx SelectMgr_StateOfSelection.hxx diff --git a/src/Visualization/TKV3d/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx b/src/Visualization/TKV3d/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx deleted file mode 100644 index dd28671397..0000000000 --- a/src/Visualization/TKV3d/SelectMgr/SelectMgr_IndexedMapOfOwner.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 2015-05-14 -// Created by: Varvara POSKONINA -// Copyright (c) 2005-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 _SelectMgr_IndexedMapOfOwner_HeaderFile -#define _SelectMgr_IndexedMapOfOwner_HeaderFile - -#include -#include - -class SelectMgr_EntityOwner; - -typedef NCollection_Shared>> - SelectMgr_IndexedMapOfOwner; - -#endif // _SelectMgr_IndexedMapOfOwner_HeaderFile diff --git a/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.cxx b/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.cxx index 63ce969551..4421f76d43 100644 --- a/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.cxx +++ b/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.cxx @@ -20,11 +20,13 @@ #include #include #include -#include +#include +#include #include #include #include #include +class SelectMgr_EntityOwner; IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SelectableObject, PrsMgr_PresentableObject) diff --git a/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.hxx b/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.hxx index 95d53fe37e..c920fa53ef 100644 --- a/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.hxx +++ b/src/Visualization/TKV3d/SelectMgr/SelectMgr_SelectableObject.hxx @@ -18,10 +18,10 @@ #define _SelectMgr_SelectableObject_HeaderFile #include -#include +#include +#include #include #include -#include class SelectMgr_EntityOwner; diff --git a/src/Visualization/TKV3d/SelectMgr/SelectMgr_SequenceOfOwner.hxx b/src/Visualization/TKV3d/SelectMgr/SelectMgr_SequenceOfOwner.hxx deleted file mode 100644 index c45f13d20d..0000000000 --- a/src/Visualization/TKV3d/SelectMgr/SelectMgr_SequenceOfOwner.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1995-02-06 -// Created by: Mister rmi -// Copyright (c) 1995-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 SelectMgr_SequenceOfOwner_HeaderFile -#define SelectMgr_SequenceOfOwner_HeaderFile - -#include - -class SelectMgr_EntityOwner; - -typedef NCollection_Sequence> SelectMgr_SequenceOfOwner; - -#endif diff --git a/src/Visualization/TKV3d/StdSelect/StdSelect_BRepSelectionTool.hxx b/src/Visualization/TKV3d/StdSelect/StdSelect_BRepSelectionTool.hxx index a4b4e98718..001f4f1bc4 100644 --- a/src/Visualization/TKV3d/StdSelect/StdSelect_BRepSelectionTool.hxx +++ b/src/Visualization/TKV3d/StdSelect/StdSelect_BRepSelectionTool.hxx @@ -26,10 +26,12 @@ #include #include #include -#include +#include #include #include #include + +class Select3D_SensitiveEntity; class SelectMgr_SelectableObject; class TopoDS_Face; diff --git a/src/Visualization/TKV3d/V3d/FILES.cmake b/src/Visualization/TKV3d/V3d/FILES.cmake index 48bf729885..ce5e60ac68 100644 --- a/src/Visualization/TKV3d/V3d/FILES.cmake +++ b/src/Visualization/TKV3d/V3d/FILES.cmake @@ -14,7 +14,6 @@ set(OCCT_V3d_FILES V3d_ImageDumpOptions.hxx V3d_Light.hxx - V3d_ListOfView.hxx V3d_Plane.cxx V3d_Plane.hxx V3d_PositionalLight.cxx diff --git a/src/Visualization/TKV3d/V3d/V3d_ListOfView.hxx b/src/Visualization/TKV3d/V3d/V3d_ListOfView.hxx deleted file mode 100644 index a613dad93d..0000000000 --- a/src/Visualization/TKV3d/V3d/V3d_ListOfView.hxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2016 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 _V3d_ListOfView_HeaderFile -#define _V3d_ListOfView_HeaderFile - -class V3d_View; -#include - -typedef NCollection_List> V3d_ListOfView; - -#endif // _V3d_ListOfView_HeaderFile diff --git a/src/Visualization/TKV3d/V3d/V3d_View.cxx b/src/Visualization/TKV3d/V3d/V3d_View.cxx index 9dd167857e..93c5bcdd44 100644 --- a/src/Visualization/TKV3d/V3d/V3d_View.cxx +++ b/src/Visualization/TKV3d/V3d/V3d_View.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -47,6 +47,7 @@ #include #include #include +class Graphic3d_Structure; IMPLEMENT_STANDARD_RTTIEXT(V3d_View, Standard_Transient) diff --git a/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx b/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx index e59f7fd3ba..400cd36dbf 100644 --- a/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx +++ b/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include