From 92cd4fc8eed8b6a931dd2095d4feef6fc20b1cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 Feb 2009 09:09:43 +0000 Subject: [PATCH] git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4796 383ad7c9-94d9-4d36-a494-682f7c89f535 --- BasePlugin/PluginFunctions.cc | 20 ++++++++++---------- BasePlugin/PluginFunctions.hh | 2 +- BasePlugin/PluginFunctionsIterator.cc | 2 +- Core/ParseIni.cc | 4 ++-- Core/ParseObj.cc | 2 +- Core/saveFunctions.cc | 4 ++-- Core/saveSettings.cc | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BasePlugin/PluginFunctions.cc b/BasePlugin/PluginFunctions.cc index baefdea3..5c883824 100644 --- a/BasePlugin/PluginFunctions.cc +++ b/BasePlugin/PluginFunctions.cc @@ -98,7 +98,7 @@ void setSceneGraphRootNode( SeparatorNode* _root_node ) { } bool getPickedObject(const unsigned int _node_idx , BaseObjectData*& _object) { - for ( ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; o_it != PluginFunctions::objects_end(); ++o_it) { + for ( ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; o_it != PluginFunctions::objectsEnd(); ++o_it) { if ( o_it->picked( _node_idx ) ) { _object = *o_it; return true; @@ -111,7 +111,7 @@ bool getPickedObject(const unsigned int _node_idx , BaseObjectData*& _object) { bool getSourceIdentifiers( std::vector& _identifiers ) { _identifiers.clear(); - for ( ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; o_it != PluginFunctions::objects_end(); ++o_it) { + for ( ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; o_it != PluginFunctions::objectsEnd(); ++o_it) { if ( o_it->source() ) _identifiers.push_back ( o_it->id() ); } @@ -121,7 +121,7 @@ bool getSourceIdentifiers( std::vector& _identifiers ) { bool getTargetIdentifiers( std::vector& _identifiers ) { _identifiers.clear(); - for ( ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; o_it != PluginFunctions::objects_end(); ++o_it) { + for ( ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; o_it != PluginFunctions::objectsEnd(); ++o_it) { if ( o_it->target() ) _identifiers.push_back ( o_it->id() ); } @@ -230,7 +230,7 @@ bool getAllMeshes( std::vector& _identifiers ) { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS,DATA_TRIANGLE_MESH) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { _identifiers.push_back( o_it->id() ); } @@ -243,7 +243,7 @@ bool get_all_object_identifiers( std::vector& _identifiers ) { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { _identifiers.push_back( o_it->id() ); } @@ -473,7 +473,7 @@ int objectCount() { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { ++count; } @@ -487,7 +487,7 @@ int targetCount() { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { ++count; } @@ -499,7 +499,7 @@ int sourceCount() { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::SOURCE_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { ++count; } @@ -511,7 +511,7 @@ int visibleCount() { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { if ( o_it->visible() ) ++count; } @@ -531,7 +531,7 @@ void get_all_objects( std::vector < BaseObjectData*>& _objects ) { // find changed manipulator for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS,DATA_TRIANGLE_MESH) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { _objects.push_back( *o_it ); } diff --git a/BasePlugin/PluginFunctions.hh b/BasePlugin/PluginFunctions.hh index 87925140..fe334a30 100644 --- a/BasePlugin/PluginFunctions.hh +++ b/BasePlugin/PluginFunctions.hh @@ -546,7 +546,7 @@ class DLLEXPORT ObjectIterator { /// Return Iterator to Object End DLLEXPORT -ObjectIterator objects_end(); +ObjectIterator objectsEnd(); /** @} */ diff --git a/BasePlugin/PluginFunctionsIterator.cc b/BasePlugin/PluginFunctionsIterator.cc index 300d245e..b1b80a3f 100644 --- a/BasePlugin/PluginFunctionsIterator.cc +++ b/BasePlugin/PluginFunctionsIterator.cc @@ -168,7 +168,7 @@ BaseObjectData* ObjectIterator::operator*() { } /// Return Iterator to Object End -ObjectIterator objects_end() { +ObjectIterator objectsEnd() { return ObjectIterator(0); } diff --git a/Core/ParseIni.cc b/Core/ParseIni.cc index 76b3cef7..3d9dfc01 100644 --- a/Core/ParseIni.cc +++ b/Core/ParseIni.cc @@ -653,7 +653,7 @@ void Core::writeIniFile(QString _filename, QString keyName; QString sectionName; for ( PluginFunctions::ObjectIterator o_it(restriction) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { QString file = o_it->path() + OpenFlipper::Options::dirSeparator() + o_it->name(); if (QFile(file).exists()){ // Add a section for this object @@ -680,7 +680,7 @@ void Core::writeIniFile(QString _filename, // Tell plugins to save their information for the given object for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) + o_it != PluginFunctions::objectsEnd(); ++o_it) emit iniSave( ini , o_it->id() ); } diff --git a/Core/ParseObj.cc b/Core/ParseObj.cc index 596a24d4..1744bf95 100644 --- a/Core/ParseObj.cc +++ b/Core/ParseObj.cc @@ -274,7 +274,7 @@ void Core::writeObjFile(QString _filename, bool _relativePaths, bool _targetOnly // write all objects to a separate obj file and save external references in the global obj file for ( PluginFunctions::ObjectIterator o_it (restriction) ; - o_it != PluginFunctions::objects_end(); ++o_it) + o_it != PluginFunctions::objectsEnd(); ++o_it) { QString file = o_it->path() + OpenFlipper::Options::dirSeparator() + o_it->name(); diff --git a/Core/saveFunctions.cc b/Core/saveFunctions.cc index 051e95a9..1fdaf533 100644 --- a/Core/saveFunctions.cc +++ b/Core/saveFunctions.cc @@ -130,7 +130,7 @@ void Core::saveAllObjects(){ //iterate over all target objects for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS) ; - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { if ( !QDir(o_it->path()).exists() || o_it->path().trimmed() == "" ) // if path isn't valid use 'save object to' saveObjectTo(o_it->id(),o_it->name()); @@ -151,7 +151,7 @@ void Core::saveAllObjectsTo(){ if (supportedTypes_.size() != 0){ //iterate over all target objects for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS); - o_it != PluginFunctions::objects_end(); ++o_it) { + o_it != PluginFunctions::objectsEnd(); ++o_it) { QString filename = o_it->path() + OpenFlipper::Options::dirSeparator() + o_it->name(); saveObjectTo(o_it->id(),filename); } diff --git a/Core/saveSettings.cc b/Core/saveSettings.cc index 949fb481..5f1012fa 100644 --- a/Core/saveSettings.cc +++ b/Core/saveSettings.cc @@ -164,7 +164,7 @@ void Core::saveSettings(){ //Iterate over opened objects and save them for ( PluginFunctions::ObjectIterator o_it(restriction); - o_it != PluginFunctions::objects_end(); ++o_it) + o_it != PluginFunctions::objectsEnd(); ++o_it) { QString filename; -- GitLab