From 87066603a46a2c9833e0a553bf9a4aa63dd1241b Mon Sep 17 00:00:00 2001 From: spo Date: Mon, 14 Sep 2015 15:48:09 +0300 Subject: [PATCH] Spell-checking --- src/Config/CMakeLists.txt | 6 +++--- src/Config/Config_ModuleReader.cpp | 4 ++-- src/Model/Model_Session.cpp | 2 +- src/Model/Model_Session.h | 8 ++++---- src/ModelAPI/ModelAPI_Entity.h | 4 ++-- src/ModelAPI/ModelAPI_Session.h | 2 +- src/ModuleBase/ModuleBase_IModule.cpp | 2 +- src/ModuleBase/ModuleBase_IModule.h | 18 ++++++++--------- src/ModuleBase/ModuleBase_ModelWidget.cpp | 4 ++-- src/ModuleBase/ModuleBase_ModelWidget.h | 12 ++++++------ src/XGUI/XGUI_ModuleConnector.h | 4 ++-- src/XGUI/XGUI_Workshop.cpp | 2 +- src/XGUI/XGUI_Workshop.h | 24 +++++++++++------------ 13 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt index 1dfbae0b1..e43622f80 100644 --- a/src/Config/CMakeLists.txt +++ b/src/Config/CMakeLists.txt @@ -4,7 +4,7 @@ INCLUDE(Common) INCLUDE(XMLProcessing) INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events - ${PYTHON_INCLUDE_DIR}) + ${PYTHON_INCLUDE_DIR}) SET(PROJECT_HEADERS Config_def.h @@ -25,7 +25,7 @@ SET(PROJECT_HEADERS Config_ValidatorReader.h Config_DataModelReader.h ) - + SET(PROJECT_SOURCES Config_FeatureMessage.cpp Config_XMLReader.cpp @@ -57,7 +57,7 @@ SET(PROJECT_LIBRARIES SOURCE_GROUP ("Resource Files" FILES ${XML_RESOURCES}) -ADD_DEFINITIONS(-DCONFIG_EXPORTS -D_SCL_SECURE_NO_WARNINGS) +ADD_DEFINITIONS(-DCONFIG_EXPORTS -D_SCL_SECURE_NO_WARNINGS) # -D_SCL_SECURE_NO_WARNINGS - to disable warnings 4996 ADD_LIBRARY(Config SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp index 71d160378..2fd33f6cd 100644 --- a/src/Config/Config_ModuleReader.cpp +++ b/src/Config/Config_ModuleReader.cpp @@ -173,12 +173,12 @@ void Config_ModuleReader::loadPlugin(const std::string& thePluginName) void Config_ModuleReader::loadScript(const std::string& theFileName) { - /* aquire python thread */ + /* acquire python thread */ PyGILState_STATE gstate = PyGILState_Ensure(); PyObject* module = PyImport_ImportModule(theFileName.c_str()); if (!module) { - std::string anErrorMsg = "An error occured while importing " + theFileName; + std::string anErrorMsg = "An error occurred while importing " + theFileName; //Get detailed error message: if (PyErr_Occurred()) { PyObject *pstr, *ptype, *pvalue, *ptraceback; diff --git a/src/Model/Model_Session.cpp b/src/Model/Model_Session.cpp index e66e434a1..ea5375afb 100644 --- a/src/Model/Model_Session.cpp +++ b/src/Model/Model_Session.cpp @@ -346,7 +346,7 @@ void Model_Session::processEvent(const std::shared_ptr& theMessa const std::shared_ptr aMsg = std::dynamic_pointer_cast(theMessage); if (aMsg) { - // proccess the plugin info, load plugin + // process the plugin info, load plugin if (myPlugins.find(aMsg->id()) == myPlugins.end()) { myPlugins[aMsg->id()] = std::pair( aMsg->pluginLibrary(), aMsg->documentKind()); diff --git a/src/Model/Model_Session.h b/src/Model/Model_Session.h index df9a63a57..9e5fa029c 100644 --- a/src/Model/Model_Session.h +++ b/src/Model/Model_Session.h @@ -31,7 +31,7 @@ class Model_Session : public ModelAPI_Session, public Events_Listener std::string myCurrentPluginName; ///< name of the plugin that must be loaded currently std::shared_ptr myCurrentDoc; ///< current working document bool myCheckTransactions; ///< if true, generates error if document is updated outside of transaction - bool myOperationAttachedToNext; ///< the current operation must be commited twice, with nested + bool myOperationAttachedToNext; ///< the current operation must be committed twice, with nested public: //! Loads the OCAF document from the file. @@ -48,9 +48,9 @@ class Model_Session : public ModelAPI_Session, public Events_Listener //! Closes all documents MODEL_EXPORT virtual void closeAll(); - //! Starts a new operation (opens a tansaction) + //! Starts a new operation (opens a transaction) //! \param theAttachedToNested if it is true, it means that this transaction is attached to the nested - //! where it is located and will be commited on the next commit with the nested + //! where it is located and will be committed on the next commit with the nested MODEL_EXPORT virtual void startOperation( const std::string& theId = "", const bool theAttachedToNested = false); //! Finishes the previously started operation (closes the transaction) @@ -105,7 +105,7 @@ class Model_Session : public ModelAPI_Session, public Events_Listener /// Processes the configuration file reading MODEL_EXPORT virtual void processEvent(const std::shared_ptr& theMessage); - /// Copies the document to the new one wit hthe given id + /// Copies the document to the new one with the given id MODEL_EXPORT virtual std::shared_ptr copy( std::shared_ptr theSource, std::string theID); diff --git a/src/ModelAPI/ModelAPI_Entity.h b/src/ModelAPI/ModelAPI_Entity.h index 49503c3f5..5f97f6edd 100644 --- a/src/ModelAPI/ModelAPI_Entity.h +++ b/src/ModelAPI/ModelAPI_Entity.h @@ -10,13 +10,13 @@ /**\class ModelAPI_Entity * \ingroup DataModel * \brief Represents a common parent class for Objects and documents. - * Provided in order to make possible distingiushing of objects and documents + * Provided in order to make possible distinguishing of objects and documents * by downcasting of their pointers. */ class ModelAPI_Entity { public: - /// Empty function which is added for virtualisation of the interface + /// Empty function which is added for virtualiation of the interface virtual void emptyFunction() const {} }; diff --git a/src/ModelAPI/ModelAPI_Session.h b/src/ModelAPI/ModelAPI_Session.h index 2f778aa2e..df0e9c519 100644 --- a/src/ModelAPI/ModelAPI_Session.h +++ b/src/ModelAPI/ModelAPI_Session.h @@ -47,7 +47,7 @@ class MODELAPI_EXPORT ModelAPI_Session //! Starts a new operation (opens a transaction) //! \param theId of operation for history (optional) //! \param theAttachedToNested if it is true, it means that this transaction is attached to the nested - //! where it is located and will be commited on the next commit with the nested + //! where it is located and will be committed on the next commit with the nested virtual void startOperation( const std::string& theId = "", const bool theAttachedToNested = false) = 0; //! Finishes the previously started operation (closes the transaction) diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp index 0036afcad..e2bd9b17e 100644 --- a/src/ModuleBase/ModuleBase_IModule.cpp +++ b/src/ModuleBase/ModuleBase_IModule.cpp @@ -115,7 +115,7 @@ ModuleBase_Operation* ModuleBase_IModule::createOperation(const std::string& the { ModuleBase_OperationFeature* aFOperation = dynamic_cast (getNewOperation(theFeatureId)); - // If the operation is launched as sub-operation of another then we have to initialise + // If the operation is launched as sub-operation of another then we have to initialize // parent feature ModuleBase_OperationFeature* aCurOperation = dynamic_cast (myWorkshop->currentOperation()); diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h index 45b57d67f..327bb4230 100644 --- a/src/ModuleBase/ModuleBase_IModule.h +++ b/src/ModuleBase/ModuleBase_IModule.h @@ -35,7 +35,7 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject public: /// Constructor - /// \param theParent instance of workshop intrface + /// \param theParent instance of workshop interface ModuleBase_IModule(ModuleBase_IWorkshop* theParent); virtual ~ModuleBase_IModule() {} @@ -82,13 +82,13 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject /// \param theOperation a started operation virtual ModuleBase_Operation* currentOperation() const = 0; - /// Add menu atems for viewer into the given menu + /// Add menu items for viewer into the given menu /// \param theMenu a popup menu to be shown in the viewer /// \param theStdActions a map of standard actions /// \return true if items are added and there is no necessity to provide standard menu virtual bool addViewerMenu(QMenu* theMenu, const QMap& theStdActions) const { return false; } - /// Add menu atems for object browser into the given menu + /// Add menu items for object browser into the given menu /// \param theMenu a popup menu to be shown in the object browser virtual void addObjectBrowserMenu(QMenu* theMenu) const {}; @@ -98,7 +98,7 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject /// Creates custom widgets for property panel /// \param theType a type of widget /// \param theParent the parent object - /// \param theWidgetApi the widget configuation. The attribute of the model widget is obtained from + /// \param theWidgetApi the widget configuration. The attribute of the model widget is obtained from /// \param theParentId is Id of a parent of the current attribute /// \param theModelWidgets list of widget objects virtual ModuleBase_ModelWidget* createWidgetByType(const std::string& theType, QWidget* theParent, @@ -120,10 +120,10 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject //! Returns True if there are available Redos and there is not an active operation virtual bool canRedo() const; - /// Returnas true if the action can be applyed to the object + /// Returns true if the action can be applyed to the object /// \param theObject a checked object /// \param theActionId an identifier of action, to be found in the menu manager like "DELETE_CMD" - /// \return the a booean result + /// \return the a boolean result virtual bool canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const = 0; /// Returns True if the current operation can be committed. By default it is true. @@ -166,12 +166,12 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject * If the object is result with the color attribute value set, it is used, * otherwise the customize is applyed to the object's feature if it is a custom prs * \param theObject an object instance - * \param theUpdateViewer the parameter whether the viewer should be update immediatelly + * \param theUpdateViewer the parameter whether the viewer should be update immediately * \returns true if the object is modified */ virtual bool customizeObject(ObjectPtr theObject, const bool theUpdateViewer); - /// This method is called on object browser creation for customisation of module specific features + /// This method is called on object browser creation for customization of module specific features /// \param theObjectBrowser a pinter on Object Browser widget virtual void customizeObjectBrowser(QWidget* theObjectBrowser) {} @@ -208,7 +208,7 @@ public slots: /// Called on call of command corresponded to a feature virtual void onFeatureTriggered(); - /// Slolt called on object display + /// Slot called on object display /// \param theObject a data object /// \param theAIS a presentation object virtual void onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) {} diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp index 556340b56..80aabe71f 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.cpp +++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp @@ -115,7 +115,7 @@ void ModuleBase_ModelWidget::activate() if (isComputedDefault()) { if (myFeature->compute(myAttributeID)) { restoreValue(); - } + } } else { storeValue(); @@ -180,7 +180,7 @@ bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent) if (getControls().contains(aWidget)) { emit focusInWidget(this); } - } + } // pass the event on to the parent class return QObject::eventFilter(theObject, theEvent); diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h index d09e824c1..bc01dc9a2 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.h +++ b/src/ModuleBase/ModuleBase_ModelWidget.h @@ -215,13 +215,13 @@ protected slots: protected: /// The attribute name of the model feature - std::string myAttributeID; + std::string myAttributeID; /// Name of parent - std::string myParentId; + std::string myParentId; /// A feature which is processing by active operation - FeaturePtr myFeature; + FeaturePtr myFeature; /// Flag which shows that current operation is in editing mode bool myIsEditing; @@ -232,10 +232,10 @@ protected slots: private: /// Value should be computed on execute, like radius for circle's constraint (can not be zero) - bool myIsComputedDefault; - + bool myIsComputedDefault; + /// the default value, which is defined in the XML for this attribute - std::string myDefaultValue; + std::string myDefaultValue; /// the reset state. If it is false, the reset method of the widget is not performed bool myUseReset; diff --git a/src/XGUI/XGUI_ModuleConnector.h b/src/XGUI/XGUI_ModuleConnector.h index 4a2be1a48..27aaa47c8 100644 --- a/src/XGUI/XGUI_ModuleConnector.h +++ b/src/XGUI/XGUI_ModuleConnector.h @@ -17,7 +17,7 @@ class XGUI_Displayer; /** * \ingroup GUI - * Implementation of IWorkshop interface which provides access to Workshop sevices at module level + * Implementation of IWorkshop interface which provides access to Workshop services at module level */ class XGUI_EXPORT XGUI_ModuleConnector : public ModuleBase_IWorkshop { @@ -71,7 +71,7 @@ Q_OBJECT //! \param theId an aborted operation void abortOperation(ModuleBase_Operation* theOperation); - //! Returns AIS opbject by data object + //! Returns AIS object by data object virtual AISObjectPtr findPresentation(const ObjectPtr& theObject) const; //! Returns data object by AIS diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index b5f3d0e02..936057419 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -591,7 +591,7 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) aWidget->setFeature(aFOperation->feature(), isStoreValue); aWidget->enableFocusProcessing(); } - + myPropertyPanel->setModelWidgets(aWidgets); aFOperation->setPropertyPanel(myPropertyPanel); diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h index cddb72f72..91980355a 100644 --- a/src/XGUI/XGUI_Workshop.h +++ b/src/XGUI/XGUI_Workshop.h @@ -149,7 +149,7 @@ Q_OBJECT return myViewerProxy; } - /// Returns the module connectory + /// Returns the module connector /// \returns the instance of connector XGUI_ModuleConnector* moduleConnector() const { @@ -190,7 +190,7 @@ Q_OBJECT //! Show the given features in 3d Viewer void showOnlyObjects(const QObjectPtrList& theList); - /// Set display mode for the given onjects + /// Set display mode for the given objects /// \param theList a list of displayed objects /// \param theMode a mode to set (see \ref XGUI_Displayer) void setDisplayMode(const QObjectPtrList& theList, int theMode); @@ -201,10 +201,10 @@ Q_OBJECT return myModule; } - /// Returns current directory whic contains data files + /// Returns current directory which contains data files QString currentDataDir() const { return myCurrentDir; } - /// Returns current directory whic contains data files + /// Returns current directory which contains data files void setCurrentDataDir(const QString& theDir) { myCurrentDir = theDir; } /** @@ -215,7 +215,7 @@ Q_OBJECT void saveDocument(const QString& theName, std::list& theFileNames); /** - * If there is an active (uncommited) operation shows a prompt to abort it + * If there is an active (uncommitted) operation shows a prompt to abort it * and performs abortion if user agreed. Returns true if * - operation aborted successfully * - there is no active operation @@ -249,7 +249,7 @@ signals: /// Emitted when selection happens in Salome viewer void salomeViewerSelection(); - /// Emitted when error in applivation happens + /// Emitted when error in application happens void errorOccurred(const QString&); //! the signal about the workshop actions states are updated. @@ -271,7 +271,7 @@ signals: /// update history list (undo/redo commands) void updateHistory(); - /// Create a new dokument + /// Create a new document void onNew(); /// Open document from file @@ -314,7 +314,7 @@ signals: void closeDocument(); protected: - /// Sets the granted operations for the parameter operation. Firtsly, it finds the nested features + /// Sets the granted operations for the parameter operation. Firstly, it finds the nested features /// and set them into the operation. Secondly, it asks the module about ids of granted operations. /// \param theOperation an operation void setGrantedFeatures(ModuleBase_Operation* theOperation); @@ -328,7 +328,7 @@ private: /// Display all results //void displayAllResults(); - /// Displau results from document + /// Display results from document /// \param theDoc a document void displayDocumentResults(DocumentPtr theDoc); @@ -347,12 +347,12 @@ private: virtual void onOperationResumed(ModuleBase_Operation* theOperation); /// SLOT, that is called after the operation is stopped. Update workshop state, e.g. - /// hides the property panel and udpate the command status. + /// hides the property panel and update the command status. /// \param theOpertion a stopped operation virtual void onOperationStopped(ModuleBase_Operation* theOperation); /// SLOT, that is called after the operation is committed. - /// \param theOpertion a commmitted operation + /// \param theOpertion a committed operation virtual void onOperationCommitted(ModuleBase_Operation* theOperation); /// SLOT, that is called after the operation is aborted. @@ -368,7 +368,7 @@ private: void onStartWaiting(); /// Called by Ok button clicked in the property panel. Asks the error manager whether - /// the operation can be commited and do it if it returns true. + /// the operation can be committed and do it if it returns true. void onAcceptActionClicked(); /// Listens the corresponded signal from operation manager and send it with the Ok -- 2.39.2