diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 8f187af58b..58f3b30cce 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -996,7 +996,7 @@ bool Application::sendHasMsgToFocusView(const char* pMsg) return false; } -Gui::MDIView* Application::activeView(void) const +Gui::MDIView* Application::activeView() const { if (activeDocument()) return activeDocument()->getActiveView(); @@ -1028,12 +1028,12 @@ void Application::activateView(const Base::Type& type, bool create) } /// Getter for the active view -Gui::Document* Application::activeDocument(void) const +Gui::Document* Application::activeDocument() const { return d->activeDocument; } -Gui::Document* Application::editDocument(void) const +Gui::Document* Application::editDocument() const { return d->editDocument; } @@ -1167,7 +1167,7 @@ void Application::detachView(Gui::BaseView* pcView) d->passive.remove(pcView); } -void Application::onUpdate(void) +void Application::onUpdate() { // update all documents std::map::iterator It; @@ -1197,7 +1197,7 @@ void Application::viewActivated(MDIView* pcView) } -void Application::updateActive(void) +void Application::updateActive() { activeDocument()->onUpdate(); } @@ -1548,7 +1548,7 @@ QString Application::workbenchMenuText(const QString& wb) const return QString(); } -QStringList Application::workbenches(void) const +QStringList Application::workbenches() const { // If neither 'HiddenWorkbench' nor 'ExtraWorkbench' is set then all workbenches are returned. const std::map& config = App::Application::Config(); @@ -1638,22 +1638,22 @@ void Application::setupContextMenu(const char* recipient, MenuItem* items) const } } -bool Application::isClosing(void) +bool Application::isClosing() { return d->isClosing; } -MacroManager *Application::macroManager(void) +MacroManager *Application::macroManager() { return d->macroMngr; } -CommandManager &Application::commandManager(void) +CommandManager &Application::commandManager() { return d->commandManager; } -Gui::PreferencePackManager* Application::prefPackManager(void) +Gui::PreferencePackManager* Application::prefPackManager() { return d->prefPackManager; } @@ -1735,7 +1735,7 @@ static void init_resources() Q_INIT_RESOURCE(translation); } -void Application::initApplication(void) +void Application::initApplication() { static bool init = false; if (init) { @@ -1757,7 +1757,7 @@ void Application::initApplication(void) } } -void Application::initTypes(void) +void Application::initTypes() { // views Gui::BaseView ::init(); @@ -1827,7 +1827,7 @@ void Application::initTypes(void) (ViewProviderDocumentObject::getClassTypeId()); } -void Application::initOpenInventor(void) +void Application::initOpenInventor() { // init the Inventor subsystem SoDB::init(); @@ -1835,12 +1835,12 @@ void Application::initOpenInventor(void) SoFCDB::init(); } -void Application::runInitGuiScript(void) +void Application::runInitGuiScript() { Base::Interpreter().runString(Base::ScriptFactory().ProduceScript("FreeCADGuiInit")); } -void Application::runApplication(void) +void Application::runApplication() { const std::map& cfg = App::Application::Config(); std::map::const_iterator it; diff --git a/src/Gui/Application.h b/src/Gui/Application.h index 6a740791a1..36980a4bad 100644 --- a/src/Gui/Application.h +++ b/src/Gui/Application.h @@ -89,9 +89,9 @@ public: /// get called if a view gets activated, this manage the whole activation scheme void viewActivated(Gui::MDIView* pcView); /// call update to all documents and all views (costly!) - void onUpdate(void); + void onUpdate(); /// call update to all views of the active document - void updateActive(void); + void updateActive(); /// call update to all command actions void updateActions(bool delay = false); //@} @@ -160,11 +160,11 @@ public: /// message when a GuiDocument is about to vanish void onLastWindowClosed(Gui::Document* pcDoc); /// Getter for the active document - Gui::Document* activeDocument(void) const; + Gui::Document* activeDocument() const; /// Set the active document void setActiveDocument(Gui::Document* pcDocument); /// Getter for the editing document - Gui::Document* editDocument(void) const; + Gui::Document* editDocument() const; Gui::MDIView* editViewOfNode(SoNode *node) const; /// Set editing document, which will reset editing of all other document void setEditDocument(Gui::Document* pcDocument); @@ -177,7 +177,7 @@ public: */ Gui::Document* getDocument(const App::Document* pDoc) const; /// Getter for the active view of the active document or null - Gui::MDIView* activeView(void) const; + Gui::MDIView* activeView() const; /// Activate a view of the given type of the active document void activateView(const Base::Type&, bool create=false); /// Shows the associated view provider of the given object @@ -189,7 +189,7 @@ public: //@} /// true when the application shutting down - bool isClosing(void); + bool isClosing(); void checkForPreviousCrashes(); /** @name workbench handling */ @@ -199,7 +199,7 @@ public: QPixmap workbenchIcon(const QString&) const; QString workbenchToolTip(const QString&) const; QString workbenchMenuText(const QString&) const; - QStringList workbenches(void) const; + QStringList workbenches() const; void setupContextMenu(const char* recipient, MenuItem*) const; //@} @@ -212,24 +212,24 @@ public: /** @name User Commands */ //@{ /// Get macro manager - Gui::MacroManager *macroManager(void); + Gui::MacroManager *macroManager(); /// Reference to the command manager - Gui::CommandManager &commandManager(void); + Gui::CommandManager &commandManager(); /// helper which create the commands void createStandardOperations(); //@} - Gui::PreferencePackManager* prefPackManager(void); + Gui::PreferencePackManager* prefPackManager(); /** @name Init, Destruct an Access methods */ //@{ /// some kind of singleton static Application* Instance; - static void initApplication(void); - static void initTypes(void); - static void initOpenInventor(void); - static void runInitGuiScript(void); - static void runApplication(void); + static void initApplication(); + static void initTypes(); + static void initOpenInventor(); + static void runInitGuiScript(); + static void runApplication(); void tryClose( QCloseEvent * e ); //@} diff --git a/src/Gui/AutoSaver.cpp b/src/Gui/AutoSaver.cpp index 21d9d92ca8..634664f52a 100644 --- a/src/Gui/AutoSaver.cpp +++ b/src/Gui/AutoSaver.cpp @@ -360,7 +360,7 @@ private: } -void RecoveryWriter::writeFiles(void) +void RecoveryWriter::writeFiles() { // use a while loop because it is possible that while // processing the files new ones can be added diff --git a/src/Gui/AutoSaver.h b/src/Gui/AutoSaver.h index 41944c91c1..dafaa73b27 100644 --- a/src/Gui/AutoSaver.h +++ b/src/Gui/AutoSaver.h @@ -110,7 +110,7 @@ public: always returns true. */ virtual bool shouldWrite(const std::string&, const Base::Persistence *) const; - virtual void writeFiles(void); + virtual void writeFiles(); private: AutoSaveProperty& saver; diff --git a/src/Gui/AxisOriginPyImp.cpp b/src/Gui/AxisOriginPyImp.cpp index c3aa997fa0..78d7f2345e 100644 --- a/src/Gui/AxisOriginPyImp.cpp +++ b/src/Gui/AxisOriginPyImp.cpp @@ -45,7 +45,7 @@ int AxisOriginPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) // returns a string which represent the object e.g. when printed in python -std::string AxisOriginPy::representation(void) const +std::string AxisOriginPy::representation() const { return ""; } @@ -175,7 +175,7 @@ void AxisOriginPy::setLabels(Py::Dict dict) getAxisOriginPtr()->setLabels(labels); } -Py::Object AxisOriginPy::getNode(void) const +Py::Object AxisOriginPy::getNode() const { SoGroup* node = getAxisOriginPtr()->getNode(); PyObject* Ptr = Base::Interpreter().createSWIGPointerObj("pivy.coin","SoGroup *", node, 1); diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp index fb9e8138bc..d8fecc9cf5 100644 --- a/src/Gui/BitmapFactory.cpp +++ b/src/Gui/BitmapFactory.cpp @@ -89,7 +89,7 @@ public: BitmapFactoryInst* BitmapFactoryInst::_pcSingleton = nullptr; -BitmapFactoryInst& BitmapFactoryInst::instance(void) +BitmapFactoryInst& BitmapFactoryInst::instance() { if (!_pcSingleton) { @@ -113,7 +113,7 @@ BitmapFactoryInst& BitmapFactoryInst::instance(void) return *_pcSingleton; } -void BitmapFactoryInst::destruct (void) +void BitmapFactoryInst::destruct () { if (_pcSingleton) delete _pcSingleton; diff --git a/src/Gui/BitmapFactory.h b/src/Gui/BitmapFactory.h index d4b2e9d003..4d73a4d620 100644 --- a/src/Gui/BitmapFactory.h +++ b/src/Gui/BitmapFactory.h @@ -52,8 +52,8 @@ public: BottomRight /**< Place to the bottom right corner */ }; - static BitmapFactoryInst& instance(void); - static void destruct (void); + static BitmapFactoryInst& instance(); + static void destruct (); /// Adds a path where pixmaps can be found void addPath(const QString& path); @@ -149,7 +149,7 @@ private: }; /// Get the global instance -inline BitmapFactoryInst& BitmapFactory(void) +inline BitmapFactoryInst& BitmapFactory() { return BitmapFactoryInst::instance(); } diff --git a/src/Gui/ComboView.h b/src/Gui/ComboView.h index 408d199368..54c4a5d4a1 100644 --- a/src/Gui/ComboView.h +++ b/src/Gui/ComboView.h @@ -76,7 +76,7 @@ public: */ virtual ~ComboView(); - Gui::TaskView::TaskView *getTaskPanel(void){return taskPanel;} + Gui::TaskView::TaskView *getTaskPanel(){return taskPanel;} QTabWidget* getTabPanel() const { return tabs;} diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp index 37671d96ca..e04d1e3d14 100644 --- a/src/Gui/Command.cpp +++ b/src/Gui/Command.cpp @@ -265,12 +265,12 @@ void Command::addToGroup(ActionGroup* group) group->addAction(_pcAction->findChild()); } -Application *Command::getGuiApplication(void) +Application *Command::getGuiApplication() { return Application::Instance; } -Gui::Document* Command::getActiveGuiDocument(void) const +Gui::Document* Command::getActiveGuiDocument() const { return getGuiApplication()->activeDocument(); } @@ -475,7 +475,7 @@ void Command::_invoke(int id, bool disablelog) #endif } -void Command::testActive(void) +void Command::testActive() { if (!_pcAction) return; @@ -525,7 +525,7 @@ void Command::setEnabled(bool on) // Helper methods //-------------------------------------------------------------------------- -bool Command::hasActiveDocument(void) const +bool Command::hasActiveDocument() const { return getActiveGuiDocument() != nullptr; } @@ -535,7 +535,7 @@ bool Command::hasObject(const char* Name) return getDocument() != nullptr && getDocument()->getObject(Name) != nullptr; } -Gui::SelectionSingleton& Command::getSelection(void) +Gui::SelectionSingleton& Command::getSelection() { return Gui::Selection(); } @@ -607,17 +607,17 @@ void Command::openCommand(const char* sCmdName) App::GetApplication().setActiveTransaction(sCmdName); } -void Command::commitCommand(void) +void Command::commitCommand() { App::GetApplication().closeActiveTransaction(); } -void Command::abortCommand(void) +void Command::abortCommand() { App::GetApplication().closeActiveTransaction(true); } -bool Command::hasPendingCommand(void) +bool Command::hasPendingCommand() { return !!App::GetApplication().getActiveTransaction(); } @@ -819,13 +819,13 @@ const std::string Command::strToPython(const char* Str) } /// Updates the (active) document (propagate changes) -void Command::updateActive(void) +void Command::updateActive() { WaitCursor wc; doCommand(App,"App.ActiveDocument.recompute()"); } -bool Command::isActiveObjectValid(void) +bool Command::isActiveObjectValid() { Gui::Document* active = Gui::Application::Instance->activeDocument(); assert(active); @@ -852,7 +852,7 @@ void Command::updateAll(std::list cList) //-------------------------------------------------------------------------- /// returns the begin of a online help page -const char * Command::beginCmdHelp(void) +const char * Command::beginCmdHelp() { return "\n" "\n" @@ -864,7 +864,7 @@ const char * Command::beginCmdHelp(void) } /// returns the end of a online help page -const char * Command::endCmdHelp(void) +const char * Command::endCmdHelp() { return "\n\n"; } @@ -983,7 +983,7 @@ void Command::printConflictingAccelerators() const Base::Console().Warning("Accelerator conflict between %s (%s) and %s (%s)\n", sName, sAccel, cmd->sName, cmd->sAccel); } -Action * Command::createAction(void) +Action * Command::createAction() { Action *pcAction; pcAction = new Action(this,getMainWindow()); @@ -1030,7 +1030,7 @@ Command *GroupCommand::addCommand(const char *name) { return cmd; } -Action * GroupCommand::createAction(void) { +Action * GroupCommand::createAction() { ActionGroup* pcAction = new ActionGroup(this, getMainWindow()); pcAction->setMenuRole(QAction::NoRole); pcAction->setDropDownMenu(true); @@ -1145,7 +1145,7 @@ void MacroCommand::activated(int iMsg) } } -Action * MacroCommand::createAction(void) +Action * MacroCommand::createAction() { Action *pcAction; pcAction = new Action(this,getMainWindow()); @@ -1315,7 +1315,7 @@ void PythonCommand::activated(int iMsg) } } -bool PythonCommand::isActive(void) +bool PythonCommand::isActive() { try { Base::PyGILStateLocker lock; @@ -1345,7 +1345,7 @@ void PythonCommand::languageChange() } } -const char* PythonCommand::getHelpUrl(void) const +const char* PythonCommand::getHelpUrl() const { PyObject* pcTemp; pcTemp = Interpreter().runMethodObject(_pcPyCommand, "CmdHelpURL"); @@ -1356,7 +1356,7 @@ const char* PythonCommand::getHelpUrl(void) const return PyUnicode_AsUTF8(pcTemp); } -Action * PythonCommand::createAction(void) +Action * PythonCommand::createAction() { QAction* qtAction = new QAction(nullptr); Action *pcAction; @@ -1523,7 +1523,7 @@ void PythonGroupCommand::activated(int iMsg) } } -bool PythonGroupCommand::isActive(void) +bool PythonGroupCommand::isActive() { try { Base::PyGILStateLocker lock; @@ -1547,7 +1547,7 @@ bool PythonGroupCommand::isActive(void) return true; } -Action * PythonGroupCommand::createAction(void) +Action * PythonGroupCommand::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(hasDropDownMenu()); @@ -1657,7 +1657,7 @@ void PythonGroupCommand::languageChange() } } -const char* PythonGroupCommand::getHelpUrl(void) const +const char* PythonGroupCommand::getHelpUrl() const { return ""; } @@ -1834,7 +1834,7 @@ std::vector CommandManager::getModuleCommands(const char *sModName) c return vCmds; } -std::vector CommandManager::getAllCommands(void) const +std::vector CommandManager::getAllCommands() const { std::vector vCmds; @@ -1871,7 +1871,7 @@ void CommandManager::runCommandByName (const char* sName) const pCmd->invoke(0); } -void CommandManager::testActive(void) +void CommandManager::testActive() { for ( std::map::iterator It= _sCommands.begin();It!=_sCommands.end();++It) { It->second->testActive(); diff --git a/src/Gui/Command.h b/src/Gui/Command.h index c24b641551..63a38fb419 100644 --- a/src/Gui/Command.h +++ b/src/Gui/Command.h @@ -213,15 +213,15 @@ class SelectionSingleton; class MDIView; -void CreateStdCommands(void); -void CreateDocCommands(void); -void CreateFeatCommands(void); -void CreateMacroCommands(void); -void CreateViewStdCommands(void); -void CreateWindowStdCommands(void); -void CreateStructureCommands(void); -void CreateTestCommands(void); -void CreateLinkCommands(void); +void CreateStdCommands(); +void CreateDocCommands(); +void CreateFeatCommands(); +void CreateMacroCommands(); +void CreateViewStdCommands(); +void CreateWindowStdCommands(); +void CreateStructureCommands(); +void CreateTestCommands(); +void CreateLinkCommands(); /** The CommandBase class @@ -246,7 +246,7 @@ public: //@{ protected: /// Creates the used Action when adding to a widget. The default implementation does nothing. - virtual Action * createAction(void); + virtual Action * createAction(); public: /// Reassigns QAction stuff after the language has changed. @@ -323,7 +323,7 @@ protected: /// Methods which gets called when activated, needs to be reimplemented! virtual void activated(int iMsg)=0; /// Creates the used Action - virtual Action * createAction(void); + virtual Action * createAction(); /// Applies the menu text, tool and status tip to the passed action object void applyCommandData(const char* context, Action* ); const char* keySequenceToAccel(int) const; @@ -336,9 +336,9 @@ public: /// CommandManager is a friend friend class CommandManager; /// Override this method if your Cmd is not always active - virtual bool isActive(void){return true;} + virtual bool isActive(){return true;} /// Get somtile called to check the state of the command - void testActive(void); + void testActive(); /// Enables or disables the command void setEnabled(bool); /// (Re)Create the text for the tooltip (for example, when the shortcut is changed) @@ -372,11 +372,11 @@ public: /** @name Helper methods to get important classes */ //@{ /// Get pointer to the Application Window - static Application* getGuiApplication(void); + static Application* getGuiApplication(); /// Get a reference to the selection - static Gui::SelectionSingleton& getSelection(void); + static Gui::SelectionSingleton& getSelection(); /// Get pointer to the active gui document - Gui::Document* getActiveGuiDocument(void) const; + Gui::Document* getActiveGuiDocument() const; /** Get pointer to the named or active App document * Returns a pointer to the named document or the active * document when no name is given. NULL is returned @@ -407,17 +407,17 @@ public: /// Open a new Undo transaction on the active document static void openCommand(const char* sName=nullptr); /// Commit the Undo transaction on the active document - static void commitCommand(void); + static void commitCommand(); /// Abort the Undo transaction on the active document - static void abortCommand(void); + static void abortCommand(); /// Check if an Undo transaction is open on the active document - static bool hasPendingCommand(void); + static bool hasPendingCommand(); /// Updates the (active) document (propagate changes) - static void updateActive(void); + static void updateActive(); /// Updates the (all or listed) documents (propagate changes) static void updateAll(std::list cList); /// Checks if the active object of the active document is valid - static bool isActiveObjectValid(void); + static bool isActiveObjectValid(); /// Translate command void languageChange(); /// Updates the QAction with respect to the passed mode. @@ -539,17 +539,17 @@ public: /** @name Helper methods to generate help pages */ //@{ /// returns the begin of a online help page - const char * beginCmdHelp(void); + const char * beginCmdHelp(); /// returns the end of a online help page - const char * endCmdHelp(void); + const char * endCmdHelp(); /// Get the help URL - virtual const char* getHelpUrl(void) const { return sHelpUrl; } + virtual const char* getHelpUrl() const { return sHelpUrl; } //@} /** @name Helper methods for the Active tests */ //@{ /// true when there is a document - bool hasActiveDocument(void) const; + bool hasActiveDocument() const; /// true when there is a document and a Feature with Name bool hasObject(const char* Name); //@} @@ -557,7 +557,7 @@ public: /** @name checking of internal state */ //@{ /// returns the name to which the command belongs - const char* getAppModuleName(void) const {return sAppModule;} + const char* getAppModuleName() const {return sAppModule;} void setAppModuleName(const char*); /// Get the command name const char* getName() const { return sName; } @@ -643,7 +643,7 @@ public: protected: virtual void activated(int iMsg); - virtual Gui::Action * createAction(void); + virtual Gui::Action * createAction(); virtual void languageChange(); void setup(Action *); @@ -673,11 +673,11 @@ protected: /// Method which gets called when activated virtual void activated(int iMsg); /// if the command is not always active - virtual bool isActive(void); + virtual bool isActive(); /// Get the help URL - const char* getHelpUrl(void) const; + const char* getHelpUrl() const; /// Creates the used Action - virtual Action * createAction(void); + virtual Action * createAction(); //@} public: @@ -724,11 +724,11 @@ protected: /// Method which gets called when activated virtual void activated(int iMsg); /// if the command is not always active - virtual bool isActive(void); + virtual bool isActive(); /// Get the help URL - const char* getHelpUrl(void) const; + const char* getHelpUrl() const; /// Creates the used Action - virtual Action * createAction(void); + virtual Action * createAction(); //@} public: @@ -779,7 +779,7 @@ protected: /// Method which get called when activated void activated(int iMsg); /// Creates the used Action - Action * createAction(void); + Action * createAction(); //@} public: @@ -845,7 +845,7 @@ public: * of a special app module use GetModuleCommands() * @see Command */ - std::vector getAllCommands(void) const; + std::vector getAllCommands() const; /** Returns all commands of a group * delivers a vector of all commands in the given group. @@ -866,7 +866,7 @@ public: /// method is OBSOLETE use GetModuleCommands() or GetAllCommands() const std::map& getCommands() const { return _sCommands; } /// get frequently called by the AppWnd to check the commands are active. - void testActive(void); + void testActive(); void addCommandMode(const char* sContext, const char* sName); void updateCommands(const char* sContext, int mode); diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 7bdd660d0e..c1045bdba1 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -242,7 +242,7 @@ void StdCmdImport::activated(int iMsg) } } -bool StdCmdImport::isActive(void) +bool StdCmdImport::isActive() { return (getActiveGuiDocument() ? true : false); } @@ -490,7 +490,7 @@ void StdCmdExport::activated(int iMsg) } } -bool StdCmdExport::isActive(void) +bool StdCmdExport::isActive() { return (getActiveGuiDocument() ? true : false); } @@ -543,7 +543,7 @@ void StdCmdMergeProjects::activated(int iMsg) } } -bool StdCmdMergeProjects::isActive(void) +bool StdCmdMergeProjects::isActive() { return this->hasActiveDocument(); } @@ -576,7 +576,7 @@ void StdCmdDependencyGraph::activated(int iMsg) getMainWindow()->addWindow(view); } -bool StdCmdDependencyGraph::isActive(void) +bool StdCmdDependencyGraph::isActive() { return (getActiveGuiDocument() ? true : false); } @@ -637,7 +637,7 @@ void StdCmdSave::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"Save\")"); } -bool StdCmdSave::isActive(void) +bool StdCmdSave::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Save"); } @@ -666,7 +666,7 @@ void StdCmdSaveAs::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"SaveAs\")"); } -bool StdCmdSaveAs::isActive(void) +bool StdCmdSaveAs::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SaveAs"); } @@ -693,7 +693,7 @@ void StdCmdSaveCopy::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"SaveCopy\")"); } -bool StdCmdSaveCopy::isActive(void) +bool StdCmdSaveCopy::isActive() { return ( getActiveGuiDocument() ? true : false ); } @@ -720,7 +720,7 @@ void StdCmdSaveAll::activated(int iMsg) Gui::Document::saveAll(); } -bool StdCmdSaveAll::isActive(void) +bool StdCmdSaveAll::isActive() { return ( getActiveGuiDocument() ? true : false ); } @@ -758,7 +758,7 @@ void StdCmdRevert::activated(int iMsg) doCommand(Command::App,"App.ActiveDocument.restore()"); } -bool StdCmdRevert::isActive(void) +bool StdCmdRevert::isActive() { return ( getActiveGuiDocument() ? true : false ); } @@ -788,7 +788,7 @@ void StdCmdProjectInfo::activated(int iMsg) dlg.exec(); } -bool StdCmdProjectInfo::isActive(void) +bool StdCmdProjectInfo::isActive() { return ( getActiveGuiDocument() ? true : false ); } @@ -818,7 +818,7 @@ void StdCmdProjectUtil::activated(int iMsg) dlg.exec(); } -bool StdCmdProjectUtil::isActive(void) +bool StdCmdProjectUtil::isActive() { return true; } @@ -850,7 +850,7 @@ void StdCmdPrint::activated(int iMsg) } } -bool StdCmdPrint::isActive(void) +bool StdCmdPrint::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Print"); } @@ -880,7 +880,7 @@ void StdCmdPrintPreview::activated(int iMsg) } } -bool StdCmdPrintPreview::isActive(void) +bool StdCmdPrintPreview::isActive() { return getGuiApplication()->sendHasMsgToActiveView("PrintPreview"); } @@ -911,7 +911,7 @@ void StdCmdPrintPdf::activated(int iMsg) } } -bool StdCmdPrintPdf::isActive(void) +bool StdCmdPrintPdf::isActive() { return getGuiApplication()->sendHasMsgToActiveView("PrintPdf"); } @@ -968,12 +968,12 @@ void StdCmdUndo::activated(int iMsg) getGuiApplication()->sendMsgToActiveView("Undo"); } -bool StdCmdUndo::isActive(void) +bool StdCmdUndo::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Undo"); } -Action * StdCmdUndo::createAction(void) +Action * StdCmdUndo::createAction() { Action *pcAction; @@ -1012,12 +1012,12 @@ void StdCmdRedo::activated(int iMsg) getGuiApplication()->sendMsgToActiveView("Redo"); } -bool StdCmdRedo::isActive(void) +bool StdCmdRedo::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Redo"); } -Action * StdCmdRedo::createAction(void) +Action * StdCmdRedo::createAction() { Action *pcAction; @@ -1053,7 +1053,7 @@ void StdCmdCut::activated(int iMsg) getGuiApplication()->sendMsgToActiveView("Cut"); } -bool StdCmdCut::isActive(void) +bool StdCmdCut::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Cut"); } @@ -1086,7 +1086,7 @@ void StdCmdCopy::activated(int iMsg) } } -bool StdCmdCopy::isActive(void) +bool StdCmdCopy::isActive() { if (getGuiApplication()->sendHasMsgToFocusView("Copy")) return true; @@ -1124,7 +1124,7 @@ void StdCmdPaste::activated(int iMsg) } } -bool StdCmdPaste::isActive(void) +bool StdCmdPaste::isActive() { if (getGuiApplication()->sendHasMsgToFocusView("Paste")) return true; @@ -1215,7 +1215,7 @@ void StdCmdDuplicateSelection::activated(int iMsg) fi.deleteFile(); } -bool StdCmdDuplicateSelection::isActive(void) +bool StdCmdDuplicateSelection::isActive() { return Gui::Selection().hasSelection(); } @@ -1247,7 +1247,7 @@ void StdCmdSelectAll::activated(int iMsg) rSel.setSelection(doc->getName(), objs); } -bool StdCmdSelectAll::isActive(void) +bool StdCmdSelectAll::isActive() { return App::GetApplication().getActiveDocument() != nullptr; } @@ -1390,7 +1390,7 @@ void StdCmdDelete::activated(int iMsg) Gui::getMainWindow()->update(); } -bool StdCmdDelete::isActive(void) +bool StdCmdDelete::isActive() { return !Selection().getCompleteSelection().empty(); } @@ -1444,7 +1444,7 @@ void StdCmdRefresh::activated(int iMsg) } } -bool StdCmdRefresh::isActive(void) +bool StdCmdRefresh::isActive() { return this->getDocument() && this->getDocument()->mustExecute(); } @@ -1470,7 +1470,7 @@ void StdCmdTransform::activated(int iMsg) Gui::Control().showDialog(new Gui::Dialog::TaskTransform()); } -bool StdCmdTransform::isActive(void) +bool StdCmdTransform::isActive() { return (Gui::Control().activeDialog() == nullptr); } @@ -1504,7 +1504,7 @@ void StdCmdPlacement::activated(int iMsg) Gui::Control().showDialog(plm); } -bool StdCmdPlacement::isActive(void) +bool StdCmdPlacement::isActive() { return Gui::Selection().countObjectsOfType(App::GeoFeature::getClassTypeId()) >= 1; } @@ -1538,7 +1538,7 @@ void StdCmdTransformManip::activated(int iMsg) getActiveGuiDocument()->setEdit(vp, Gui::ViewProvider::Transform); } -bool StdCmdTransformManip::isActive(void) +bool StdCmdTransformManip::isActive() { return Gui::Selection().countObjectsOfType(App::GeoFeature::getClassTypeId()) == 1; } @@ -1606,7 +1606,7 @@ void StdCmdAlignment::activated(int iMsg) Gui::Selection().clearSelection(); } -bool StdCmdAlignment::isActive(void) +bool StdCmdAlignment::isActive() { if (ManualAlignment::hasInstance()) return false; @@ -1648,7 +1648,7 @@ void StdCmdEdit::activated(int iMsg) } } -bool StdCmdEdit::isActive(void) +bool StdCmdEdit::isActive() { return (!Selection().getCompleteSelection().empty()) || (Gui::Control().activeDialog() != nullptr); } @@ -1705,7 +1705,7 @@ protected: copyExpressions(objs); } - virtual Gui::Action * createAction(void) { + virtual Gui::Action * createAction() { ActionGroup* pcAction = new ActionGroup(this, getMainWindow()); pcAction->setDropDownMenu(true); applyCommandData(this->className(), pcAction); @@ -1874,7 +1874,7 @@ protected: namespace Gui { -void CreateDocCommands(void) +void CreateDocCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp index 25e8648ea3..79f7a0bef7 100644 --- a/src/Gui/CommandFeat.cpp +++ b/src/Gui/CommandFeat.cpp @@ -110,7 +110,7 @@ void StdCmdRandomColor::activated(int iMsg) } } -bool StdCmdRandomColor::isActive(void) +bool StdCmdRandomColor::isActive() { return (Gui::Selection().size() != 0); } @@ -135,7 +135,7 @@ StdCmdSendToPythonConsole::StdCmdSendToPythonConsole() sAccel = "Ctrl+Shift+P"; } -bool StdCmdSendToPythonConsole::isActive(void) +bool StdCmdSendToPythonConsole::isActive() { //active only if either 1 object is selected or multiple subobjects from the same object return Gui::Selection().getSelectionEx().size() == 1; @@ -211,7 +211,7 @@ void StdCmdSendToPythonConsole::activated(int iMsg) namespace Gui { -void CreateFeatCommands(void) +void CreateFeatCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/CommandLink.cpp b/src/Gui/CommandLink.cpp index aff832f92a..dfa2b5013a 100644 --- a/src/Gui/CommandLink.cpp +++ b/src/Gui/CommandLink.cpp @@ -65,8 +65,8 @@ public: protected: virtual void activated(int iMsg); - virtual bool isActive(void); - virtual Action * createAction(void); + virtual bool isActive(); + virtual Action * createAction(); virtual void languageChange(); }; @@ -86,7 +86,7 @@ bool StdCmdLinkMakeGroup::isActive() { return !!App::GetApplication().getActiveDocument(); } -Action * StdCmdLinkMakeGroup::createAction(void) +Action * StdCmdLinkMakeGroup::createAction() { ActionGroup* pcAction = new ActionGroup(this, getMainWindow()); pcAction->setDropDownMenu(true); @@ -895,7 +895,7 @@ public: namespace Gui { -void CreateLinkCommands(void) +void CreateLinkCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); rcCmdMgr.addCommand(new StdCmdLinkMake()); diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp index 8f15186f3d..9313191e55 100644 --- a/src/Gui/CommandMacro.cpp +++ b/src/Gui/CommandMacro.cpp @@ -58,7 +58,7 @@ void StdCmdDlgMacroRecord::activated(int iMsg) cDlg.exec(); } -bool StdCmdDlgMacroRecord::isActive(void) +bool StdCmdDlgMacroRecord::isActive() { return ! (getGuiApplication()->macroManager()->isOpen()); } @@ -86,7 +86,7 @@ void StdCmdMacroStopRecord::activated(int iMsg) getGuiApplication()->macroManager()->commit(); } -bool StdCmdMacroStopRecord::isActive(void) +bool StdCmdMacroStopRecord::isActive() { return getGuiApplication()->macroManager()->isOpen(); } @@ -115,7 +115,7 @@ void StdCmdDlgMacroExecute::activated(int iMsg) cDlg.exec(); } -bool StdCmdDlgMacroExecute::isActive(void) +bool StdCmdDlgMacroExecute::isActive() { return ! (getGuiApplication()->macroManager()->isOpen()); } @@ -144,7 +144,7 @@ void StdCmdDlgMacroExecuteDirect::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"Run\")"); } -bool StdCmdDlgMacroExecuteDirect::isActive(void) +bool StdCmdDlgMacroExecuteDirect::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Run"); } @@ -169,7 +169,7 @@ void StdCmdMacroAttachDebugger::activated(int iMsg) "RemoteDebugger.attachToRemoteDebugger()"); } -bool StdCmdMacroAttachDebugger::isActive(void) +bool StdCmdMacroAttachDebugger::isActive() { return true; } @@ -199,7 +199,7 @@ void StdCmdMacroStartDebug::activated(int iMsg) dbg->stepRun(); } -bool StdCmdMacroStartDebug::isActive(void) +bool StdCmdMacroStartDebug::isActive() { return getGuiApplication()->sendHasMsgToActiveView("StartDebug"); } @@ -225,7 +225,7 @@ void StdCmdMacroStopDebug::activated(int iMsg) Application::Instance->macroManager()->debugger()->tryStop(); } -bool StdCmdMacroStopDebug::isActive(void) +bool StdCmdMacroStopDebug::isActive() { static PythonDebugger* dbg = Application::Instance->macroManager()->debugger(); return dbg->isRunning(); @@ -252,7 +252,7 @@ void StdCmdMacroStepOver::activated(int iMsg) Application::Instance->macroManager()->debugger()->stepOver(); } -bool StdCmdMacroStepOver::isActive(void) +bool StdCmdMacroStepOver::isActive() { static PythonDebugger* dbg = Application::Instance->macroManager()->debugger(); return dbg->isRunning(); @@ -279,7 +279,7 @@ void StdCmdMacroStepInto::activated(int iMsg) Application::Instance->macroManager()->debugger()->stepInto(); } -bool StdCmdMacroStepInto::isActive(void) +bool StdCmdMacroStepInto::isActive() { static PythonDebugger* dbg = Application::Instance->macroManager()->debugger(); return dbg->isRunning(); @@ -306,14 +306,14 @@ void StdCmdToggleBreakpoint::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"ToggleBreakpoint\")"); } -bool StdCmdToggleBreakpoint::isActive(void) +bool StdCmdToggleBreakpoint::isActive() { return getGuiApplication()->sendHasMsgToActiveView("ToggleBreakpoint"); } namespace Gui { -void CreateMacroCommands(void) +void CreateMacroCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); rcCmdMgr.addCommand(new StdCmdDlgMacroRecord()); diff --git a/src/Gui/CommandPyImp.cpp b/src/Gui/CommandPyImp.cpp index 03a3d219c3..133615b53c 100644 --- a/src/Gui/CommandPyImp.cpp +++ b/src/Gui/CommandPyImp.cpp @@ -39,7 +39,7 @@ // returns a string which represents the object e.g. when printed in python -std::string CommandPy::representation(void) const +std::string CommandPy::representation() const { return std::string(""); } diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index bf4a844336..96f6818f35 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -102,12 +102,12 @@ void StdCmdWorkbench::activated(int i) } } -bool StdCmdWorkbench::isActive(void) +bool StdCmdWorkbench::isActive() { return true; } -Action * StdCmdWorkbench::createAction(void) +Action * StdCmdWorkbench::createAction() { Action *pcAction; @@ -152,7 +152,7 @@ void StdCmdRecentFiles::activated(int iMsg) /** * Creates the QAction object containing the recent files. */ -Action * StdCmdRecentFiles::createAction(void) +Action * StdCmdRecentFiles::createAction() { RecentFilesAction* pcAction = new RecentFilesAction(this, getMainWindow()); pcAction->setObjectName(QLatin1String("recentFiles")); @@ -192,7 +192,7 @@ void StdCmdRecentMacros::activated(int iMsg) /** * Creates the QAction object containing the recent macros. */ -Action * StdCmdRecentMacros::createAction(void) +Action * StdCmdRecentMacros::createAction() { RecentMacrosAction* pcAction = new RecentMacrosAction(this, getMainWindow()); pcAction->setObjectName(QLatin1String("recentMacros")); @@ -218,7 +218,7 @@ StdCmdAbout::StdCmdAbout() eType = 0; } -Action * StdCmdAbout::createAction(void) +Action * StdCmdAbout::createAction() { Action *pcAction; @@ -356,7 +356,7 @@ StdCmdDlgPreferences::StdCmdDlgPreferences() eType = 0; } -Action * StdCmdDlgPreferences::createAction(void) +Action * StdCmdDlgPreferences::createAction() { Action *pcAction = Command::createAction(); pcAction->setMenuRole(QAction::PreferencesRole); @@ -803,7 +803,7 @@ void StdCmdTextDocument::activated(int iMsg) commitCommand(); } -bool StdCmdTextDocument::isActive(void) +bool StdCmdTextDocument::isActive() { return hasActiveDocument(); } @@ -845,8 +845,8 @@ public: void updateIcon(int mode); protected: virtual void activated(int iMsg); - virtual bool isActive(void); - virtual Gui::Action * createAction(void); + virtual bool isActive(); + virtual Gui::Action * createAction(); }; StdCmdUserEditMode::StdCmdUserEditMode() @@ -863,7 +863,7 @@ StdCmdUserEditMode::StdCmdUserEditMode() this->getGuiApplication()->signalUserEditModeChanged.connect(boost::bind(&StdCmdUserEditMode::updateIcon, this, bp::_1)); } -Gui::Action * StdCmdUserEditMode::createAction(void) +Gui::Action * StdCmdUserEditMode::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -928,14 +928,14 @@ void StdCmdUserEditMode::activated(int iMsg) Gui::Application::Instance->setUserEditMode(iMsg); } -bool StdCmdUserEditMode::isActive(void) +bool StdCmdUserEditMode::isActive() { return true; } namespace Gui { -void CreateStdCommands(void) +void CreateStdCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp index a00c0ed26d..70dcff97eb 100644 --- a/src/Gui/CommandStructure.cpp +++ b/src/Gui/CommandStructure.cpp @@ -75,7 +75,7 @@ void StdCmdPart::activated(int iMsg) updateActive(); } -bool StdCmdPart::isActive(void) +bool StdCmdPart::isActive() { return hasActiveDocument(); } @@ -117,14 +117,14 @@ void StdCmdGroup::activated(int iMsg) gui->signalScrollToObject(*static_cast(vp)); } -bool StdCmdGroup::isActive(void) +bool StdCmdGroup::isActive() { return hasActiveDocument(); } namespace Gui { -void CreateStructureCommands(void) +void CreateStructureCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/CommandTest.cpp b/src/Gui/CommandTest.cpp index 80d4e1428a..769ab0294c 100644 --- a/src/Gui/CommandTest.cpp +++ b/src/Gui/CommandTest.cpp @@ -132,7 +132,7 @@ void FCCmdTest1::activated(int iMsg) Q_UNUSED(iMsg); } -bool FCCmdTest1::isActive(void) +bool FCCmdTest1::isActive() { //return (GetActiveOCCDocument()!=NULL); return true; @@ -160,7 +160,7 @@ void FCCmdTest2::activated(int iMsg) Q_UNUSED(iMsg); } -bool FCCmdTest2::isActive(void) +bool FCCmdTest2::isActive() { return (getDocument() != nullptr); } @@ -190,7 +190,7 @@ void FCCmdTest3::activated(int iMsg) } -bool FCCmdTest3::isActive(void) +bool FCCmdTest3::isActive() { return (getDocument() != nullptr); } @@ -221,7 +221,7 @@ void FCCmdTest4::activated(int iMsg) } -bool FCCmdTest4::isActive(void) +bool FCCmdTest4::isActive() { return (getDocument() != nullptr); } @@ -250,7 +250,7 @@ void FCCmdTest5::activated(int iMsg) return; } -bool FCCmdTest5::isActive(void) +bool FCCmdTest5::isActive() { return (getDocument() != nullptr); } @@ -280,7 +280,7 @@ void FCCmdTest6::activated(int iMsg) return; } -bool FCCmdTest6::isActive(void) +bool FCCmdTest6::isActive() { return (getDocument() != nullptr); } @@ -330,7 +330,7 @@ void CmdTestCmdFuncs::activated(int iMsg) Gui::copyVisualT(objName.c_str(), "DisplayMode", objName.c_str()); } -bool CmdTestCmdFuncs::isActive(void) +bool CmdTestCmdFuncs::isActive() { return (getDocument() != nullptr); } @@ -372,7 +372,7 @@ void CmdTestProgress1::activated(int iMsg) } } -bool CmdTestProgress1::isActive(void) +bool CmdTestProgress1::isActive() { return (!Base::Sequencer().isRunning()); } @@ -415,7 +415,7 @@ void CmdTestProgress2::activated(int iMsg) } } -bool CmdTestProgress2::isActive(void) +bool CmdTestProgress2::isActive() { return ( !Base::Sequencer().isRunning() ); } @@ -485,7 +485,7 @@ void CmdTestProgress3::activated(int iMsg) } } -bool CmdTestProgress3::isActive(void) +bool CmdTestProgress3::isActive() { return ( !Base::Sequencer().isRunning() ); } @@ -540,7 +540,7 @@ void CmdTestProgress4::activated(int iMsg) } } -bool CmdTestProgress4::isActive(void) +bool CmdTestProgress4::isActive() { return (!Base::Sequencer().isRunning()); } @@ -620,7 +620,7 @@ void CmdTestProgress5::activated(int iMsg) thr3->start(); } -bool CmdTestProgress5::isActive(void) +bool CmdTestProgress5::isActive() { return (!Base::Sequencer().isRunning()); } @@ -647,7 +647,7 @@ void CmdTestMDI1::activated(int iMsg) getMainWindow()->removeWindow(mdi); } -bool CmdTestMDI1::isActive(void) +bool CmdTestMDI1::isActive() { return getMainWindow()->activeWindow(); } @@ -675,7 +675,7 @@ void CmdTestMDI2::activated(int iMsg) } } -bool CmdTestMDI2::isActive(void) +bool CmdTestMDI2::isActive() { return getMainWindow()->activeWindow(); } @@ -703,7 +703,7 @@ void CmdTestMDI3::activated(int iMsg) mdi->show(); } -bool CmdTestMDI3::isActive(void) +bool CmdTestMDI3::isActive() { return getMainWindow()->activeWindow(); } @@ -811,7 +811,7 @@ void CmdTestConsoleOutput::activated(int iMsg) namespace Gui { -void CreateTestCommands(void) +void CreateTestCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index f0121404ab..e12a9571cd 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -114,7 +114,7 @@ void StdOrthographicCamera::activated(int iMsg) } } -bool StdOrthographicCamera::isActive(void) +bool StdOrthographicCamera::isActive() { View3DInventor* view = qobject_cast(getMainWindow()->activeWindow()); if (view) { @@ -131,7 +131,7 @@ bool StdOrthographicCamera::isActive(void) return false; } -Action * StdOrthographicCamera::createAction(void) +Action * StdOrthographicCamera::createAction() { Action *pcAction = Command::createAction(); pcAction->setCheckable(true); @@ -164,7 +164,7 @@ void StdPerspectiveCamera::activated(int iMsg) } } -bool StdPerspectiveCamera::isActive(void) +bool StdPerspectiveCamera::isActive() { View3DInventor* view = qobject_cast(getMainWindow()->activeWindow()); if (view) { @@ -182,7 +182,7 @@ bool StdPerspectiveCamera::isActive(void) return false; } -Action * StdPerspectiveCamera::createAction(void) +Action * StdPerspectiveCamera::createAction() { Action *pcAction = Command::createAction(); pcAction->setCheckable(true); @@ -260,8 +260,8 @@ public: protected: virtual void activated(int iMsg); - virtual bool isActive(void); - virtual Action * createAction(void); + virtual bool isActive(); + virtual Action * createAction(); virtual void languageChange(); private: @@ -297,7 +297,7 @@ StdCmdFreezeViews::StdCmdFreezeViews() eType = Alter3DView; } -Action * StdCmdFreezeViews::createAction(void) +Action * StdCmdFreezeViews::createAction() { ActionGroup* pcAction = new ActionGroup(this, getMainWindow()); pcAction->setDropDownMenu(true); @@ -499,7 +499,7 @@ void StdCmdFreezeViews::onRestoreViews() } } -bool StdCmdFreezeViews::isActive(void) +bool StdCmdFreezeViews::isActive() { View3DInventor* view = qobject_cast(getMainWindow()->activeWindow()); if (view) { @@ -556,7 +556,7 @@ StdCmdToggleClipPlane::StdCmdToggleClipPlane() eType = Alter3DView; } -Action * StdCmdToggleClipPlane::createAction(void) +Action * StdCmdToggleClipPlane::createAction() { Action *pcAction = (Action*)Command::createAction(); return pcAction; @@ -574,7 +574,7 @@ void StdCmdToggleClipPlane::activated(int iMsg) } } -bool StdCmdToggleClipPlane::isActive(void) +bool StdCmdToggleClipPlane::isActive() { View3DInventor* view = qobject_cast(getMainWindow()->activeWindow()); return view ? true : false; @@ -593,8 +593,8 @@ public: void updateIcon(const Gui::MDIView* view); protected: virtual void activated(int iMsg); - virtual bool isActive(void); - virtual Gui::Action * createAction(void); + virtual bool isActive(); + virtual Gui::Action * createAction(); }; StdCmdDrawStyle::StdCmdDrawStyle() @@ -611,7 +611,7 @@ StdCmdDrawStyle::StdCmdDrawStyle() this->getGuiApplication()->signalActivateView.connect(boost::bind(&StdCmdDrawStyle::updateIcon, this, bp::_1)); } -Gui::Action * StdCmdDrawStyle::createAction(void) +Gui::Action * StdCmdDrawStyle::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -805,7 +805,7 @@ void StdCmdDrawStyle::activated(int iMsg) } } -bool StdCmdDrawStyle::isActive(void) +bool StdCmdDrawStyle::isActive() { return Gui::Application::Instance->activeDocument(); } @@ -835,7 +835,7 @@ void StdCmdToggleVisibility::activated(int iMsg) Selection().setVisible(SelectionSingleton::VisToggle); } -bool StdCmdToggleVisibility::isActive(void) +bool StdCmdToggleVisibility::isActive() { return (Gui::Selection().size() != 0); } @@ -882,7 +882,7 @@ void StdCmdToggleSelectability::activated(int iMsg) } } -bool StdCmdToggleSelectability::isActive(void) +bool StdCmdToggleSelectability::isActive() { return (Gui::Selection().size() != 0); } @@ -910,7 +910,7 @@ void StdCmdShowSelection::activated(int iMsg) Selection().setVisible(SelectionSingleton::VisShow); } -bool StdCmdShowSelection::isActive(void) +bool StdCmdShowSelection::isActive() { return (Gui::Selection().size() != 0); } @@ -938,7 +938,7 @@ void StdCmdHideSelection::activated(int iMsg) Selection().setVisible(SelectionSingleton::VisHide); } -bool StdCmdHideSelection::isActive(void) +bool StdCmdHideSelection::isActive() { return (Gui::Selection().size() != 0); } @@ -980,7 +980,7 @@ void StdCmdSelectVisibleObjects::activated(int iMsg) rSel.setSelection(app->getName(), visible); } -bool StdCmdSelectVisibleObjects::isActive(void) +bool StdCmdSelectVisibleObjects::isActive() { return App::GetApplication().getActiveDocument(); } @@ -1021,7 +1021,7 @@ void StdCmdToggleObjects::activated(int iMsg) } } -bool StdCmdToggleObjects::isActive(void) +bool StdCmdToggleObjects::isActive() { return App::GetApplication().getActiveDocument(); } @@ -1058,7 +1058,7 @@ void StdCmdShowObjects::activated(int iMsg) } } -bool StdCmdShowObjects::isActive(void) +bool StdCmdShowObjects::isActive() { return App::GetApplication().getActiveDocument(); } @@ -1095,7 +1095,7 @@ void StdCmdHideObjects::activated(int iMsg) } } -bool StdCmdHideObjects::isActive(void) +bool StdCmdHideObjects::isActive() { return App::GetApplication().getActiveDocument(); } @@ -1124,7 +1124,7 @@ void StdCmdSetAppearance::activated(int iMsg) Gui::Control().showDialog(new Gui::Dialog::TaskDisplayProperties()); } -bool StdCmdSetAppearance::isActive(void) +bool StdCmdSetAppearance::isActive() { return (Gui::Control().activeDialog() == nullptr) && (Gui::Selection().size() != 0); @@ -1447,7 +1447,7 @@ void StdCmdViewFitAll::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"ViewFit\")"); } -bool StdCmdViewFitAll::isActive(void) +bool StdCmdViewFitAll::isActive() { //return isViewOfType(Gui::View3DInventor::getClassTypeId()); return getGuiApplication()->sendHasMsgToActiveView("ViewFit"); @@ -1477,7 +1477,7 @@ void StdCmdViewFitSelection::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"ViewSelection\")"); } -bool StdCmdViewFitSelection::isActive(void) +bool StdCmdViewFitSelection::isActive() { return getGuiApplication()->sendHasMsgToActiveView("ViewSelection"); } @@ -1505,7 +1505,7 @@ void StdViewDock::activated(int iMsg) Q_UNUSED(iMsg); } -bool StdViewDock::isActive(void) +bool StdViewDock::isActive() { MDIView* view = getMainWindow()->activeWindow(); return (qobject_cast(view) ? true : false); @@ -1534,7 +1534,7 @@ void StdViewUndock::activated(int iMsg) Q_UNUSED(iMsg); } -bool StdViewUndock::isActive(void) +bool StdViewUndock::isActive() { MDIView* view = getMainWindow()->activeWindow(); return (qobject_cast(view) ? true : false); @@ -1596,7 +1596,7 @@ void StdViewFullscreen::activated(int iMsg) Q_UNUSED(iMsg); } -bool StdViewFullscreen::isActive(void) +bool StdViewFullscreen::isActive() { MDIView* view = getMainWindow()->activeWindow(); return (qobject_cast(view) ? true : false); @@ -1623,7 +1623,7 @@ StdViewDockUndockFullscreen::StdViewDockUndockFullscreen() rcCmdMgr.addCommand(new StdViewFullscreen()); } -Action * StdViewDockUndockFullscreen::createAction(void) +Action * StdViewDockUndockFullscreen::createAction() { ActionGroup* pcAction = new ActionGroup(this, getMainWindow()); pcAction->setDropDownMenu(true); @@ -1693,7 +1693,7 @@ void StdViewDockUndockFullscreen::activated(int iMsg) } } -bool StdViewDockUndockFullscreen::isActive(void) +bool StdViewDockUndockFullscreen::isActive() { MDIView* view = getMainWindow()->activeWindow(); if (qobject_cast(view)) { @@ -1737,7 +1737,7 @@ void StdCmdViewVR::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"ViewVR\")"); } -bool StdCmdViewVR::isActive(void) +bool StdCmdViewVR::isActive() { return getGuiApplication()->sendHasMsgToActiveView("ViewVR"); } @@ -1910,7 +1910,7 @@ void StdViewScreenShot::activated(int iMsg) } } -bool StdViewScreenShot::isActive(void) +bool StdViewScreenShot::isActive() { return isViewOfType(Gui::View3DInventor::getClassTypeId()); } @@ -1940,7 +1940,7 @@ void StdCmdViewCreate::activated(int iMsg) getActiveGuiDocument()->getActiveView()->viewAll(); } -bool StdCmdViewCreate::isActive(void) +bool StdCmdViewCreate::isActive() { return (getActiveGuiDocument() != nullptr); } @@ -1975,7 +1975,7 @@ void StdCmdToggleNavigation::activated(int iMsg) } } -bool StdCmdToggleNavigation::isActive(void) +bool StdCmdToggleNavigation::isActive() { //#0001087: Inventor Navigation continues with released Mouse Button //This happens because 'Esc' is also used to close the task dialog. @@ -2023,7 +2023,7 @@ void StdCmdAxisCross::activated(int iMsg) } } -bool StdCmdAxisCross::isActive(void) +bool StdCmdAxisCross::isActive() { Gui::View3DInventor* view = qobject_cast(Gui::getMainWindow()->activeWindow()); if (view && view->getViewer()->hasAxisCross()) { @@ -2063,7 +2063,7 @@ void StdCmdViewExample1::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"Example1\")"); } -bool StdCmdViewExample1::isActive(void) +bool StdCmdViewExample1::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Example1"); } @@ -2091,7 +2091,7 @@ void StdCmdViewExample2::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"Example2\")"); } -bool StdCmdViewExample2::isActive(void) +bool StdCmdViewExample2::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Example2"); } @@ -2119,7 +2119,7 @@ void StdCmdViewExample3::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"Example3\")"); } -bool StdCmdViewExample3::isActive(void) +bool StdCmdViewExample3::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Example3"); } @@ -2148,7 +2148,7 @@ void StdCmdViewIvStereoOff::activated(int iMsg) doCommand(Command::Gui,"Gui.activeDocument().activeView().setStereoType(\"Mono\")"); } -bool StdCmdViewIvStereoOff::isActive(void) +bool StdCmdViewIvStereoOff::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SetStereoOff"); } @@ -2177,7 +2177,7 @@ void StdCmdViewIvStereoRedGreen::activated(int iMsg) doCommand(Command::Gui,"Gui.activeDocument().activeView().setStereoType(\"Anaglyph\")"); } -bool StdCmdViewIvStereoRedGreen::isActive(void) +bool StdCmdViewIvStereoRedGreen::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SetStereoRedGreen"); } @@ -2205,7 +2205,7 @@ void StdCmdViewIvStereoQuadBuff::activated(int iMsg) doCommand(Command::Gui,"Gui.activeDocument().activeView().setStereoType(\"QuadBuffer\")"); } -bool StdCmdViewIvStereoQuadBuff::isActive(void) +bool StdCmdViewIvStereoQuadBuff::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SetStereoQuadBuff"); } @@ -2233,7 +2233,7 @@ void StdCmdViewIvStereoInterleavedRows::activated(int iMsg) doCommand(Command::Gui,"Gui.activeDocument().activeView().setStereoType(\"InterleavedRows\")"); } -bool StdCmdViewIvStereoInterleavedRows::isActive(void) +bool StdCmdViewIvStereoInterleavedRows::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SetStereoInterleavedRows"); } @@ -2261,7 +2261,7 @@ void StdCmdViewIvStereoInterleavedColumns::activated(int iMsg) doCommand(Command::Gui,"Gui.activeDocument().activeView().setStereoType(\"InterleavedColumns\")"); } -bool StdCmdViewIvStereoInterleavedColumns::isActive(void) +bool StdCmdViewIvStereoInterleavedColumns::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SetStereoInterleavedColumns"); } @@ -2311,7 +2311,7 @@ void StdCmdViewIvIssueCamPos::activated(int iMsg) getGuiApplication()->macroManager()->addLine(MacroManager::Gui,Temp.c_str()); } -bool StdCmdViewIvIssueCamPos::isActive(void) +bool StdCmdViewIvIssueCamPos::isActive() { return getGuiApplication()->sendHasMsgToActiveView("GetCamera"); } @@ -2345,7 +2345,7 @@ void StdViewZoomIn::activated(int iMsg) } } -bool StdViewZoomIn::isActive(void) +bool StdViewZoomIn::isActive() { return (qobject_cast(getMainWindow()->activeWindow())); } @@ -2378,7 +2378,7 @@ void StdViewZoomOut::activated(int iMsg) } } -bool StdViewZoomOut::isActive(void) +bool StdViewZoomOut::isActive() { return (qobject_cast(getMainWindow()->activeWindow())); } @@ -2986,7 +2986,7 @@ StdCmdTreeSelectAllInstances::StdCmdTreeSelectAllInstances() eType = AlterSelection; } -bool StdCmdTreeSelectAllInstances::isActive(void) +bool StdCmdTreeSelectAllInstances::isActive() { const auto &sels = Selection().getSelectionEx("*",App::DocumentObject::getClassTypeId(), ResolveMode::OldStyleElement, true); if(sels.empty()) @@ -3094,7 +3094,7 @@ void StdCmdMeasureDistance::activated(int iMsg) } } -bool StdCmdMeasureDistance::isActive(void) +bool StdCmdMeasureDistance::isActive() { App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc || doc->countObjectsOfType(App::GeoFeature::getClassTypeId()) == 0) @@ -3167,7 +3167,7 @@ void StdCmdTextureMapping::activated(int iMsg) Gui::Control().showDialog(new Gui::Dialog::TaskTextureMapping); } -bool StdCmdTextureMapping::isActive(void) +bool StdCmdTextureMapping::isActive() { Gui::MDIView* view = getMainWindow()->activeWindow(); return view && view->isDerivedFrom(Gui::View3DInventor::getClassTypeId()) @@ -3282,7 +3282,7 @@ void StdCmdSelBack::activated(int iMsg) Selection().selStackGoBack(); } -bool StdCmdSelBack::isActive(void) +bool StdCmdSelBack::isActive() { return Selection().selStackBackSize()>1; } @@ -3312,7 +3312,7 @@ void StdCmdSelForward::activated(int iMsg) Selection().selStackGoForward(); } -bool StdCmdSelForward::isActive(void) +bool StdCmdSelForward::isActive() { return !!Selection().selStackForwardSize(); } @@ -3598,7 +3598,7 @@ void StdCmdSelBoundingBox::activated(int iMsg) } } -bool StdCmdSelBoundingBox::isActive(void) +bool StdCmdSelBoundingBox::isActive() { if(_pcAction) { bool checked = _pcAction->isChecked(); @@ -3608,7 +3608,7 @@ bool StdCmdSelBoundingBox::isActive(void) return true; } -Action * StdCmdSelBoundingBox::createAction(void) +Action * StdCmdSelBoundingBox::createAction() { Action *pcAction = Command::createAction(); pcAction->setCheckable(true); @@ -3622,7 +3622,7 @@ Action * StdCmdSelBoundingBox::createAction(void) namespace Gui { -void CreateViewStdCommands(void) +void CreateViewStdCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp index a6c70324a8..8b40dfd8d2 100644 --- a/src/Gui/CommandWindow.cpp +++ b/src/Gui/CommandWindow.cpp @@ -65,7 +65,7 @@ void StdCmdArrangeIcons::activated(int iMsg) getMainWindow()->arrangeIcons (); } -bool StdCmdArrangeIcons::isActive(void) +bool StdCmdArrangeIcons::isActive() { return !(getMainWindow()->windows().isEmpty()); } @@ -93,7 +93,7 @@ void StdCmdTileWindows::activated(int iMsg) getMainWindow()->tile(); } -bool StdCmdTileWindows::isActive(void) +bool StdCmdTileWindows::isActive() { return !(getMainWindow()->windows().isEmpty()); } @@ -121,7 +121,7 @@ void StdCmdCascadeWindows::activated(int iMsg) getMainWindow()->cascade(); } -bool StdCmdCascadeWindows::isActive(void) +bool StdCmdCascadeWindows::isActive() { return !(getMainWindow()->windows().isEmpty()); } @@ -153,7 +153,7 @@ void StdCmdCloseActiveWindow::activated(int iMsg) getMainWindow()->closeActiveWindow(); } -bool StdCmdCloseActiveWindow::isActive(void) +bool StdCmdCloseActiveWindow::isActive() { return !(getMainWindow()->windows().isEmpty()); } @@ -181,7 +181,7 @@ void StdCmdCloseAllWindows::activated(int iMsg) getMainWindow()->closeAllDocuments(); } -bool StdCmdCloseAllWindows::isActive(void) +bool StdCmdCloseAllWindows::isActive() { return !(getMainWindow()->windows().isEmpty()) || !App::GetApplication().getDocuments().empty(); } @@ -210,7 +210,7 @@ void StdCmdActivateNextWindow::activated(int iMsg) getMainWindow()->activateNextWindow(); } -bool StdCmdActivateNextWindow::isActive(void) +bool StdCmdActivateNextWindow::isActive() { return !(getMainWindow()->windows().isEmpty()); } @@ -239,7 +239,7 @@ void StdCmdActivatePrevWindow::activated(int iMsg) getMainWindow()->activatePreviousWindow(); } -bool StdCmdActivatePrevWindow::isActive(void) +bool StdCmdActivatePrevWindow::isActive() { return !(getMainWindow()->windows().isEmpty()); } @@ -312,12 +312,12 @@ void StdCmdDockViewMenu::activated(int iMsg) Q_UNUSED(iMsg); } -bool StdCmdDockViewMenu::isActive(void) +bool StdCmdDockViewMenu::isActive() { return true; } -Action * StdCmdDockViewMenu::createAction(void) +Action * StdCmdDockViewMenu::createAction() { Action *pcAction; pcAction = new DockWidgetAction(this, getMainWindow()); @@ -348,12 +348,12 @@ void StdCmdToolBarMenu::activated(int iMsg) Q_UNUSED(iMsg); } -bool StdCmdToolBarMenu::isActive(void) +bool StdCmdToolBarMenu::isActive() { return true; } -Action * StdCmdToolBarMenu::createAction(void) +Action * StdCmdToolBarMenu::createAction() { Action *pcAction; pcAction = new ToolBarAction(this, getMainWindow()); @@ -396,7 +396,7 @@ StdCmdStatusBar::StdCmdStatusBar() eType = 0; } -Action * StdCmdStatusBar::createAction(void) +Action * StdCmdStatusBar::createAction() { Action *pcAction = Command::createAction(); pcAction->setCheckable(true); @@ -448,12 +448,12 @@ void StdCmdWindowsMenu::activated(int iMsg) Q_UNUSED(iMsg); } -bool StdCmdWindowsMenu::isActive(void) +bool StdCmdWindowsMenu::isActive() { return true; } -Action * StdCmdWindowsMenu::createAction(void) +Action * StdCmdWindowsMenu::createAction() { // Allow to show 10 menu items in the 'Window' menu and one separator. // If we have more windows then the user can use the 'Windows...' item. @@ -483,7 +483,7 @@ Action * StdCmdWindowsMenu::createAction(void) namespace Gui { -void CreateWindowStdCommands(void) +void CreateWindowStdCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp index 725ec387fc..85ed4d3aac 100644 --- a/src/Gui/Control.cpp +++ b/src/Gui/Control.cpp @@ -230,7 +230,7 @@ void ControlSingleton::closedDialog() | QDockWidget::DockWidgetFloatable); } -bool ControlSingleton::isAllowedAlterDocument(void) const +bool ControlSingleton::isAllowedAlterDocument() const { if (ActiveDialog) return ActiveDialog->isAllowedAlterDocument(); @@ -238,14 +238,14 @@ bool ControlSingleton::isAllowedAlterDocument(void) const } -bool ControlSingleton::isAllowedAlterView(void) const +bool ControlSingleton::isAllowedAlterView() const { if (ActiveDialog) return ActiveDialog->isAllowedAlterView(); return true; } -bool ControlSingleton::isAllowedAlterSelection(void) const +bool ControlSingleton::isAllowedAlterSelection() const { if (ActiveDialog) return ActiveDialog->isAllowedAlterSelection(); @@ -254,14 +254,14 @@ bool ControlSingleton::isAllowedAlterSelection(void) const // ------------------------------------------- -ControlSingleton& ControlSingleton::instance(void) +ControlSingleton& ControlSingleton::instance() { if (!_pcSingleton) _pcSingleton = new ControlSingleton; return *_pcSingleton; } -void ControlSingleton::destruct (void) +void ControlSingleton::destruct () { if (_pcSingleton) delete _pcSingleton; diff --git a/src/Gui/Control.h b/src/Gui/Control.h index 169ce37bf5..c15dd6bc56 100644 --- a/src/Gui/Control.h +++ b/src/Gui/Control.h @@ -128,7 +128,7 @@ private: }; /// Get the global instance -inline ControlSingleton& Control(void) +inline ControlSingleton& Control() { return ControlSingleton::instance(); } diff --git a/src/Gui/DlgDisplayPropertiesImp.h b/src/Gui/DlgDisplayPropertiesImp.h index 78c607604f..ab8f580704 100644 --- a/src/Gui/DlgDisplayPropertiesImp.h +++ b/src/Gui/DlgDisplayPropertiesImp.h @@ -110,11 +110,11 @@ public: public: bool reject(); - bool isAllowedAlterDocument(void) const + bool isAllowedAlterDocument() const { return true; } - bool isAllowedAlterView(void) const + bool isAllowedAlterView() const { return true; } - bool isAllowedAlterSelection(void) const + bool isAllowedAlterSelection() const { return true; } QDialogButtonBox::StandardButtons getStandardButtons() const; diff --git a/src/Gui/DlgEditFileIncludePropertyExternal.cpp b/src/Gui/DlgEditFileIncludePropertyExternal.cpp index e7b38383f1..3dc581571c 100644 --- a/src/Gui/DlgEditFileIncludePropertyExternal.cpp +++ b/src/Gui/DlgEditFileIncludePropertyExternal.cpp @@ -55,7 +55,7 @@ DlgEditFileIncludePropertyExternal::~DlgEditFileIncludePropertyExternal() } -int DlgEditFileIncludePropertyExternal::Do(void) +int DlgEditFileIncludePropertyExternal::Do() { QFileInfo file = QString::fromUtf8(Prop.getValue()); assert(file.exists()); diff --git a/src/Gui/DlgEditFileIncludePropertyExternal.h b/src/Gui/DlgEditFileIncludePropertyExternal.h index a31b7c6f0e..261544d558 100644 --- a/src/Gui/DlgEditFileIncludePropertyExternal.h +++ b/src/Gui/DlgEditFileIncludePropertyExternal.h @@ -42,7 +42,7 @@ public: DlgEditFileIncludePropertyExternal( App::PropertyFileIncluded& Prop, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); virtual ~DlgEditFileIncludePropertyExternal(); - int Do(void); + int Do(); protected Q_SLOTS: protected: diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp index 14430ddf07..2343d7971a 100644 --- a/src/Gui/DlgMacroExecuteImp.cpp +++ b/src/Gui/DlgMacroExecuteImp.cpp @@ -110,7 +110,7 @@ DlgMacroExecuteImp::~DlgMacroExecuteImp() /** * Fills up the list with all macro files found in the specified location. */ -void DlgMacroExecuteImp::fillUpList(void) +void DlgMacroExecuteImp::fillUpList() { // lists all files in macro path QDir dir(this->macroPath, QLatin1String("*.FCMacro *.py")); diff --git a/src/Gui/DlgMacroExecuteImp.h b/src/Gui/DlgMacroExecuteImp.h index 5d92c6ce1a..0028fd0c89 100644 --- a/src/Gui/DlgMacroExecuteImp.h +++ b/src/Gui/DlgMacroExecuteImp.h @@ -65,7 +65,7 @@ protected Q_SLOTS: void on_tabMacroWidget_currentChanged(int index); protected: - void fillUpList(void); + void fillUpList(); protected: QString macroPath; diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp index 5a03838b7f..f64f84e0c1 100644 --- a/src/Gui/DlgParameterImp.cpp +++ b/src/Gui/DlgParameterImp.cpp @@ -937,7 +937,7 @@ ParameterGroupItem::~ParameterGroupItem() _hcGrp->ClearObserver(); } -void ParameterGroupItem::fillUp(void) +void ParameterGroupItem::fillUp() { // filling up groups std::vector > vhcParamGrp = _hcGrp->GetGroups(); diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/DlgParameterImp.h index e9ae9248de..e190affa7a 100644 --- a/src/Gui/DlgParameterImp.h +++ b/src/Gui/DlgParameterImp.h @@ -220,7 +220,7 @@ public: void setData ( int column, int role, const QVariant & value ); QVariant data ( int column, int role ) const; - void fillUp(void); + void fillUp(); Base::Reference _hcGrp; }; diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/DlgRunExternal.cpp index 1ddac4ee2b..42fb48fa0b 100644 --- a/src/Gui/DlgRunExternal.cpp +++ b/src/Gui/DlgRunExternal.cpp @@ -66,7 +66,7 @@ DlgRunExternal::~DlgRunExternal() delete ui; } -int DlgRunExternal::Do(void) +int DlgRunExternal::Do() { QFileInfo ifo (ProcName); @@ -79,23 +79,23 @@ int DlgRunExternal::Do(void) return exec(); } -void DlgRunExternal::reject (void) +void DlgRunExternal::reject () { QDialog::reject(); } -void DlgRunExternal::accept (void) +void DlgRunExternal::accept () { QDialog::accept(); } -void DlgRunExternal::abort (void) +void DlgRunExternal::abort () { process.terminate(); DlgRunExternal::reject(); } -void DlgRunExternal::advanced (void) +void DlgRunExternal::advanced () { if (advancedHidden){ ui->extensionWidget->show(); diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp index 10f03a2ca2..de783e19bc 100644 --- a/src/Gui/DlgUnitsCalculatorImp.cpp +++ b/src/Gui/DlgUnitsCalculatorImp.cpp @@ -180,13 +180,13 @@ void DlgUnitsCalculator::parseError(const QString& errorText) ui->ValueOutput->setText(errorText); } -void DlgUnitsCalculator::copy(void) +void DlgUnitsCalculator::copy() { QClipboard *cb = QApplication::clipboard(); cb->setText(ui->ValueOutput->text()); } -void DlgUnitsCalculator::returnPressed(void) +void DlgUnitsCalculator::returnPressed() { if (ui->pushButton_Copy->isEnabled()) { ui->textEdit->append(ui->ValueInput->text() + QString::fromLatin1(" = ") + ui->ValueOutput->text()); diff --git a/src/Gui/DlgUnitsCalculatorImp.h b/src/Gui/DlgUnitsCalculatorImp.h index a060010aa2..dba859643f 100644 --- a/src/Gui/DlgUnitsCalculatorImp.h +++ b/src/Gui/DlgUnitsCalculatorImp.h @@ -56,8 +56,8 @@ protected Q_SLOTS: void on_comboBoxScheme_activated(int); void on_spinBoxDecimals_valueChanged(int); - void copy(void); - void returnPressed(void); + void copy(); + void returnPressed(); void parseError(const QString& errorText); diff --git a/src/Gui/DockWindow.h b/src/Gui/DockWindow.h index 93cc495315..300b979dbe 100644 --- a/src/Gui/DockWindow.h +++ b/src/Gui/DockWindow.h @@ -63,15 +63,15 @@ public: */ //@{ /// get called when the document is updated - virtual void onUpdate(void){} + virtual void onUpdate(){} /// returns the name of the view (important for messages) - virtual const char *getName(void) const { return "DockWindow"; } + virtual const char *getName() const { return "DockWindow"; } /// Message handler virtual bool onMsg(const char* ,const char** ){ return false; } /// Message handler test virtual bool onHasMsg(const char*) const { return false; } /// overwrite when checking on close state - virtual bool canClose(void){return true;} + virtual bool canClose(){return true;} //@} Q_SIGNALS: diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 4d8db2190e..e666e66fa6 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -457,11 +457,11 @@ void Document::setEditingTransform(const Base::Matrix4D &mat) { activeView->getViewer()->setEditingTransform(mat); } -void Document::resetEdit(void) { +void Document::resetEdit() { Application::Instance->setEditDocument(nullptr); } -void Document::_resetEdit(void) +void Document::_resetEdit() { std::list::iterator it; if (d->_editViewProvider) { @@ -1022,7 +1022,7 @@ std::vector > Document::getViewProvid return ret; } -App::Document* Document::getDocument(void) const +App::Document* Document::getDocument() const { return d->_pcDocument; } @@ -1116,7 +1116,7 @@ bool Document::askIfSavingFailed(const QString& error) } /// Save the document -bool Document::save(void) +bool Document::save() { if (d->_pcDocument->isSaved()) { try { @@ -1199,7 +1199,7 @@ bool Document::save(void) } /// Save the document under a new file name -bool Document::saveAs(void) +bool Document::saveAs() { getMainWindow()->showMessage(QObject::tr("Save document under new filename...")); @@ -1300,7 +1300,7 @@ void Document::saveAll() } /// Save a copy of the document under a new file name -bool Document::saveCopy(void) +bool Document::saveCopy() { getMainWindow()->showMessage(QObject::tr("Save a copy of the document under new filename...")); @@ -1325,7 +1325,7 @@ bool Document::saveCopy(void) } } -unsigned int Document::getMemSize (void) const +unsigned int Document::getMemSize () const { unsigned int size = 0; @@ -1904,7 +1904,7 @@ void Document::detachView(Gui::BaseView* pcView, bool bPassiv) } } -void Document::onUpdate(void) +void Document::onUpdate() { #ifdef FC_LOGUPDATECHAIN Base::Console().Log("Acti: Gui::Document::onUpdate()"); @@ -1921,7 +1921,7 @@ void Document::onUpdate(void) } } -void Document::onRelabel(void) +void Document::onRelabel() { #ifdef FC_LOGUPDATECHAIN Base::Console().Log("Acti: Gui::Document::onRelabel()"); @@ -1940,7 +1940,7 @@ void Document::onRelabel(void) d->connectChangeDocumentBlocker.unblock(); } -bool Document::isLastView(void) +bool Document::isLastView() { if (d->baseViews.size() <= 1) return true; @@ -2099,7 +2099,7 @@ bool Document::sendMsgToFirstView(const Base::Type& typeId, const char* pMsg, co } /// Getter for the active view -MDIView* Document::getActiveView(void) const +MDIView* Document::getActiveView() const { // get the main window's active view MDIView* active = getMainWindow()->activeWindow(); @@ -2262,29 +2262,29 @@ void Document::openCommand(const char* sName) getDocument()->openTransaction(sName); } -void Document::commitCommand(void) +void Document::commitCommand() { getDocument()->commitTransaction(); } -void Document::abortCommand(void) +void Document::abortCommand() { getDocument()->abortTransaction(); } -bool Document::hasPendingCommand(void) const +bool Document::hasPendingCommand() const { return getDocument()->hasPendingTransaction(); } /// Get a string vector with the 'Undo' actions -std::vector Document::getUndoVector(void) const +std::vector Document::getUndoVector() const { return getDocument()->getAvailableUndoNames(); } /// Get a string vector with the 'Redo' actions -std::vector Document::getRedoVector(void) const +std::vector Document::getRedoVector() const { return getDocument()->getAvailableRedoNames(); } @@ -2385,7 +2385,7 @@ void Document::redo(int iSteps) d->_redoViewProviders.clear(); } -PyObject* Document::getPyObject(void) +PyObject* Document::getPyObject() { _pcDocPy->IncRef(); return _pcDocPy; diff --git a/src/Gui/Document.h b/src/Gui/Document.h index cd6ad74a70..315b3d67d5 100644 --- a/src/Gui/Document.h +++ b/src/Gui/Document.h @@ -141,13 +141,13 @@ public: /** @name I/O of the document */ //@{ - unsigned int getMemSize (void) const; + unsigned int getMemSize () const; /// Save the document - bool save(void); + bool save(); /// Save the document under a new file name - bool saveAs(void); + bool saveAs(); /// Save a copy of the document under a new file name - bool saveCopy(void); + bool saveCopy(); /// Save all open document static void saveAll(); /// This method is used to save properties or very small amounts of data to an XML document. @@ -170,12 +170,12 @@ public: bool isModified() const; /// Getter for the App Document - App::Document* getDocument(void) const; + App::Document* getDocument() const; /** @name methods for View handling */ //@{ /// Getter for the active view - Gui::MDIView* getActiveView(void) const; + Gui::MDIView* getActiveView() const; void setActiveWindow(Gui::MDIView* view); Gui::MDIView* getEditingViewOfViewProvider(Gui::ViewProvider*) const; Gui::MDIView* getViewOfViewProvider(const Gui::ViewProvider*) const; @@ -207,9 +207,9 @@ public: /// Get all view providers along the path and the corresponding node index in the path std::vector > getViewProvidersByPath(SoPath * path) const; /// call update on all attached views - void onUpdate(void); + void onUpdate(); /// call relabel to all attached views - void onRelabel(void); + void onRelabel(); /// returns a list of all attached MDI views std::list getMDIViews() const; /// returns a list of all MDI views of a certain type @@ -244,9 +244,9 @@ public: const Base::Matrix4D &getEditingTransform() const; void setEditingTransform(const Base::Matrix4D &mat); /// reset from edit mode, this cause all document to reset edit - void resetEdit(void); + void resetEdit(); /// reset edit of this document - void _resetEdit(void); + void _resetEdit(); /// get the in edit ViewProvider or NULL ViewProvider *getInEdit(ViewProviderDocumentObject **parentVp=nullptr, std::string *subname=nullptr, int *mode=nullptr, std::string *subElement=nullptr) const; @@ -265,15 +265,15 @@ public: /// Open a new Undo transaction on the document void openCommand(const char* sName=nullptr); /// Commit the Undo transaction on the document - void commitCommand(void); + void commitCommand(); /// Abort the Undo transaction on the document - void abortCommand(void); + void abortCommand(); /// Check if an Undo transaction is open - bool hasPendingCommand(void) const; + bool hasPendingCommand() const; /// Get an Undo string vector with the Undo names - std::vector getUndoVector(void) const; + std::vector getUndoVector() const; /// Get an Redo string vector with the Redo names - std::vector getRedoVector(void) const; + std::vector getRedoVector() const; /// Will UNDO one or more steps void undo(int iSteps); /// Will REDO one or more steps @@ -288,12 +288,12 @@ public: /// handles the application close event bool canClose(bool checkModify=true, bool checkLink=false); - bool isLastView(void); + bool isLastView(); /// called by Application before being deleted void beforeDelete(); - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const char *getCameraSettings() const; bool saveCameraSettings(const char *) const; diff --git a/src/Gui/DocumentPyImp.cpp b/src/Gui/DocumentPyImp.cpp index 0f94e6fb32..7e520d4a09 100644 --- a/src/Gui/DocumentPyImp.cpp +++ b/src/Gui/DocumentPyImp.cpp @@ -50,7 +50,7 @@ using namespace Gui; // returns a string which represent the object e.g. when printed in python -std::string DocumentPy::representation(void) const +std::string DocumentPy::representation() const { std::stringstream str; str << ""; @@ -377,7 +377,7 @@ PyObject* DocumentPy::toggleInSceneGraph(PyObject *args) { Py_Return; } -Py::Object DocumentPy::getActiveObject(void) const +Py::Object DocumentPy::getActiveObject() const { App::DocumentObject *object = getDocumentPtr()->getDocument()->getActiveObject(); if (object) { @@ -394,7 +394,7 @@ void DocumentPy::setActiveObject(Py::Object /*arg*/) throw Py::AttributeError("'Document' object attribute 'ActiveObject' is read-only"); } -Py::Object DocumentPy::getActiveView(void) const +Py::Object DocumentPy::getActiveView() const { Gui::MDIView *view = getDocumentPtr()->getActiveView(); if (view) { @@ -411,7 +411,7 @@ void DocumentPy::setActiveView(Py::Object /*arg*/) throw Py::AttributeError("'Document' object attribute 'ActiveView' is read-only"); } -Py::Object DocumentPy::getDocument(void) const +Py::Object DocumentPy::getDocument() const { App::Document *doc = getDocumentPtr()->getDocument(); if (doc) { @@ -423,7 +423,7 @@ Py::Object DocumentPy::getDocument(void) const } } -Py::Object DocumentPy::getEditingTransform(void) const +Py::Object DocumentPy::getEditingTransform() const { return Py::asObject(new Base::MatrixPy(new Base::Matrix4D( getDocumentPtr()->getEditingTransform()))); @@ -438,7 +438,7 @@ void DocumentPy::setEditingTransform(Py::Object arg) *static_cast(arg.ptr())->getMatrixPtr()); } -Py::Object DocumentPy::getInEditInfo(void) const { +Py::Object DocumentPy::getInEditInfo() const { ViewProviderDocumentObject *vp = nullptr; std::string subname,subelement; int mode = 0; @@ -462,7 +462,7 @@ void DocumentPy::setInEditInfo(Py::Object arg) pyobj)->getViewProviderDocumentObjectPtr(),subname); } -Py::Int DocumentPy::getEditMode(void) const +Py::Int DocumentPy::getEditMode() const { int mode = -1; getDocumentPtr()->getInEdit(nullptr,nullptr,&mode); @@ -475,7 +475,7 @@ Py::Boolean DocumentPy::getTransacting() const return Py::Boolean(getDocumentPtr()->isPerformingTransaction()); } -Py::Boolean DocumentPy::getModified(void) const +Py::Boolean DocumentPy::getModified() const { return Py::Boolean(getDocumentPtr()->isModified()); } diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index 34dfc6d692..f8449620ba 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -311,7 +311,7 @@ bool EditorView::onHasMsg(const char* pMsg) const } /** Checking on close state. */ -bool EditorView::canClose(void) +bool EditorView::canClose() { if ( !d->textEdit->document()->isModified() ) return true; @@ -341,7 +341,7 @@ void EditorView::setDisplayName(EditorView::DisplayName type) /** * Saves the content of the editor to a file specified by the appearing file dialog. */ -bool EditorView::saveAs(void) +bool EditorView::saveAs() { QString fn = FileDialog::getSaveFileName(this, QObject::tr("Save Macro"), QString(), QString::fromLatin1("%1 (*.FCMacro);;Python (*.py)").arg(tr("FreeCAD macro"))); @@ -382,7 +382,7 @@ bool EditorView::open(const QString& fileName) * Copies the selected text to the clipboard and deletes it from the text edit. * If there is no selected text nothing happens. */ -void EditorView::cut(void) +void EditorView::cut() { d->textEdit->cut(); } @@ -390,7 +390,7 @@ void EditorView::cut(void) /** * Copies any selected text to the clipboard. */ -void EditorView::copy(void) +void EditorView::copy() { d->textEdit->copy(); } @@ -399,7 +399,7 @@ void EditorView::copy(void) * Pastes the text from the clipboard into the text edit at the current cursor position. * If there is no text in the clipboard nothing happens. */ -void EditorView::paste(void) +void EditorView::paste() { d->textEdit->paste(); } @@ -408,7 +408,7 @@ void EditorView::paste(void) * Undoes the last operation. * If there is no operation to undo, i.e. there is no undo step in the undo/redo history, nothing happens. */ -void EditorView::undo(void) +void EditorView::undo() { d->lock = true; if (!d->undos.isEmpty()) { @@ -423,7 +423,7 @@ void EditorView::undo(void) * Redoes the last operation. * If there is no operation to undo, i.e. there is no undo step in the undo/redo history, nothing happens. */ -void EditorView::redo(void) +void EditorView::redo() { d->lock = true; if (!d->redos.isEmpty()) { diff --git a/src/Gui/EditorView.h b/src/Gui/EditorView.h index 2ab987124d..ab6c851bce 100644 --- a/src/Gui/EditorView.h +++ b/src/Gui/EditorView.h @@ -66,13 +66,13 @@ public: void setDisplayName(DisplayName); void OnChange(Base::Subject &rCaller,const char* rcReason); - const char *getName(void) const {return "EditorView";} - void onUpdate(void){} + const char *getName() const {return "EditorView";} + void onUpdate(){} bool onMsg(const char* pMsg,const char** ppReturn); bool onHasMsg(const char* pMsg) const; - bool canClose(void); + bool canClose(); /** @name Standard actions of the editor */ //@{ diff --git a/src/Gui/ExpressionBindingPy.h b/src/Gui/ExpressionBindingPy.h index b02f52a873..2c5c8a751d 100644 --- a/src/Gui/ExpressionBindingPy.h +++ b/src/Gui/ExpressionBindingPy.h @@ -31,7 +31,7 @@ class ExpressionBinding; class ExpressionBindingPy : public Py::PythonExtension { public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods ExpressionBindingPy(ExpressionBinding*); ~ExpressionBindingPy(); diff --git a/src/Gui/GuiConsole.cpp b/src/Gui/GuiConsole.cpp index 0e101873aa..89144e0d3f 100644 --- a/src/Gui/GuiConsole.cpp +++ b/src/Gui/GuiConsole.cpp @@ -107,8 +107,8 @@ void GUIConsole::SendLog(const std::string& msg, Base::LogStyle level) #else /* FC_OS_LINUX */ // safely ignore GUIConsole::s_nMaxLines and GUIConsole::s_nRefCount -GUIConsole::GUIConsole (void) {} -GUIConsole::~GUIConsole (void) {} +GUIConsole::GUIConsole () {} +GUIConsole::~GUIConsole () {} void GUIConsole::SendLog(const std::string& msg, Base::LogStyle level) { switch(level){ diff --git a/src/Gui/GuiConsole.h b/src/Gui/GuiConsole.h index bca7a14a22..993bfef188 100644 --- a/src/Gui/GuiConsole.h +++ b/src/Gui/GuiConsole.h @@ -44,11 +44,11 @@ class GuiExport GUIConsole :public Base::ILogger { public: /// Constructor - GUIConsole(void); + GUIConsole(); /// Destructor - virtual ~GUIConsole(void); + virtual ~GUIConsole(); void SendLog(const std::string& msg, Base::LogStyle level) override; - const char* Name(void) override {return "GUIConsole";} + const char* Name() override {return "GUIConsole";} protected: static const unsigned int s_nMaxLines; diff --git a/src/Gui/InputField.cpp b/src/Gui/InputField.cpp index 0a5d4cf156..f0c80996c9 100644 --- a/src/Gui/InputField.cpp +++ b/src/Gui/InputField.cpp @@ -330,7 +330,7 @@ void InputField::pushToHistory(const QString &valueq) } } -std::vector InputField::getHistory(void) +std::vector InputField::getHistory() { std::vector res; @@ -349,7 +349,7 @@ std::vector InputField::getHistory(void) return res; } -void InputField::setToLastUsedValue(void) +void InputField::setToLastUsedValue() { std::vector hist = getHistory(); if(!hist.empty()) @@ -378,7 +378,7 @@ void InputField::pushToSavedValues(const QString &valueq) } } -std::vector InputField::getSavedValues(void) +std::vector InputField::getSavedValues() { std::vector res; @@ -451,7 +451,7 @@ const Base::Unit& InputField::getUnit() const } /// get stored, valid quantity as a string -QString InputField::getQuantityString(void) const +QString InputField::getQuantityString() const { return actQuantity.getUserString(); } @@ -465,7 +465,7 @@ void InputField::setQuantityString(const QString& text) } /// return the quantity in C locale, i.e. decimal separator is a dot. -QString InputField::rawText(void) const +QString InputField::rawText() const { double factor; QString unit; @@ -484,7 +484,7 @@ void InputField::setRawText(const QString& text) } /// get the value of the singleStep property -double InputField::singleStep(void)const +double InputField::singleStep()const { return StepSize; } @@ -496,7 +496,7 @@ void InputField::setSingleStep(double s) } /// get the value of the maximum property -double InputField::maximum(void)const +double InputField::maximum()const { return Maximum; } @@ -512,7 +512,7 @@ void InputField::setMaximum(double m) } /// get the value of the minimum property -double InputField::minimum(void)const +double InputField::minimum()const { return Minimum; } @@ -538,7 +538,7 @@ void InputField::setUnitText(const QString& str) } } -QString InputField::getUnitText(void) +QString InputField::getUnitText() { double dFactor; QString unitStr; @@ -576,7 +576,7 @@ void InputField::setFormat(const QString& format) } // get the value of the minimum property -int InputField::historySize(void)const +int InputField::historySize()const { return HistorySize; } @@ -590,7 +590,7 @@ void InputField::setHistorySize(int i) HistorySize = i; } -void InputField::selectNumber(void) +void InputField::selectNumber() { QString str = text(); unsigned int i = 0; diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h index 695f9609df..450b630fb4 100644 --- a/src/Gui/InputField.h +++ b/src/Gui/InputField.h @@ -83,18 +83,18 @@ public: void setValue(const double&); /// get the current value - Base::Quantity getQuantity(void)const{return this->actQuantity;} + Base::Quantity getQuantity()const{return this->actQuantity;} /// Get the current quantity without unit double rawValue() const; /// get stored, valid quantity as a string (user string - avoid storing) - QString getQuantityString(void) const; + QString getQuantityString() const; /// set, validate and display quantity from a string. Must match existing units. void setQuantityString(const QString& text); /// return the quantity in C locale, i.e. decimal separator is a dot. - QString rawText(void) const; + QString rawText() const; /// expects the string in C locale and internally converts it into the OS-specific locale void setRawText(const QString& text); @@ -114,37 +114,37 @@ public: const Base::Unit& getUnit() const; /// set the input field to the last used value (works only if the setParamGrpPath() was called) - void setToLastUsedValue(void); + void setToLastUsedValue(); /// get the value of the singleStep property - double singleStep(void)const; + double singleStep()const; /// set the value of the singleStep property void setSingleStep(double); /// get the value of the maximum property - double maximum(void)const; + double maximum()const; /// set the value of the maximum property void setMaximum(double); /// get the value of the minimum property - double minimum(void)const; + double minimum()const; /// set the value of the minimum property void setMinimum(double); /// get the value of the minimum property - int historySize(void)const; + int historySize()const; /// set the value of the minimum property void setHistorySize(int); /// set the unit by a string (can be used in the *.ui file) void setUnitText(const QString&); /// get the unit as a string (can be used in the *.ui file) - QString getUnitText(void); + QString getUnitText(); /// get the value of the precision property - int getPrecision(void) const; + int getPrecision() const; /// set the value of the precision property (can be used in the *.ui file) void setPrecision(const int); /// get the value of the format property: "f" (fixed), "e" (scientific), "g" (general) - QString getFormat(void) const; + QString getFormat() const; /// set the value of the format property (can be used in the *.ui file) void setFormat(const QString&); /// set the number portion selected (use after setValue()) - void selectNumber(void); + void selectNumber(); /// input validation void fixup(QString& input) const; /// input validation @@ -159,11 +159,11 @@ public: /// push a new value to the history, if no string given the actual text of the input field is used. void pushToHistory(const QString &valueq = QString()); /// get the history of the field, newest first - std::vector getHistory(void); + std::vector getHistory(); /// push a new value to the history, if no string given the actual text of the input field is used. void pushToSavedValues(const QString &valueq = QString()); /// get the history of the field, newest first - std::vector getSavedValues(void); + std::vector getSavedValues(); //@} void bind(const App::ObjectIdentifier &_path); diff --git a/src/Gui/Language/Translator.cpp b/src/Gui/Language/Translator.cpp index c30fb56661..3ce5221163 100644 --- a/src/Gui/Language/Translator.cpp +++ b/src/Gui/Language/Translator.cpp @@ -113,14 +113,14 @@ public: }; } -Translator* Translator::instance(void) +Translator* Translator::instance() { if (!_pcSingleton) _pcSingleton = new Translator; return _pcSingleton; } -void Translator::destruct (void) +void Translator::destruct () { if (_pcSingleton) delete _pcSingleton; diff --git a/src/Gui/LinkViewPyImp.cpp b/src/Gui/LinkViewPyImp.cpp index 13fb912348..1fa83985f5 100644 --- a/src/Gui/LinkViewPyImp.cpp +++ b/src/Gui/LinkViewPyImp.cpp @@ -46,7 +46,7 @@ int LinkViewPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) // returns a string which represent the object e.g. when printed in python -std::string LinkViewPy::representation(void) const +std::string LinkViewPy::representation() const { return ""; } @@ -337,7 +337,7 @@ int LinkViewPy::setCustomAttributes(const char*, PyObject*) return 0; } -Py::Object LinkViewPy::getRootNode(void) const +Py::Object LinkViewPy::getRootNode() const { try { SoNode* node = getLinkViewPtr()->getLinkRoot(); diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp index f4be44e31e..7e09c817ae 100644 --- a/src/Gui/MDIView.cpp +++ b/src/Gui/MDIView.cpp @@ -182,7 +182,7 @@ bool MDIView::onHasMsg(const char* pMsg) const return false; } -bool MDIView::canClose(void) +bool MDIView::canClose() { if (getAppDocument() && getAppDocument()->testStatus(App::Document::TempDoc)) return true; diff --git a/src/Gui/MDIView.h b/src/Gui/MDIView.h index 7e9fd6c06c..3fb7f0b365 100644 --- a/src/Gui/MDIView.h +++ b/src/Gui/MDIView.h @@ -79,7 +79,7 @@ public: /// Message handler test virtual bool onHasMsg(const char* pMsg) const; /// overwrite when checking on close state - virtual bool canClose(void); + virtual bool canClose(); /// delete itself virtual void deleteSelf(); virtual PyObject *getPyObject(); diff --git a/src/Gui/Macro.cpp b/src/Gui/Macro.cpp index e6e86e6836..4babc16b5e 100644 --- a/src/Gui/Macro.cpp +++ b/src/Gui/Macro.cpp @@ -97,7 +97,7 @@ void MacroManager::open(MacroType eType, const char *sName) Base::Console().Log("CmdM: Open macro: %s\n", sName); } -void MacroManager::commit(void) +void MacroManager::commit() { QFile file(this->macroName); if (file.open(QFile::WriteOnly)) @@ -155,7 +155,7 @@ void MacroManager::commit(void) } } -void MacroManager::cancel(void) +void MacroManager::cancel() { Base::Console().Log("Cancel macro: %s\n",(const char*)this->macroName.toUtf8()); diff --git a/src/Gui/Macro.h b/src/Gui/Macro.h index c38a6cfd84..af878b78aa 100644 --- a/src/Gui/Macro.h +++ b/src/Gui/Macro.h @@ -73,11 +73,11 @@ public: */ void open(MacroType eType,const char *sName); /// close (and save) the recording session - void commit(void); + void commit(); /// cancels the recording session - void cancel(void); + void cancel(); /// indicates if a macro recording is in progress - bool isOpen(void) const {return openMacro;} + bool isOpen() const {return openMacro;} /// insert a new line in the macro void addLine(LineType Type,const char* sLine,bool pending=false); /** Set the active module diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index a5a363afb8..d03ab86fd8 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1107,7 +1107,7 @@ QList MainWindow::windows(QMdiArea::WindowOrder order) const return mdis; } -MDIView* MainWindow::activeWindow(void) const +MDIView* MainWindow::activeWindow() const { // each activated window notifies this main window when it is activated return d->activeView; @@ -1414,7 +1414,7 @@ void MainWindow::saveWindowSettings() ToolBarManager::getInstance()->saveState(); } -void MainWindow::startSplasher(void) +void MainWindow::startSplasher() { // startup splasher // when running in verbose mode no splasher @@ -1432,7 +1432,7 @@ void MainWindow::startSplasher(void) } } -void MainWindow::stopSplasher(void) +void MainWindow::stopSplasher() { if (d->splashscreen) { d->splashscreen->finish(this); diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h index a9a6c9f66d..7d95b36f21 100644 --- a/src/Gui/MainWindow.h +++ b/src/Gui/MainWindow.h @@ -136,9 +136,9 @@ public: /** Gets the one and only instance. */ static MainWindow* getInstance(); /** Starts the splasher at startup. */ - void startSplasher(void); + void startSplasher(); /** Stops the splasher after startup. */ - void stopSplasher(void); + void stopSplasher(); /* The image of the About dialog, it might be empty. */ QPixmap aboutImage() const; /* The image of the splash screen of the application. */ @@ -357,7 +357,7 @@ public: void SendLog(const std::string& msg, Base::LogStyle level) override; /// name of the observer - const char *Name(void) override {return "StatusBar";} + const char *Name() override {return "StatusBar";} friend class MainWindow; private: diff --git a/src/Gui/MergeDocuments.cpp b/src/Gui/MergeDocuments.cpp index 4760b7c054..62508e7d57 100644 --- a/src/Gui/MergeDocuments.cpp +++ b/src/Gui/MergeDocuments.cpp @@ -89,7 +89,7 @@ MergeDocuments::~MergeDocuments() connectImport.disconnect(); } -unsigned int MergeDocuments::getMemSize (void) const +unsigned int MergeDocuments::getMemSize () const { return 0; } diff --git a/src/Gui/MergeDocuments.h b/src/Gui/MergeDocuments.h index a3129abc1d..1a32390006 100644 --- a/src/Gui/MergeDocuments.h +++ b/src/Gui/MergeDocuments.h @@ -41,7 +41,7 @@ class GuiExport MergeDocuments : public Base::Persistence public: MergeDocuments(App::Document* doc); ~MergeDocuments(); - unsigned int getMemSize (void) const; + unsigned int getMemSize () const; std::vector importObjects(std::istream&); void importObject(const std::vector& o, Base::XMLReader & r); void exportObject(const std::vector& o, Base::Writer & w); diff --git a/src/Gui/MouseSelection.h b/src/Gui/MouseSelection.h index 0909ba7176..db09124082 100644 --- a/src/Gui/MouseSelection.h +++ b/src/Gui/MouseSelection.h @@ -58,7 +58,7 @@ public: enum { Continue=0, Restart=1, Finish=2, Cancel=3, Ignore=4 }; AbstractMouseSelection(); - virtual ~AbstractMouseSelection(void) {} + virtual ~AbstractMouseSelection() {} /// implement this in derived classes virtual void initialize() = 0; /// implement this in derived classes diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp index 1cf3c895c8..9c4d9d5f15 100644 --- a/src/Gui/NetworkRetriever.cpp +++ b/src/Gui/NetworkRetriever.cpp @@ -414,7 +414,7 @@ StdCmdDownloadOnlineHelp::~StdCmdDownloadOnlineHelp() delete wget; } -Action * StdCmdDownloadOnlineHelp::createAction(void) +Action * StdCmdDownloadOnlineHelp::createAction() { Action *pcAction; diff --git a/src/Gui/Placement.h b/src/Gui/Placement.h index fd70e9631d..1f61050d42 100644 --- a/src/Gui/Placement.h +++ b/src/Gui/Placement.h @@ -138,11 +138,11 @@ public: void clicked(int id); void open(); - bool isAllowedAlterDocument(void) const + bool isAllowedAlterDocument() const { return true; } - bool isAllowedAlterView(void) const + bool isAllowedAlterView() const { return true; } - bool isAllowedAlterSelection(void) const + bool isAllowedAlterSelection() const { return true; } QDialogButtonBox::StandardButtons getStandardButtons() const; diff --git a/src/Gui/PropertyPage.cpp b/src/Gui/PropertyPage.cpp index 22e2616364..388bd8e12c 100644 --- a/src/Gui/PropertyPage.cpp +++ b/src/Gui/PropertyPage.cpp @@ -148,7 +148,7 @@ void PreferenceUiForm::changeEvent(QEvent *e) } template -void PreferenceUiForm::loadPrefWidgets(void) +void PreferenceUiForm::loadPrefWidgets() { QList pw = form->findChildren(); for (typename QList::iterator it = pw.begin(); it != pw.end(); ++it) @@ -156,7 +156,7 @@ void PreferenceUiForm::loadPrefWidgets(void) } template -void PreferenceUiForm::savePrefWidgets(void) +void PreferenceUiForm::savePrefWidgets() { QList pw = form->findChildren(); for (typename QList::iterator it = pw.begin(); it != pw.end(); ++it) diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 2e2324acb0..95653adf6c 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -377,7 +377,7 @@ bool InteractiveInterpreter::push(const char* line) return false; } -bool InteractiveInterpreter::hasPendingInput( void ) const +bool InteractiveInterpreter::hasPendingInput( ) const { return (!d->buffer.isEmpty()); } @@ -1082,7 +1082,7 @@ void PythonConsole::insertFromMimeData (const QMimeData * source) } } -QTextCursor PythonConsole::inputBegin(void) const +QTextCursor PythonConsole::inputBegin() const { // construct cursor at begin of input line ... QTextCursor inputLineBegin(this->textCursor()); @@ -1361,7 +1361,7 @@ void PythonConsole::onCopyCommand() d->type = PythonConsoleP::Normal; } -QString PythonConsole::readline( void ) +QString PythonConsole::readline( ) { QEventLoop loop; // output is set to the current prompt which we need to extract @@ -1574,7 +1574,7 @@ const QStringList& ConsoleHistory::values() const /** * restart resets the history access to the latest item. */ -void ConsoleHistory::restart( void ) +void ConsoleHistory::restart( ) { _it = _history.cend(); } @@ -1584,7 +1584,7 @@ void ConsoleHistory::restart( void ) * Note: with simply remembering a start index, it does not work to nest scratch regions. * However, just replace the index keeping by a stack - in case this is be a concern. */ -void ConsoleHistory::markScratch( void ) +void ConsoleHistory::markScratch( ) { _scratchBegin = _history.length(); } @@ -1592,7 +1592,7 @@ void ConsoleHistory::markScratch( void ) /** * doScratch removes the tail of the history list, starting from the index marked lately. */ -void ConsoleHistory::doScratch( void ) +void ConsoleHistory::doScratch( ) { if (_scratchBegin < _history.length()) { diff --git a/src/Gui/PythonConsole.h b/src/Gui/PythonConsole.h index f0ac8e0c43..c2065ae802 100644 --- a/src/Gui/PythonConsole.h +++ b/src/Gui/PythonConsole.h @@ -44,7 +44,7 @@ public: bool push(const char*); int compileCommand(const char*) const; - bool hasPendingInput( void ) const; + bool hasPendingInput( ) const; void setBuffer(const QStringList&); QStringList getBuffer() const; void clearBuffer(); @@ -78,8 +78,8 @@ public: void append(const QString &inputLine); const QStringList& values() const; void restart(); - void markScratch( void ); - void doScratch( void ); + void markScratch( ); + void doScratch( ); private: QStringList _history; @@ -110,7 +110,7 @@ public: void OnChange( Base::Subject &rCaller,const char* rcReason ); void printStatement( const QString& cmd ); - QString readline( void ); + QString readline( ); public Q_SLOTS: void onSaveHistoryAs(); @@ -139,7 +139,7 @@ protected: bool canInsertFromMimeData ( const QMimeData * source ) const; QMimeData * createMimeDataFromSelection () const; void insertFromMimeData ( const QMimeData * source ); - QTextCursor inputBegin( void ) const; + QTextCursor inputBegin( ) const; private: void runSource(const QString&); @@ -153,7 +153,7 @@ private: void saveHistory() const; Q_SIGNALS: - void pendingSource( void ); + void pendingSource( ); private: struct PythonConsoleP* d; diff --git a/src/Gui/PythonConsolePy.h b/src/Gui/PythonConsolePy.h index 052e6b8f2b..db7419acfe 100644 --- a/src/Gui/PythonConsolePy.h +++ b/src/Gui/PythonConsolePy.h @@ -45,7 +45,7 @@ private: PythonConsole* pyConsole; public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods PythonStdout(PythonConsole *pc); ~PythonStdout(); @@ -71,7 +71,7 @@ private: PythonConsole* pyConsole; public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods PythonStderr(PythonConsole *pc); ~PythonStderr(); @@ -94,7 +94,7 @@ public: class OutputStdout : public Py::PythonExtension { public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods OutputStdout(); ~OutputStdout(); @@ -117,7 +117,7 @@ public: class OutputStderr : public Py::PythonExtension { public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods OutputStderr(); ~OutputStderr(); @@ -139,7 +139,7 @@ private: PythonConsole* pyConsole; public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods PythonStdin(PythonConsole *pc); ~PythonStdin(); diff --git a/src/Gui/PythonDebugger.cpp b/src/Gui/PythonDebugger.cpp index 955dc910ac..62573e0994 100644 --- a/src/Gui/PythonDebugger.cpp +++ b/src/Gui/PythonDebugger.cpp @@ -98,7 +98,7 @@ int Breakpoint::lineIndex(int ind)const // ----------------------------------------------------- -void PythonDebugModule::init_module(void) +void PythonDebugModule::init_module() { PythonDebugStdout::init_type(); PythonDebugStderr::init_type(); diff --git a/src/Gui/PythonWorkbenchPyImp.cpp b/src/Gui/PythonWorkbenchPyImp.cpp index 98d5fabbe7..6ba70d6027 100644 --- a/src/Gui/PythonWorkbenchPyImp.cpp +++ b/src/Gui/PythonWorkbenchPyImp.cpp @@ -40,7 +40,7 @@ using namespace Gui; */ // returns a string which represent the object e.g. when printed in python -std::string PythonWorkbenchPy::representation(void) const +std::string PythonWorkbenchPy::representation() const { return std::string(""); } diff --git a/src/Gui/QuantitySpinBox.cpp b/src/Gui/QuantitySpinBox.cpp index 6d12c38595..82d11bd677 100644 --- a/src/Gui/QuantitySpinBox.cpp +++ b/src/Gui/QuantitySpinBox.cpp @@ -633,7 +633,7 @@ void QuantitySpinBox::setUnitText(const QString& str) } } -QString QuantitySpinBox::unitText(void) +QString QuantitySpinBox::unitText() { Q_D(QuantitySpinBox); return d->unitStr; diff --git a/src/Gui/QuantitySpinBox.h b/src/Gui/QuantitySpinBox.h index 141f9fe544..f2db970f2b 100644 --- a/src/Gui/QuantitySpinBox.h +++ b/src/Gui/QuantitySpinBox.h @@ -72,7 +72,7 @@ public: /// Set the unit property void setUnitText(const QString&); /// Get the unit property - QString unitText(void); + QString unitText(); /// Get the value of the singleStep property double singleStep() const; diff --git a/src/Gui/ReportView.h b/src/Gui/ReportView.h index 54187b253c..7cbd39c8e6 100644 --- a/src/Gui/ReportView.h +++ b/src/Gui/ReportView.h @@ -137,7 +137,7 @@ public: void SendLog(const std::string& msg, Base::LogStyle level) override; /// returns the name for observer handling - const char* Name(void) override {return "ReportOutput";} + const char* Name() override {return "ReportOutput";} /** Restore the default font settings. */ void restoreFont (); @@ -212,7 +212,7 @@ public: protected: QPointer reportView; - void showReportView(void); + void showReportView(); }; } // namespace DockWnd diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp index d6eaa19095..ec45a76e80 100644 --- a/src/Gui/Selection.cpp +++ b/src/Gui/Selection.cpp @@ -962,7 +962,7 @@ void SelectionSingleton::rmvPreselect(bool signal) notify(std::move(Chng)); } -const SelectionChanges &SelectionSingleton::getPreselection(void) const +const SelectionChanges &SelectionSingleton::getPreselection() const { return CurrentPreselection; } @@ -978,7 +978,7 @@ void SelectionSingleton::addSelectionGate(Gui::SelectionGate *gate, ResolveMode } // remove the active SelectionGate -void SelectionSingleton::rmvSelectionGate(void) +void SelectionSingleton::rmvSelectionGate() { if (ActiveGate) { delete ActiveGate; @@ -1816,14 +1816,14 @@ SelectionSingleton::~SelectionSingleton() SelectionSingleton* SelectionSingleton::_pcSingleton = nullptr; -SelectionSingleton& SelectionSingleton::instance(void) +SelectionSingleton& SelectionSingleton::instance() { if (!_pcSingleton) _pcSingleton = new SelectionSingleton; return *_pcSingleton; } -void SelectionSingleton::destruct (void) +void SelectionSingleton::destruct () { if (_pcSingleton) delete _pcSingleton; @@ -1886,7 +1886,7 @@ PyMethodDef SelectionSingleton::Methods[] = { "obj : App.DocumentObject\n Object to check.\n" "subName : str\n Name of the subelement.\n" "resolve : int\n Resolve subelement reference."}, - {"setPreselection", reinterpret_cast(reinterpret_cast( SelectionSingleton::sSetPreselection )), METH_VARARGS|METH_KEYWORDS, + {"setPreselection", reinterpret_cast(reinterpret_cast( SelectionSingleton::sSetPreselection )), METH_VARARGS|METH_KEYWORDS, "setPreselection(obj, subName, x=0, y=0, z=0, type=1) -> None\n" "\n" "Set preselected object.\n" diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h index bd3a96bd65..25de69d89e 100644 --- a/src/Gui/Selection.h +++ b/src/Gui/Selection.h @@ -419,11 +419,11 @@ public: /// sets different coords for the preselection void setPreselectCoord(float x, float y, float z); /// returns the present preselection - const SelectionChanges& getPreselection(void) const; + const SelectionChanges& getPreselection() const; /// add a SelectionGate to control what is selectable void addSelectionGate(Gui::SelectionGate *gate, ResolveMode resolve = ResolveMode::OldStyleElement); /// remove the active SelectionGate - void rmvSelectionGate(void); + void rmvSelectionGate(); int disableCommandLog(); int enableCommandLog(bool silent=false); @@ -568,7 +568,7 @@ public: bool hasPreselection() const; /// Size of selected entities for all documents - unsigned int size(void) const { + unsigned int size() const { return static_cast(_SelList.size()); } @@ -643,8 +643,8 @@ public: const char* pDocName=nullptr, Base::Type typeId=App::DocumentObject::getClassTypeId()) const; //@} - static SelectionSingleton& instance(void); - static void destruct (void); + static SelectionSingleton& instance(); + static void destruct (); friend class SelectionFilter; // Python interface @@ -762,7 +762,7 @@ inline std::vector SelectionSingleton::getObjectsOfType(const char* pDocName } /// Get the global instance -inline SelectionSingleton& Selection(void) +inline SelectionSingleton& Selection() { return SelectionSingleton::instance(); } diff --git a/src/Gui/SelectionFilter.cpp b/src/Gui/SelectionFilter.cpp index 5a43c0b1d0..fc4e3b4bdc 100644 --- a/src/Gui/SelectionFilter.cpp +++ b/src/Gui/SelectionFilter.cpp @@ -161,7 +161,7 @@ SelectionFilter::~SelectionFilter() { } -bool SelectionFilter::match(void) +bool SelectionFilter::match() { if (!Ast) return false; @@ -386,7 +386,7 @@ public: // show the parser the lexer method #define yylex SelectionFilterlex -int SelectionFilterlex(void); +int SelectionFilterlex(); // Parser, defined in SelectionFilter.y #include "SelectionFilter.tab.c" @@ -410,7 +410,7 @@ int SelectionFilterlex(void); #endif // DOXYGEN_SHOULD_SKIP_THIS } -bool SelectionFilter::parse(void) +bool SelectionFilter::parse() { Errors = ""; SelectionParser::YY_BUFFER_STATE my_string_buffer = SelectionParser::SelectionFilter_scan_string (Filter.c_str()); diff --git a/src/Gui/SelectionFilter.h b/src/Gui/SelectionFilter.h index aff05b6715..54ef1237c9 100644 --- a/src/Gui/SelectionFilter.h +++ b/src/Gui/SelectionFilter.h @@ -66,7 +66,7 @@ public: * against the filter and returns true if the * described object(s) are selected. */ - bool match(void); + bool match(); /** Test objects * This method tests if a given object is described in the * filter. If SubName is not NULL the Subelement gets also @@ -81,12 +81,12 @@ public: std::vector > Result; /// true if a valid filter is set - bool isValid(void) const {return Ast ? true : false;} + bool isValid() const {return Ast ? true : false;} protected: std::string Filter; std::string Errors; - bool parse(void); + bool parse(); std::shared_ptr Ast; }; @@ -154,7 +154,7 @@ public: SelectionFilter filter; public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods SelectionFilterPy(const std::string&); ~SelectionFilterPy(); diff --git a/src/Gui/SelectionObject.cpp b/src/Gui/SelectionObject.cpp index e4fab6c3d7..2707dac1a1 100644 --- a/src/Gui/SelectionObject.cpp +++ b/src/Gui/SelectionObject.cpp @@ -66,7 +66,7 @@ SelectionObject::~SelectionObject() { } -const App::DocumentObject * SelectionObject::getObject(void) const +const App::DocumentObject * SelectionObject::getObject() const { if (!DocName.empty()) { App::Document *doc = App::GetApplication().getDocument(DocName.c_str()); @@ -76,7 +76,7 @@ const App::DocumentObject * SelectionObject::getObject(void) const return nullptr; } -App::DocumentObject * SelectionObject::getObject(void) +App::DocumentObject * SelectionObject::getObject() { if (!DocName.empty()) { App::Document *doc = App::GetApplication().getDocument(DocName.c_str()); @@ -92,7 +92,7 @@ bool SelectionObject::isObjectTypeOf(const Base::Type& typeId) const return (obj && obj->getTypeId().isDerivedFrom(typeId)); } -std::string SelectionObject::getAsPropertyLinkSubString(void)const +std::string SelectionObject::getAsPropertyLinkSubString()const { std::ostringstream str; str << "(" << Gui::Command::getObjectCmd(getObject()) << ",["; diff --git a/src/Gui/SelectionObject.h b/src/Gui/SelectionObject.h index 3ef71a8262..ec33ad0947 100644 --- a/src/Gui/SelectionObject.h +++ b/src/Gui/SelectionObject.h @@ -57,28 +57,28 @@ public: PyObject* getPyObject(); /// get the SubElement name of this SelectionObject - inline const std::vector &getSubNames(void) const { return SubNames; } + inline const std::vector &getSubNames() const { return SubNames; } /// are there any SubNames selected - bool hasSubNames(void)const { return !SubNames.empty(); } + bool hasSubNames()const { return !SubNames.empty(); } /// get the name of the Document of this SelctionObject - inline const char* getDocName(void) const { return DocName.c_str(); } + inline const char* getDocName() const { return DocName.c_str(); } /// get the name of the Document Object of this SelectionObject - inline const char* getFeatName(void) const { return FeatName.c_str(); } + inline const char* getFeatName() const { return FeatName.c_str(); } /// get the Type of the selected Object - inline const char* getTypeName(void) const { return TypeName.c_str(); } + inline const char* getTypeName() const { return TypeName.c_str(); } /// get the selection points - inline const std::vector getPickedPoints(void) const { return SelPoses; } + inline const std::vector getPickedPoints() const { return SelPoses; } /// returns the selected DocumentObject or NULL if the object is already deleted - const App::DocumentObject *getObject(void) const; + const App::DocumentObject *getObject() const; /// returns the selected DocumentObject or NULL if the object is already deleted - App::DocumentObject *getObject(void); + App::DocumentObject *getObject(); /// check the selected object is a special type or derived of bool isObjectTypeOf(const Base::Type& typeId) const; /// returns python expreasion sutably for assigning to a LinkSub property - std::string getAsPropertyLinkSubString(void) const; + std::string getAsPropertyLinkSubString() const; friend class SelectionSingleton; diff --git a/src/Gui/SelectionObjectPyImp.cpp b/src/Gui/SelectionObjectPyImp.cpp index cc6343da1a..d7efc14e92 100644 --- a/src/Gui/SelectionObjectPyImp.cpp +++ b/src/Gui/SelectionObjectPyImp.cpp @@ -38,7 +38,7 @@ using namespace Gui; // returns a string which represents the object e.g. when printed in python -std::string SelectionObjectPy::representation(void) const +std::string SelectionObjectPy::representation() const { return ""; } @@ -68,12 +68,12 @@ PyObject* SelectionObjectPy::isObjectTypeOf(PyObject * args) return Py_BuildValue("O", (ok ? Py_True : Py_False)); } -Py::String SelectionObjectPy::getObjectName(void) const +Py::String SelectionObjectPy::getObjectName() const { return Py::String(getSelectionObjectPtr()->getFeatName()); } -Py::Tuple SelectionObjectPy::getSubElementNames(void) const +Py::Tuple SelectionObjectPy::getSubElementNames() const { std::vector objs = getSelectionObjectPtr()->getSubNames(); @@ -85,22 +85,22 @@ Py::Tuple SelectionObjectPy::getSubElementNames(void) const return temp; } -Py::String SelectionObjectPy::getFullName(void) const +Py::String SelectionObjectPy::getFullName() const { return Py::String(getSelectionObjectPtr()->getAsPropertyLinkSubString()); } -Py::String SelectionObjectPy::getTypeName(void) const +Py::String SelectionObjectPy::getTypeName() const { return Py::String(getSelectionObjectPtr()->getTypeName()); } -Py::String SelectionObjectPy::getDocumentName(void) const +Py::String SelectionObjectPy::getDocumentName() const { return Py::String(getSelectionObjectPtr()->getDocName()); } -Py::Object SelectionObjectPy::getDocument(void) const +Py::Object SelectionObjectPy::getDocument() const { App::DocumentObject *obj = getSelectionObjectPtr()->getObject(); if (!obj) @@ -108,7 +108,7 @@ Py::Object SelectionObjectPy::getDocument(void) const return Py::Object(obj->getDocument()->getPyObject(), true); } -Py::Object SelectionObjectPy::getObject(void) const +Py::Object SelectionObjectPy::getObject() const { App::DocumentObject *obj = getSelectionObjectPtr()->getObject(); if (!obj) @@ -116,7 +116,7 @@ Py::Object SelectionObjectPy::getObject(void) const return Py::Object(obj->getPyObject(), true); } -Py::Tuple SelectionObjectPy::getSubObjects(void) const +Py::Tuple SelectionObjectPy::getSubObjects() const { App::DocumentObject *obj = getSelectionObjectPtr()->getObject(); if (!obj) @@ -140,12 +140,12 @@ Py::Tuple SelectionObjectPy::getSubObjects(void) const return temp; } -Py::Boolean SelectionObjectPy::getHasSubObjects(void) const +Py::Boolean SelectionObjectPy::getHasSubObjects() const { return Py::Boolean(getSelectionObjectPtr()->hasSubNames()); } -Py::Tuple SelectionObjectPy::getPickedPoints(void) const +Py::Tuple SelectionObjectPy::getPickedPoints() const { const std::vector& points = getSelectionObjectPtr()->getPickedPoints(); diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp index d16b84b770..b190fb7d87 100644 --- a/src/Gui/SelectionView.cpp +++ b/src/Gui/SelectionView.cpp @@ -307,7 +307,7 @@ void SelectionView::search(const QString& text) } } -void SelectionView::validateSearch(void) +void SelectionView::validateSearch() { if (!searchList.empty()) { App::Document* doc = App::GetApplication().getActiveDocument(); @@ -341,7 +341,7 @@ void SelectionView::select(QListWidgetItem* item) } } -void SelectionView::deselect(void) +void SelectionView::deselect() { QListWidgetItem *item = selectionView->currentItem(); if (!item) @@ -430,7 +430,7 @@ void SelectionView::preselect(QListWidgetItem* item) } } -void SelectionView::zoom(void) +void SelectionView::zoom() { select(); try { @@ -440,7 +440,7 @@ void SelectionView::zoom(void) } } -void SelectionView::treeSelect(void) +void SelectionView::treeSelect() { select(); try { @@ -450,7 +450,7 @@ void SelectionView::treeSelect(void) } } -void SelectionView::touch(void) +void SelectionView::touch() { QListWidgetItem *item = selectionView->currentItem(); if (!item) @@ -466,7 +466,7 @@ void SelectionView::touch(void) } } -void SelectionView::toPython(void) +void SelectionView::toPython() { QListWidgetItem *item = selectionView->currentItem(); if (!item) @@ -499,7 +499,7 @@ void SelectionView::toPython(void) } } -void SelectionView::showPart(void) +void SelectionView::showPart() { QListWidgetItem *item = selectionView->currentItem(); if (!item) @@ -615,7 +615,7 @@ void SelectionView::onItemContextMenu(const QPoint& point) menu.exec(selectionView->mapToGlobal(point)); } -void SelectionView::onUpdate(void) +void SelectionView::onUpdate() { } diff --git a/src/Gui/SelectionView.h b/src/Gui/SelectionView.h index d73ba2cd8c..205fadc514 100644 --- a/src/Gui/SelectionView.h +++ b/src/Gui/SelectionView.h @@ -66,10 +66,10 @@ public: bool onMsg(const char* pMsg,const char** ppReturn) override; - virtual const char *getName(void) const override {return "SelectionView";} + virtual const char *getName() const override {return "SelectionView";} /// get called when the document is changed or updated - virtual void onUpdate(void) override; + virtual void onUpdate() override; QListWidget* selectionView; QLabel* countLabel; @@ -81,17 +81,17 @@ public Q_SLOTS: /// get called when text is entered in the search box void search(const QString& text); /// get called when enter is pressed in the search box - void validateSearch(void); + void validateSearch(); /// get called when the list is right-clicked void onItemContextMenu(const QPoint& point); /// different actions void select(QListWidgetItem* item=nullptr); - void deselect(void); - void zoom(void); - void treeSelect(void); - void toPython(void); - void touch(void); - void showPart(void); + void deselect(); + void zoom(); + void treeSelect(); + void toPython(); + void touch(); + void showPart(); void onEnablePickList(); void toggleSelect(QListWidgetItem* item=nullptr); void preselect(QListWidgetItem* item=nullptr); diff --git a/src/Gui/SoAxisCrossKit.cpp b/src/Gui/SoAxisCrossKit.cpp index 17adf476e9..6daac87e49 100644 --- a/src/Gui/SoAxisCrossKit.cpp +++ b/src/Gui/SoAxisCrossKit.cpp @@ -62,7 +62,7 @@ using namespace Gui; SO_KIT_SOURCE(SoShapeScale) // Constructor. -SoShapeScale::SoShapeScale(void) +SoShapeScale::SoShapeScale() { SO_KIT_CONSTRUCTOR(SoShapeScale); @@ -82,7 +82,7 @@ SoShapeScale::~SoShapeScale() } void -SoShapeScale::initClass(void) +SoShapeScale::initClass() { SO_KIT_INIT_CLASS(SoShapeScale, SoBaseKit, "BaseKit"); } diff --git a/src/Gui/SoFCBackgroundGradient.cpp b/src/Gui/SoFCBackgroundGradient.cpp index 025e8832cf..4f40eb7140 100644 --- a/src/Gui/SoFCBackgroundGradient.cpp +++ b/src/Gui/SoFCBackgroundGradient.cpp @@ -61,7 +61,7 @@ SoFCBackgroundGradient::~SoFCBackgroundGradient() } // doc from parent -void SoFCBackgroundGradient::initClass(void) +void SoFCBackgroundGradient::initClass() { SO_NODE_INIT_CLASS(SoFCBackgroundGradient,SoNode,"Node"); } diff --git a/src/Gui/SoFCBoundingBox.cpp b/src/Gui/SoFCBoundingBox.cpp index 685958c218..07bfa024a9 100644 --- a/src/Gui/SoFCBoundingBox.cpp +++ b/src/Gui/SoFCBoundingBox.cpp @@ -256,7 +256,7 @@ SoSkipBoundingGroup::~SoSkipBoundingGroup() } void -SoSkipBoundingGroup::initClass(void) +SoSkipBoundingGroup::initClass() { SO_NODE_INIT_CLASS(SoSkipBoundingGroup,SoGroup,"Group"); } diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp index 8ea25b80be..36e4f0657c 100644 --- a/src/Gui/SoFCDB.cpp +++ b/src/Gui/SoFCDB.cpp @@ -83,7 +83,7 @@ using namespace Gui::PropertyEditor; static SbBool init_done = false; static SoGroup *storage = nullptr; -SbBool Gui::SoFCDB::isInitialized(void) +SbBool Gui::SoFCDB::isInitialized() { return init_done; } diff --git a/src/Gui/SoFCInteractiveElement.cpp b/src/Gui/SoFCInteractiveElement.cpp index dda3b49e45..b3e79132af 100644 --- a/src/Gui/SoFCInteractiveElement.cpp +++ b/src/Gui/SoFCInteractiveElement.cpp @@ -33,7 +33,7 @@ using namespace Gui; SO_ELEMENT_SOURCE(SoFCInteractiveElement) -void SoFCInteractiveElement::initClass(void) +void SoFCInteractiveElement::initClass() { SO_ELEMENT_INIT_CLASS(SoFCInteractiveElement, inherited); SO_ENABLE(SoGLRenderAction, SoFCInteractiveElement); @@ -74,7 +74,7 @@ const SoFCInteractiveElement * SoFCInteractiveElement::getInstance(SoState * sta SO_ELEMENT_SOURCE(SoGLWidgetElement) -void SoGLWidgetElement::initClass(void) +void SoGLWidgetElement::initClass() { SO_ELEMENT_INIT_CLASS(SoGLWidgetElement, inherited); SO_ENABLE(SoGLRenderAction, SoGLWidgetElement); @@ -120,7 +120,7 @@ SbBool SoGLWidgetElement::matches(const SoElement * /*element*/) const return true; } -SoElement * SoGLWidgetElement::copyMatchInfo(void) const +SoElement * SoGLWidgetElement::copyMatchInfo() const { return nullptr; } @@ -129,7 +129,7 @@ SoElement * SoGLWidgetElement::copyMatchInfo(void) const SO_ELEMENT_SOURCE(SoGLRenderActionElement) -void SoGLRenderActionElement::initClass(void) +void SoGLRenderActionElement::initClass() { SO_ELEMENT_INIT_CLASS(SoGLRenderActionElement, inherited); SO_ENABLE(SoGLRenderAction, SoGLRenderActionElement); @@ -175,7 +175,7 @@ SbBool SoGLRenderActionElement::matches(const SoElement * /*element*/) const return true; } -SoElement * SoGLRenderActionElement::copyMatchInfo(void) const +SoElement * SoGLRenderActionElement::copyMatchInfo() const { return nullptr; } @@ -187,7 +187,7 @@ SO_NODE_SOURCE(SoGLWidgetNode) /*! Constructor. */ -SoGLWidgetNode::SoGLWidgetNode(void) : window(nullptr) +SoGLWidgetNode::SoGLWidgetNode() : window(nullptr) { SO_NODE_CONSTRUCTOR(SoGLWidgetNode); } @@ -200,7 +200,7 @@ SoGLWidgetNode::~SoGLWidgetNode() } // Doc from superclass. -void SoGLWidgetNode::initClass(void) +void SoGLWidgetNode::initClass() { SO_NODE_INIT_CLASS(SoGLWidgetNode, SoNode, "Node"); @@ -223,7 +223,7 @@ void SoGLWidgetNode::GLRender(SoGLRenderAction * action) SO_ELEMENT_SOURCE(SoGLVBOActivatedElement) -void SoGLVBOActivatedElement::initClass(void) +void SoGLVBOActivatedElement::initClass() { SO_ELEMENT_INIT_CLASS(SoGLVBOActivatedElement, inherited); SO_ENABLE(SoGLRenderAction, SoGLVBOActivatedElement); @@ -279,7 +279,7 @@ SbBool SoGLVBOActivatedElement::matches(const SoElement * /*element*/) const return true; } -SoElement * SoGLVBOActivatedElement::copyMatchInfo(void) const +SoElement * SoGLVBOActivatedElement::copyMatchInfo() const { return nullptr; } diff --git a/src/Gui/SoFCSelection.cpp b/src/Gui/SoFCSelection.cpp index 6c1e88076d..ee349263c0 100644 --- a/src/Gui/SoFCSelection.cpp +++ b/src/Gui/SoFCSelection.cpp @@ -127,7 +127,7 @@ SoFCSelection::~SoFCSelection() // doc from parent void -SoFCSelection::initClass(void) +SoFCSelection::initClass() { SO_NODE_INIT_CLASS(SoFCSelection,SoGroup,"Group"); } diff --git a/src/Gui/SoFCSelection.h b/src/Gui/SoFCSelection.h index 448d8c4285..6bddfb1a9c 100644 --- a/src/Gui/SoFCSelection.h +++ b/src/Gui/SoFCSelection.h @@ -62,9 +62,9 @@ class GuiExport SoFCSelection : public SoGroup { SO_NODE_HEADER(Gui::SoFCSelection); public: - static void initClass(void); - static void finish(void); - SoFCSelection(void); + static void initClass(); + static void finish(); + SoFCSelection(); /// Load highlight settings from the configuration void applySettings (); @@ -85,7 +85,7 @@ public: EMISSIVE, EMISSIVE_DIFFUSE, BOX }; - SbBool isHighlighted(void) const {return highlighted;} + SbBool isHighlighted() const {return highlighted;} SoSFColor colorHighlight; SoSFColor colorSelection; diff --git a/src/Gui/SoFCSelectionAction.cpp b/src/Gui/SoFCSelectionAction.cpp index 457df0af6e..9e4501d8df 100644 --- a/src/Gui/SoFCSelectionAction.cpp +++ b/src/Gui/SoFCSelectionAction.cpp @@ -1086,12 +1086,12 @@ SO_ACTION_SOURCE(SoBoxSelectionRenderAction) // Overridden from parent class. void -SoBoxSelectionRenderAction::initClass(void) +SoBoxSelectionRenderAction::initClass() { SO_ACTION_INIT_CLASS(SoBoxSelectionRenderAction, SoGLRenderAction); } -SoBoxSelectionRenderAction::SoBoxSelectionRenderAction(void) +SoBoxSelectionRenderAction::SoBoxSelectionRenderAction() : inherited(SbViewportRegion()) { this->constructorCommon(); @@ -1107,7 +1107,7 @@ SoBoxSelectionRenderAction::SoBoxSelectionRenderAction(const SbViewportRegion & // private. called by both constructors // void -SoBoxSelectionRenderAction::constructorCommon(void) +SoBoxSelectionRenderAction::constructorCommon() { SO_ACTION_CONSTRUCTOR(SoBoxSelectionRenderAction); @@ -1133,7 +1133,7 @@ SoBoxSelectionRenderAction::constructorCommon(void) PRIVATE(this)->highlightPath = nullptr; } -SoBoxSelectionRenderAction::~SoBoxSelectionRenderAction(void) +SoBoxSelectionRenderAction::~SoBoxSelectionRenderAction() { // clear highlighting node if (PRIVATE(this)->highlightPath) { @@ -1273,7 +1273,7 @@ SoBoxSelectionRenderAction::setColor(const SbColor & color) } const SbColor & -SoBoxSelectionRenderAction::getColor(void) +SoBoxSelectionRenderAction::getColor() { return PRIVATE(this)->basecolor->rgb[0]; } @@ -1285,7 +1285,7 @@ SoBoxSelectionRenderAction::setLinePattern(unsigned short pattern) } unsigned short -SoBoxSelectionRenderAction::getLinePattern(void) const +SoBoxSelectionRenderAction::getLinePattern() const { return PRIVATE(this)->drawstyle->linePattern.getValue(); } @@ -1297,7 +1297,7 @@ SoBoxSelectionRenderAction::setLineWidth(const float width) } float -SoBoxSelectionRenderAction::getLineWidth(void) const +SoBoxSelectionRenderAction::getLineWidth() const { return PRIVATE(this)->drawstyle->lineWidth.getValue(); } diff --git a/src/Gui/SoFCUnifiedSelection.cpp b/src/Gui/SoFCUnifiedSelection.cpp index 5055ac3b71..0b2bbad987 100644 --- a/src/Gui/SoFCUnifiedSelection.cpp +++ b/src/Gui/SoFCUnifiedSelection.cpp @@ -149,7 +149,7 @@ SoFCUnifiedSelection::~SoFCUnifiedSelection() // doc from parent void -SoFCUnifiedSelection::initClass(void) +SoFCUnifiedSelection::initClass() { SO_NODE_INIT_CLASS(SoFCUnifiedSelection,SoSeparator,"Separator"); } @@ -194,7 +194,7 @@ void SoFCUnifiedSelection::applySettings() } } -const char* SoFCUnifiedSelection::getFileFormatName(void) const +const char* SoFCUnifiedSelection::getFileFormatName() const { return "Separator"; } @@ -1016,7 +1016,7 @@ void SoFCSeparator::GLRenderBelowPath(SoGLRenderAction * action) { inherited::GLRenderBelowPath(action); } -void SoFCSeparator::initClass(void) +void SoFCSeparator::initClass() { SO_NODE_INIT_CLASS(SoFCSeparator,SoSeparator,"FCSeparator"); } @@ -1056,7 +1056,7 @@ static void so_bbox_destruct_data(void * closure) static SbStorage * so_bbox_storage = nullptr; // called from atexit -static void so_bbox_cleanup(void) +static void so_bbox_cleanup() { delete so_bbox_storage; } @@ -1086,7 +1086,7 @@ SoFCSelectionRoot::~SoFCSelectionRoot() { } -void SoFCSelectionRoot::initClass(void) +void SoFCSelectionRoot::initClass() { SO_NODE_INIT_CLASS(SoFCSelectionRoot,SoFCSeparator,"FCSelectionRoot"); @@ -1684,7 +1684,7 @@ void SoFCPathAnnotation::finish() atexit_cleanup(); } -void SoFCPathAnnotation::initClass(void) +void SoFCPathAnnotation::initClass() { SO_NODE_INIT_CLASS(SoFCPathAnnotation,SoSeparator,"Separator"); } diff --git a/src/Gui/SoFCUnifiedSelection.h b/src/Gui/SoFCUnifiedSelection.h index 38b33974d8..06671b3b32 100644 --- a/src/Gui/SoFCUnifiedSelection.h +++ b/src/Gui/SoFCUnifiedSelection.h @@ -60,16 +60,16 @@ class GuiExport SoFCUnifiedSelection : public SoSeparator { SO_NODE_HEADER(Gui::SoFCUnifiedSelection); public: - static void initClass(void); - static void finish(void); - SoFCUnifiedSelection(void); + static void initClass(); + static void finish(); + SoFCUnifiedSelection(); void applySettings(); enum HighlightModes { AUTO, ON, OFF }; - const char* getFileFormatName(void) const; + const char* getFileFormatName() const; void write(SoWriteAction * action); SoSFColor colorHighlight; @@ -135,8 +135,8 @@ class GuiExport SoFCPathAnnotation : public SoSeparator { SO_NODE_HEADER(Gui::SoFCPathAnnotation); public: - static void initClass(void); - static void finish(void); + static void initClass(); + static void finish(); SoFCPathAnnotation(); void setPath(SoPath *); @@ -165,8 +165,8 @@ class GuiExport SoFCSeparator : public SoSeparator { SO_NODE_HEADER(Gui::SoFCSeparator); public: - static void initClass(void); - static void finish(void); + static void initClass(); + static void finish(); SoFCSeparator(bool trackCacheMode=true); virtual void GLRenderBelowPath(SoGLRenderAction * action); @@ -189,8 +189,8 @@ class GuiExport SoFCSelectionRoot : public SoFCSeparator { SO_NODE_HEADER(Gui::SoFCSelectionRoot); public: - static void initClass(void); - static void finish(void); + static void initClass(); + static void finish(); SoFCSelectionRoot(bool trackCacheMode=false); virtual void GLRenderBelowPath(SoGLRenderAction * action); diff --git a/src/Gui/SoFCVectorizeSVGAction.cpp b/src/Gui/SoFCVectorizeSVGAction.cpp index b37bcad4fd..efaa84d23c 100644 --- a/src/Gui/SoFCVectorizeSVGAction.cpp +++ b/src/Gui/SoFCVectorizeSVGAction.cpp @@ -57,7 +57,7 @@ public: class SoVectorizePoint : public SoVectorizeItem { public: - SoVectorizePoint(void) { + SoVectorizePoint() { this->type = POINT; this->vidx = 0; this->size = 1.0f; @@ -70,7 +70,7 @@ public: class SoVectorizeTriangle : public SoVectorizeItem { public: - SoVectorizeTriangle(void) { + SoVectorizeTriangle() { this->type = TRIANGLE; } int vidx[3]; // indices to BSPtree coordinates @@ -79,7 +79,7 @@ public: class SoVectorizeLine : public SoVectorizeItem { public: - SoVectorizeLine(void) { + SoVectorizeLine() { this->type = LINE; vidx[0] = 0; vidx[1] = 0; @@ -96,7 +96,7 @@ public: class SoVectorizeText : public SoVectorizeItem { public: - SoVectorizeText(void) { + SoVectorizeText() { this->type = TEXT; this->fontsize = 10; this->col = 0; @@ -119,7 +119,7 @@ public: class SoVectorizeImage : public SoVectorizeItem { public: - SoVectorizeImage(void) { + SoVectorizeImage() { this->type = IMAGE; this->image.data = nullptr; this->image.nc = 0; @@ -158,7 +158,7 @@ SbBool SoSVGVectorOutput::openFile (const char *filename) return this->file.is_open(); } -void SoSVGVectorOutput::closeFile (void) +void SoSVGVectorOutput::closeFile () { if (this->file.is_open()) this->file.close(); @@ -373,7 +373,7 @@ void SoFCVectorizeSVGActionP::printImage(const SoVectorizeImage * item) const SO_ACTION_SOURCE(SoFCVectorizeSVGAction) -void SoFCVectorizeSVGAction::initClass(void) +void SoFCVectorizeSVGAction::initClass() { SO_ACTION_INIT_CLASS(SoFCVectorizeSVGAction, SoVectorizeAction); } @@ -394,12 +394,12 @@ SoFCVectorizeSVGAction::~SoFCVectorizeSVGAction() } SoSVGVectorOutput * -SoFCVectorizeSVGAction::getSVGOutput(void) const +SoFCVectorizeSVGAction::getSVGOutput() const { return static_cast(SoVectorizeAction::getOutput()); } -void SoFCVectorizeSVGAction::printHeader(void) const +void SoFCVectorizeSVGAction::printHeader() const { std::ostream& str = this->getSVGOutput()->getFileStream(); str << "" << std::endl; @@ -421,18 +421,18 @@ void SoFCVectorizeSVGAction::printHeader(void) const str << "" << std::endl; } -void SoFCVectorizeSVGAction::printFooter(void) const +void SoFCVectorizeSVGAction::printFooter() const { std::ostream& str = this->getSVGOutput()->getFileStream(); str << "" << std::endl; str << ""; } -void SoFCVectorizeSVGAction::printViewport(void) const +void SoFCVectorizeSVGAction::printViewport() const { } -void SoFCVectorizeSVGAction::printBackground(void) const +void SoFCVectorizeSVGAction::printBackground() const { if (!getBackgroundState()) { return; diff --git a/src/Gui/SoFCVectorizeU3DAction.cpp b/src/Gui/SoFCVectorizeU3DAction.cpp index de876ad066..0c77734fa8 100644 --- a/src/Gui/SoFCVectorizeU3DAction.cpp +++ b/src/Gui/SoFCVectorizeU3DAction.cpp @@ -58,7 +58,7 @@ public: class SoVectorizePoint : public SoVectorizeItem { public: - SoVectorizePoint(void) { + SoVectorizePoint() { this->type = POINT; this->vidx = 0; this->size = 1.0f; @@ -71,7 +71,7 @@ public: class SoVectorizeTriangle : public SoVectorizeItem { public: - SoVectorizeTriangle(void) { + SoVectorizeTriangle() { this->type = TRIANGLE; } int vidx[3]; // indices to BSPtree coordinates @@ -80,7 +80,7 @@ public: class SoVectorizeLine : public SoVectorizeItem { public: - SoVectorizeLine(void) { + SoVectorizeLine() { this->type = LINE; vidx[0] = 0; vidx[1] = 0; @@ -97,7 +97,7 @@ public: class SoVectorizeText : public SoVectorizeItem { public: - SoVectorizeText(void) { + SoVectorizeText() { this->type = TEXT; this->fontsize = 10; this->col = 0; @@ -120,7 +120,7 @@ public: class SoVectorizeImage : public SoVectorizeItem { public: - SoVectorizeImage(void) { + SoVectorizeImage() { this->type = IMAGE; this->image.data = nullptr; this->image.nc = 0; @@ -159,7 +159,7 @@ SbBool SoU3DVectorOutput::openFile (const char *filename) return this->file.is_open(); } -void SoU3DVectorOutput::closeFile (void) +void SoU3DVectorOutput::closeFile () { if (this->file.is_open()) this->file.close(); @@ -293,7 +293,7 @@ void SoFCVectorizeU3DActionP::printImage(const SoVectorizeImage * item) const SO_ACTION_SOURCE(SoFCVectorizeU3DAction) -void SoFCVectorizeU3DAction::initClass(void) +void SoFCVectorizeU3DAction::initClass() { SO_ACTION_INIT_CLASS(SoFCVectorizeU3DAction, SoVectorizeAction); //SO_ACTION_ADD_METHOD(SoNode, SoFCVectorizeU3DAction::actionMethod); @@ -312,7 +312,7 @@ SoFCVectorizeU3DAction::~SoFCVectorizeU3DAction() } SoU3DVectorOutput * -SoFCVectorizeU3DAction::getU3DOutput(void) const +SoFCVectorizeU3DAction::getU3DOutput() const { return static_cast(SoVectorizeAction::getOutput()); } @@ -334,7 +334,7 @@ void SoFCVectorizeU3DAction::endTraversal(SoNode * node) inherited::endTraversal(node); } -void SoFCVectorizeU3DAction::printHeader(void) const +void SoFCVectorizeU3DAction::printHeader() const { std::ostream& str = this->getU3DOutput()->getFileStream(); str << "FILE_FORMAT \"IDTF\"" << std::endl @@ -358,15 +358,15 @@ void SoFCVectorizeU3DAction::printHeader(void) const str << Base::tabs(0) << "}" << std::endl; } -void SoFCVectorizeU3DAction::printFooter(void) const +void SoFCVectorizeU3DAction::printFooter() const { } -void SoFCVectorizeU3DAction::printViewport(void) const +void SoFCVectorizeU3DAction::printViewport() const { } -void SoFCVectorizeU3DAction::printBackground(void) const +void SoFCVectorizeU3DAction::printBackground() const { //SbVec2f mul = getRotatedViewportSize(); //SbVec2f add = getRotatedViewportStartpos(); diff --git a/src/Gui/Splashscreen.h b/src/Gui/Splashscreen.h index 076242d793..53d842b324 100644 --- a/src/Gui/Splashscreen.h +++ b/src/Gui/Splashscreen.h @@ -78,7 +78,7 @@ public: virtual ~LicenseView(); void setSource(const QUrl & url); - const char *getName(void) const { + const char *getName() const { return "LicenseView"; } diff --git a/src/Gui/SplitView3DInventor.cpp b/src/Gui/SplitView3DInventor.cpp index ba8bbd3404..a053d7f021 100644 --- a/src/Gui/SplitView3DInventor.cpp +++ b/src/Gui/SplitView3DInventor.cpp @@ -305,12 +305,12 @@ void AbstractSplitView::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp } } -void AbstractSplitView::onUpdate(void) +void AbstractSplitView::onUpdate() { update(); } -const char *AbstractSplitView::getName(void) const +const char *AbstractSplitView::getName() const { return "SplitView3DInventor"; } @@ -423,7 +423,7 @@ void AbstractSplitView::setOverrideCursor(const QCursor& aCursor) //_viewer->getWidget()->setCursor(aCursor); } -PyObject *AbstractSplitView::getPyObject(void) +PyObject *AbstractSplitView::getPyObject() { if (!_viewerPy) _viewerPy = new AbstractSplitViewPy(this); diff --git a/src/Gui/SplitView3DInventor.h b/src/Gui/SplitView3DInventor.h index 5796d5074a..d6db11dc17 100644 --- a/src/Gui/SplitView3DInventor.h +++ b/src/Gui/SplitView3DInventor.h @@ -47,13 +47,13 @@ public: AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=Qt::WindowFlags()); ~AbstractSplitView(); - virtual const char *getName(void) const; + virtual const char *getName() const; /// Message handler virtual bool onMsg(const char* pMsg, const char** ppReturn); virtual bool onHasMsg(const char* pMsg) const; virtual void OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::MessageType Reason); - virtual void onUpdate(void); + virtual void onUpdate(); virtual void deleteSelf(); virtual void viewAll(); @@ -61,7 +61,7 @@ public: void setOverrideCursor(const QCursor&); virtual bool containsViewProvider(const ViewProvider*) const; - PyObject *getPyObject(void); + PyObject *getPyObject(); void setPyObject(PyObject *); int getSize(); diff --git a/src/Gui/TaskDlgRelocation.h b/src/Gui/TaskDlgRelocation.h index 7b871b6002..b4d452891f 100644 --- a/src/Gui/TaskDlgRelocation.h +++ b/src/Gui/TaskDlgRelocation.h @@ -92,7 +92,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Gui/TaskView/TaskDialog.cpp b/src/Gui/TaskView/TaskDialog.cpp index a2358c161a..9e8a30abd5 100644 --- a/src/Gui/TaskView/TaskDialog.cpp +++ b/src/Gui/TaskView/TaskDialog.cpp @@ -55,7 +55,7 @@ TaskDialog::~TaskDialog() //==== Slots =============================================================== -const std::vector &TaskDialog::getDialogContent(void) const +const std::vector &TaskDialog::getDialogContent() const { return Content; } diff --git a/src/Gui/TaskView/TaskDialogPython.cpp b/src/Gui/TaskView/TaskDialogPython.cpp index 5a6f06e862..e1588b3b61 100644 --- a/src/Gui/TaskView/TaskDialogPython.cpp +++ b/src/Gui/TaskView/TaskDialogPython.cpp @@ -478,7 +478,7 @@ void TaskDialogPython::helpRequested() } } -QDialogButtonBox::StandardButtons TaskDialogPython::getStandardButtons(void) const +QDialogButtonBox::StandardButtons TaskDialogPython::getStandardButtons() const { Base::PyGILStateLocker lock; try { @@ -518,7 +518,7 @@ void TaskDialogPython::modifyStandardButtons(QDialogButtonBox *buttonBox) } } -bool TaskDialogPython::isAllowedAlterDocument(void) const +bool TaskDialogPython::isAllowedAlterDocument() const { Base::PyGILStateLocker lock; try { @@ -537,7 +537,7 @@ bool TaskDialogPython::isAllowedAlterDocument(void) const return TaskDialog::isAllowedAlterDocument(); } -bool TaskDialogPython::isAllowedAlterView(void) const +bool TaskDialogPython::isAllowedAlterView() const { Base::PyGILStateLocker lock; try { @@ -556,7 +556,7 @@ bool TaskDialogPython::isAllowedAlterView(void) const return TaskDialog::isAllowedAlterView(); } -bool TaskDialogPython::isAllowedAlterSelection(void) const +bool TaskDialogPython::isAllowedAlterSelection() const { Base::PyGILStateLocker lock; try { diff --git a/src/Gui/TaskView/TaskDialogPython.h b/src/Gui/TaskView/TaskDialogPython.h index 178f562c7e..a4d2a340dd 100644 --- a/src/Gui/TaskView/TaskDialogPython.h +++ b/src/Gui/TaskView/TaskDialogPython.h @@ -34,7 +34,7 @@ namespace TaskView { class ControlPy : public Py::PythonExtension { public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods static ControlPy* getInstance(); ControlPy(); @@ -73,24 +73,24 @@ public: TaskDialogPython(const Py::Object&); ~TaskDialogPython(); - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const; + virtual QDialogButtonBox::StandardButtons getStandardButtons() const; virtual void modifyStandardButtons(QDialogButtonBox*); /*! Indicates whether this task dialog allows other commands to modify the document while it is open. */ - virtual bool isAllowedAlterDocument(void) const; + virtual bool isAllowedAlterDocument() const; /*! Indicates whether this task dialog allows other commands to modify the 3d view while it is open. */ - virtual bool isAllowedAlterView(void) const; + virtual bool isAllowedAlterView() const; /*! Indicates whether this task dialog allows other commands to modify the selection while it is open. */ - virtual bool isAllowedAlterSelection(void) const; + virtual bool isAllowedAlterSelection() const; virtual bool needsFullSpace() const; public: diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.cpp b/src/Gui/TaskView/TaskSelectLinkProperty.cpp index f15e9e7534..93f03e51cc 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.cpp +++ b/src/Gui/TaskView/TaskSelectLinkProperty.cpp @@ -102,7 +102,7 @@ bool TaskSelectLinkProperty::setFilter(const char * sFilter) } -void TaskSelectLinkProperty::activate(void) +void TaskSelectLinkProperty::activate() { // first clear the selection Gui::Selection().clearSelection(); @@ -140,7 +140,7 @@ void TaskSelectLinkProperty::activate(void) checkSelectionStatus(); } -bool TaskSelectLinkProperty::accept(void) +bool TaskSelectLinkProperty::accept() { // set the proptery with the selection sendSelection2Property(); @@ -151,7 +151,7 @@ bool TaskSelectLinkProperty::accept(void) return true; } -bool TaskSelectLinkProperty::reject(void) +bool TaskSelectLinkProperty::reject() { if(LinkSub){ // restore the old values @@ -164,7 +164,7 @@ bool TaskSelectLinkProperty::reject(void) return true; } -void TaskSelectLinkProperty::sendSelection2Property(void) +void TaskSelectLinkProperty::sendSelection2Property() { if (LinkSub) { std::vector temp = Gui::Selection().getSelectionEx(); @@ -182,7 +182,7 @@ void TaskSelectLinkProperty::sendSelection2Property(void) } -void TaskSelectLinkProperty::checkSelectionStatus(void) +void TaskSelectLinkProperty::checkSelectionStatus() { QPalette palette(QApplication::palette()); diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.h b/src/Gui/TaskView/TaskSelectLinkProperty.h index 2abd6aa0fb..6a8c2b0db5 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.h +++ b/src/Gui/TaskView/TaskSelectLinkProperty.h @@ -66,16 +66,16 @@ public: bool setFilter(const char*); /// set the TaskSelectLinkProperty active, means setting the selection and control it - void activate(void); + void activate(); /// call this to accept the changes the user has made and send back to the Property (Ok) - bool accept(void); + bool accept(); /// This discards the changes of the user and leaves the Property untouched (Cancel) - bool reject(void); + bool reject(); /// send the selection to the Property for e.g. forced recomputation of a feature - void sendSelection2Property(void); + void sendSelection2Property(); /// checks if the filter is currently met - inline bool isSelectionValid(void) const {return Filter->match();} + inline bool isSelectionValid() const {return Filter->match();} private Q_SLOTS: void on_Remove_clicked(bool); @@ -84,15 +84,15 @@ private Q_SLOTS: void on_Help_clicked(bool); Q_SIGNALS: - void emitSelectionFit(void); - void emitSelectionMisfit(void); + void emitSelectionFit(); + void emitSelectionMisfit(); protected: void changeEvent(QEvent *e); private: // checks for selection and set background color and signals - void checkSelectionStatus(void); + void checkSelectionStatus(); QWidget* proxy; Ui_TaskSelectLinkProperty* ui; diff --git a/src/Gui/TaskView/TaskView.cpp b/src/Gui/TaskView/TaskView.cpp index 1cd46d7c47..28bed5fc13 100644 --- a/src/Gui/TaskView/TaskView.cpp +++ b/src/Gui/TaskView/TaskView.cpp @@ -523,7 +523,7 @@ void TaskView::showDialog(TaskDialog *dlg) getMainWindow()->updateActions(); } -void TaskView::removeDialog(void) +void TaskView::removeDialog() { getMainWindow()->updateActions(); @@ -561,7 +561,7 @@ void TaskView::removeDialog(void) } } -void TaskView::updateWatcher(void) +void TaskView::updateWatcher() { // In case a child of the TaskView has the focus and get hidden we have // to make sure to set the focus on a widget that won't be hidden or @@ -608,7 +608,7 @@ void TaskView::addTaskWatcher(const std::vector &Watcher) addTaskWatcher(); } -void TaskView::clearTaskWatcher(void) +void TaskView::clearTaskWatcher() { std::vector watcher; removeTaskWatcher(); @@ -616,7 +616,7 @@ void TaskView::clearTaskWatcher(void) addTaskWatcher(watcher); } -void TaskView::addTaskWatcher(void) +void TaskView::addTaskWatcher() { // add all widgets for all watcher to the task view for (std::vector::iterator it=ActiveWatcher.begin();it!=ActiveWatcher.end();++it){ @@ -646,7 +646,7 @@ void TaskView::addTaskWatcher(void) taskPanel->setScheme(QSint::FreeCADPanelScheme::defaultScheme()); } -void TaskView::removeTaskWatcher(void) +void TaskView::removeTaskWatcher() { // In case a child of the TaskView has the focus and get hidden we have // to make sure that set the focus on a widget that won't be hidden or diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index 5f1c0b9064..0411c66fde 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -153,7 +153,7 @@ public: friend class Gui::ControlSingleton; void addTaskWatcher(const std::vector &Watcher); - void clearTaskWatcher(void); + void clearTaskWatcher(); void clearActionStyle(); void restoreActionStyle(); @@ -168,14 +168,14 @@ protected: virtual void keyPressEvent(QKeyEvent*); virtual bool event(QEvent*); - void addTaskWatcher(void); - void removeTaskWatcher(void); + void addTaskWatcher(); + void removeTaskWatcher(); /// update the visibility of the TaskWatcher accordant to the selection - void updateWatcher(void); + void updateWatcher(); /// used by Gui::Control to register Dialogs void showDialog(TaskDialog *dlg); // removes the running dialog after accept() or reject() from the TaskView - void removeDialog(void); + void removeDialog(); void slotActiveDocument(const App::Document&); void slotDeletedDocument(); diff --git a/src/Gui/TaskView/TaskWatcher.cpp b/src/Gui/TaskView/TaskWatcher.cpp index 14ae2f6f76..014e9c32f7 100644 --- a/src/Gui/TaskView/TaskWatcher.cpp +++ b/src/Gui/TaskView/TaskWatcher.cpp @@ -59,7 +59,7 @@ TaskWatcher::~TaskWatcher() //==== implementer =========================================================================== -std::vector &TaskWatcher::getWatcherContent(void) +std::vector &TaskWatcher::getWatcherContent() { return Content; } diff --git a/src/Gui/TaskView/TaskWatcher.h b/src/Gui/TaskView/TaskWatcher.h index a4a5b1bcfd..10639df61d 100644 --- a/src/Gui/TaskView/TaskWatcher.h +++ b/src/Gui/TaskView/TaskWatcher.h @@ -44,11 +44,11 @@ public: TaskWatcher(const char* Filter); virtual ~TaskWatcher(); - std::vector &getWatcherContent(void); + std::vector &getWatcherContent(); public: /// is called wenn the document or the Selection changes. - virtual bool shouldShow(void); + virtual bool shouldShow(); protected: /// List of TaskBoxes of that dialog @@ -68,7 +68,7 @@ public: public: /// is called wenn the document or the Selection changes. - virtual bool shouldShow(void); + virtual bool shouldShow(); }; @@ -84,7 +84,7 @@ public: public: /// is called wenn the document or the Selection changes. - virtual bool shouldShow(void); + virtual bool shouldShow(); }; @@ -101,7 +101,7 @@ public: public: /// is called wenn the document or the Selection changes. - virtual bool shouldShow(void); + virtual bool shouldShow(); }; diff --git a/src/Gui/Thumbnail.cpp b/src/Gui/Thumbnail.cpp index 50709df7ac..aa41e9686b 100644 --- a/src/Gui/Thumbnail.cpp +++ b/src/Gui/Thumbnail.cpp @@ -65,7 +65,7 @@ void Thumbnail::setFileName(const char* fn) this->uri = QUrl::fromLocalFile(QString::fromUtf8(fn)); } -unsigned int Thumbnail::getMemSize (void) const +unsigned int Thumbnail::getMemSize () const { return 0; } diff --git a/src/Gui/Thumbnail.h b/src/Gui/Thumbnail.h index 5bd487ff81..665543acbb 100644 --- a/src/Gui/Thumbnail.h +++ b/src/Gui/Thumbnail.h @@ -44,7 +44,7 @@ public: /** @name I/O of the document */ //@{ - unsigned int getMemSize (void) const; + unsigned int getMemSize () const; /// This method is used to save properties or very small amounts of data to an XML document. void Save (Base::Writer &writer) const; /// This method is used to restore properties from an XML document. diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 8589972584..9b27541535 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -2446,7 +2446,7 @@ struct UpdateDisabler { } }; -void TreeWidget::onUpdateStatus(void) +void TreeWidget::onUpdateStatus() { if (this->state() == DraggingState || App::GetApplication().isRestoring()) { _updateStatus(); @@ -3844,7 +3844,7 @@ static unsigned int countExpandedItem(const QTreeWidgetItem* item) { return size; } -unsigned int DocumentItem::getMemSize(void) const { +unsigned int DocumentItem::getMemSize() const { return countExpandedItem(this); } @@ -4046,7 +4046,7 @@ Gui::Document* DocumentItem::document() const // } //} -void DocumentItem::testStatus(void) +void DocumentItem::testStatus() { for (const auto& v : ObjectMap) v.second->testStatus(); diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h index e69f1f5352..e6ce57cb9d 100644 --- a/src/Gui/Tree.h +++ b/src/Gui/Tree.h @@ -160,12 +160,12 @@ protected Q_SLOTS: void onSearchObjects(); private Q_SLOTS: - void onItemSelectionChanged(void); + void onItemSelectionChanged(); void onItemChanged(QTreeWidgetItem*, int); void onItemEntered(QTreeWidgetItem * item); void onItemCollapsed(QTreeWidgetItem * item); void onItemExpanded(QTreeWidgetItem * item); - void onUpdateStatus(void); + void onUpdateStatus(); Q_SIGNALS: void emitSearchObjects(); @@ -274,7 +274,7 @@ public: }; void selectItems(SelectionReason reason=SR_SELECT); - void testStatus(void); + void testStatus(); void setData(int column, int role, const QVariant & value) override; void populateItem(DocumentObjectItem *item, bool refresh=false, bool delayUpdate=true); bool populateObject(App::DocumentObject *obj); @@ -292,7 +292,7 @@ public: bool isObjectShowable(App::DocumentObject *obj); - virtual unsigned int getMemSize (void) const override; + virtual unsigned int getMemSize () const override; virtual void Save (Base::Writer &) const override; virtual void Restore(Base::XMLReader &) override; diff --git a/src/Gui/View.cpp b/src/Gui/View.cpp index b7856323b7..486f7e3f4f 100644 --- a/src/Gui/View.cpp +++ b/src/Gui/View.cpp @@ -54,7 +54,7 @@ BaseView::~BaseView() onClose(); } -void BaseView::onClose(void) +void BaseView::onClose() { if (bIsDetached) return; diff --git a/src/Gui/View.h b/src/Gui/View.h index 35e7f3095e..e2ef1b072a 100644 --- a/src/Gui/View.h +++ b/src/Gui/View.h @@ -70,7 +70,7 @@ public: /// sets the view to another document (called by Application) void setDocument(Gui::Document* pcDocument); /// is sent from the document in order to close the document - void onClose(void); + void onClose(); //@} /// returns the document the view is attached to @@ -78,26 +78,26 @@ public: /// returns the document the view is attached to App::Document* getAppDocument() const; /// indicates if the view is in passive mode - bool isPassive(void) const {return bIsPassive;} + bool isPassive() const {return bIsPassive;} /** @name methods to override */ //@{ /// get called when the document is updated - virtual void onUpdate(void){} + virtual void onUpdate(){} /// get called when the document is relabeled (change of its user name) virtual void onRelabel(Gui::Document *){} /// get called when the document is renamed (change of its internal name) virtual void onRename(Gui::Document *){} /// returns the name of the view (important for messages) - virtual const char *getName(void) const + virtual const char *getName() const { return "Base view"; } /// Message handler virtual bool onMsg(const char* pMsg, const char** ppReturn)=0; /// Message handler test virtual bool onHasMsg(const char* pMsg) const=0; /// overwrite when checking on close state - virtual bool canClose(void){return true;} + virtual bool canClose(){return true;} /// delete itself virtual void deleteSelf(); //@} diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index e885f00fef..7c53c59bbe 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -217,7 +217,7 @@ void View3DInventor::deleteSelf() MDIView::deleteSelf(); } -PyObject *View3DInventor::getPyObject(void) +PyObject *View3DInventor::getPyObject() { if (!_viewerPy) _viewerPy = new View3DInventorPy(this); @@ -448,7 +448,7 @@ void View3DInventor::onRename(Gui::Document *pDoc) cAct.apply(_viewer->getSceneGraph()); } -void View3DInventor::onUpdate(void) +void View3DInventor::onUpdate() { #ifdef FC_LOGUPDATECHAIN Base::Console().Log("Acti: Gui::View3DInventor::onUpdate()"); @@ -462,7 +462,7 @@ void View3DInventor::viewAll() _viewer->viewAll(); } -const char *View3DInventor::getName(void) const +const char *View3DInventor::getName() const { return "View3DInventor"; } diff --git a/src/Gui/View3DInventor.h b/src/Gui/View3DInventor.h index e629a1a25c..2bc59ffd99 100644 --- a/src/Gui/View3DInventor.h +++ b/src/Gui/View3DInventor.h @@ -79,9 +79,9 @@ public: virtual void OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::MessageType Reason); /// get called when the document is updated virtual void onRename(Gui::Document *pDoc); - virtual void onUpdate(void); + virtual void onUpdate(); virtual void viewAll(); - virtual const char *getName(void) const; + virtual const char *getName() const; /// print function of the view virtual void print(); @@ -89,7 +89,7 @@ public: virtual void printPreview(); virtual void print(QPrinter*); - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); /** * If \a b is set to \a FullScreen the MDI view is displayed in full screen mode, if \a b * is set to \a TopLevel then it is displayed as an own top-level window, otherwise (\a Normal) @@ -105,7 +105,7 @@ public: void setOverlayWidget(QWidget*); void removeOverlayWidget(); - View3DInventorViewer *getViewer(void) const {return _viewer;} + View3DInventorViewer *getViewer() const {return _viewer;} virtual bool containsViewProvider(const ViewProvider*) const; public Q_SLOTS: diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 5ca6072358..b3e5166e49 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -242,7 +242,7 @@ public: class SpaceNavigatorDevice : public Quarter::InputDevice { public: - SpaceNavigatorDevice(void) {} + SpaceNavigatorDevice() {} virtual ~SpaceNavigatorDevice() {} virtual const SoEvent* translateEvent(QEvent* event) { @@ -1373,7 +1373,7 @@ void View3DInventorViewer::setEnabledNaviCube(bool on) naviCubeEnabled = on; } -bool View3DInventorViewer::isEnabledNaviCube(void) const +bool View3DInventorViewer::isEnabledNaviCube() const { return naviCubeEnabled; } @@ -1417,7 +1417,7 @@ void View3DInventorViewer::setAxisCross(bool on) } } -bool View3DInventorViewer::hasAxisCross(void) +bool View3DInventorViewer::hasAxisCross() { return axisGroup; } @@ -1451,7 +1451,7 @@ NavigationStyle* View3DInventorViewer::navigationStyle() const return this->navigation; } -SoDirectionalLight* View3DInventorViewer::getBacklight(void) const +SoDirectionalLight* View3DInventorViewer::getBacklight() const { return this->backlight; } @@ -1461,7 +1461,7 @@ void View3DInventorViewer::setBacklight(SbBool on) this->backlight->on = on; } -SbBool View3DInventorViewer::isBacklight(void) const +SbBool View3DInventorViewer::isBacklight() const { return this->backlight->on.getValue(); } @@ -1710,7 +1710,7 @@ void View3DInventorViewer::setSelectionEnabled(const SbBool enable) static_cast(root)->selectionRole.setValue(enable); } -SbBool View3DInventorViewer::isSelectionEnabled(void) const +SbBool View3DInventorViewer::isSelectionEnabled() const { SoNode* root = getSceneGraph(); return static_cast(root)->selectionRole.getValue(); @@ -2265,7 +2265,7 @@ void View3DInventorViewer::renderGLImage() // Documented in superclass. Overrides this method to be able to draw // the axis cross, if selected, and to keep a continuous animation // upon spin. -void View3DInventorViewer::renderScene(void) +void View3DInventorViewer::renderScene() { // Must set up the OpenGL viewport manually, as upon resize // operations, Coin won't set it up until the SoGLRenderAction is @@ -2905,7 +2905,7 @@ extern void oculusStop (void); void oculusSetTestScene(View3DInventorRiftViewer *window); #endif -void View3DInventorViewer::viewVR(void) +void View3DInventorViewer::viewVR() { #if BUILD_VR if (oculusUp()) { @@ -3100,7 +3100,7 @@ View3DInventorViewer::setAnimationEnabled(const SbBool enable) */ SbBool -View3DInventorViewer::isAnimationEnabled(void) const +View3DInventorViewer::isAnimationEnabled() const { return navigation->isAnimationEnabled(); } @@ -3109,7 +3109,7 @@ View3DInventorViewer::isAnimationEnabled(void) const Query if the model in the viewer is currently in spinning mode after a user drag. */ -SbBool View3DInventorViewer::isAnimating(void) const +SbBool View3DInventorViewer::isAnimating() const { return navigation->isAnimating(); } @@ -3123,7 +3123,7 @@ void View3DInventorViewer::startAnimating(const SbVec3f& axis, float velocity) navigation->startAnimating(axis, velocity); } -void View3DInventorViewer::stopAnimating(void) +void View3DInventorViewer::stopAnimating() { navigation->stopAnimating(); } @@ -3133,7 +3133,7 @@ void View3DInventorViewer::setPopupMenuEnabled(const SbBool on) navigation->setPopupMenuEnabled(on); } -SbBool View3DInventorViewer::isPopupMenuEnabled(void) const +SbBool View3DInventorViewer::isPopupMenuEnabled() const { return navigation->isPopupMenuEnabled(); } @@ -3161,7 +3161,7 @@ View3DInventorViewer::setFeedbackVisibility(const SbBool enable) */ SbBool -View3DInventorViewer::isFeedbackVisible(void) const +View3DInventorViewer::isFeedbackVisible() const { return this->axiscrossEnabled; } @@ -3190,7 +3190,7 @@ View3DInventorViewer::setFeedbackSize(const int size) */ int -View3DInventorViewer::getFeedbackSize(void) const +View3DInventorViewer::getFeedbackSize() const { return this->axiscrossSize; } @@ -3204,7 +3204,7 @@ void View3DInventorViewer::setCursorEnabled(SbBool /*enable*/) this->setCursorRepresentation(navigation->getViewingMode()); } -void View3DInventorViewer::afterRealizeHook(void) +void View3DInventorViewer::afterRealizeHook() { inherited::afterRealizeHook(); this->setCursorRepresentation(navigation->getViewingMode()); @@ -3223,7 +3223,7 @@ void View3DInventorViewer::setViewing(SbBool enable) inherited::setViewing(enable); } -void View3DInventorViewer::drawAxisCross(void) +void View3DInventorViewer::drawAxisCross() { // FIXME: convert this to a superimposition scenegraph instead of // OpenGL calls. 20020603 mortene. @@ -3398,7 +3398,7 @@ void View3DInventorViewer::drawAxisCross(void) } // Draw an arrow for the axis representation directly through OpenGL. -void View3DInventorViewer::drawArrow(void) +void View3DInventorViewer::drawArrow() { glDisable(GL_CULL_FACE); glBegin(GL_QUADS); @@ -3658,7 +3658,7 @@ void View3DInventorViewer::turnDeltaDimensionsOff() static_cast(dimensionRoot->getChild(1))->whichChild = SO_SWITCH_NONE; } -PyObject *View3DInventorViewer::getPyObject(void) +PyObject *View3DInventorViewer::getPyObject() { if (!_viewerPy) _viewerPy = new View3DInventorViewerPy(this); diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index 2224aac316..d825c7ca4e 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -142,27 +142,27 @@ public: void checkGroupOnTop(const SelectionChanges &Reason); void clearGroupOnTop(); - SoDirectionalLight* getBacklight(void) const; + SoDirectionalLight* getBacklight() const; void setBacklight(SbBool on); - SbBool isBacklight(void) const; + SbBool isBacklight() const; void setSceneGraph (SoNode *root); SbBool searchNode(SoNode*) const; void setAnimationEnabled(const SbBool enable); - SbBool isAnimationEnabled(void) const; + SbBool isAnimationEnabled() const; void setPopupMenuEnabled(const SbBool on); - SbBool isPopupMenuEnabled(void) const; + SbBool isPopupMenuEnabled() const; void startAnimating(const SbVec3f& axis, float velocity); - void stopAnimating(void); - SbBool isAnimating(void) const; + void stopAnimating(); + SbBool isAnimating() const; void setFeedbackVisibility(const SbBool enable); - SbBool isFeedbackVisible(void) const; + SbBool isFeedbackVisible() const; void setFeedbackSize(const int size); - int getFeedbackSize(void) const; + int getFeedbackSize() const; /// Get the preferred samples from the user settings static int getNumSamples(); @@ -246,7 +246,7 @@ public: std::vector getGLPolygon(const std::vector&) const; const std::vector& getPolygon(SelectionRole* role=nullptr) const; void setSelectionEnabled(const SbBool enable); - SbBool isSelectionEnabled(void) const; + SbBool isSelectionEnabled() const; //@} /// Returns the screen coordinates of the origin of the path's tail object @@ -262,7 +262,7 @@ public: void setRedirectToSceneGraph(SbBool redirect) { this->redirected = redirect; } SbBool isRedirectedToSceneGraph() const { return this->redirected; } void setRedirectToSceneGraphEnabled(SbBool enable) { this->allowredir = enable; } - SbBool isRedirectToSceneGraphEnabled(void) const { return this->allowredir; } + SbBool isRedirectToSceneGraphEnabled() const { return this->allowredir; } //@} /** @name Pick actions */ @@ -356,7 +356,7 @@ public: void viewAll(float factor); /// Breaks out a VR window for a Rift - void viewVR(void); + void viewVR(); /** * Returns the bounding box of the scene graph. @@ -380,11 +380,11 @@ public: void setNavigationType(Base::Type); void setAxisCross(bool b); - bool hasAxisCross(void); + bool hasAxisCross(); void setEnabledFPSCounter(bool b); void setEnabledNaviCube(bool b); - bool isEnabledNaviCube(void) const; + bool isEnabledNaviCube() const; void setNaviCubeCorner(int); NaviCube* getNavigationCube() const; void setEnabledVBO(bool b); @@ -396,7 +396,7 @@ public: void setDocument(Gui::Document *pcDocument); Gui::Document* getDocument(); - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); protected: GLenum getInternalTextureFormat() const; @@ -404,9 +404,9 @@ protected: void renderFramebuffer(); void renderGLImage(); void animatedViewAll(int steps, int ms); - virtual void actualRedraw(void); + virtual void actualRedraw(); virtual void setSeekMode(SbBool enable); - virtual void afterRealizeHook(void); + virtual void afterRealizeHook(); virtual bool processSoEvent(const SoEvent * ev); void dropEvent (QDropEvent * e); void dragEnterEvent (QDragEnterEvent * e); @@ -430,8 +430,8 @@ private: static void deselectCB(void * closure, SoPath * p); static SoPath * pickFilterCB(void * data, const SoPickedPoint * pick); void initialize(); - void drawAxisCross(void); - static void drawArrow(void); + void drawAxisCross(); + static void drawArrow(); void setCursorRepresentation(int mode); void aboutToDestroyGLContext(); void createStandardCursors(double); diff --git a/src/Gui/View3DViewerPy.h b/src/Gui/View3DViewerPy.h index e33292bb8b..af9cf4de0a 100644 --- a/src/Gui/View3DViewerPy.h +++ b/src/Gui/View3DViewerPy.h @@ -42,7 +42,7 @@ class View3DInventorViewer; class View3DInventorViewerPy : public Py::PythonExtension { public: - static void init_type(void); // announce properties and methods + static void init_type(); // announce properties and methods View3DInventorViewerPy(View3DInventorViewer *vi); ~View3DInventorViewerPy(); diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index 8be208031e..a2371108cc 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -291,7 +291,7 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node) } } -SoSeparator* ViewProvider::getAnnotation(void) +SoSeparator* ViewProvider::getAnnotation() { if (!pcAnnotation) { pcAnnotation = new SoSeparator(); @@ -312,7 +312,7 @@ void ViewProvider::update(const App::Property* prop) if (vis) ViewProvider::show(); } -QIcon ViewProvider::getIcon(void) const +QIcon ViewProvider::getIcon() const { return mergeGreyableOverlayIcons (Gui::BitmapFactory().pixmap(sPixmap)); } @@ -436,7 +436,7 @@ const char* ViewProvider::getDefaultDisplayMode() const { return nullptr; } -vector ViewProvider::getDisplayModes(void) const { +vector ViewProvider::getDisplayModes() const { std::vector< std::string > modes; auto vector = getExtensionsDerivedFromType(); @@ -447,12 +447,12 @@ vector ViewProvider::getDisplayModes(void) const { return modes; } -std::string ViewProvider::getActiveDisplayMode(void) const +std::string ViewProvider::getActiveDisplayMode() const { return _sCurrentMode; } -void ViewProvider::hide(void) +void ViewProvider::hide() { auto exts = getExtensionsDerivedFromType(); @@ -467,7 +467,7 @@ void ViewProvider::hide(void) ext->extensionHide(); } -void ViewProvider::show(void) +void ViewProvider::show() { setModeSwitch(); @@ -477,7 +477,7 @@ void ViewProvider::show(void) ext->extensionShow(); } -bool ViewProvider::isShow(void) const +bool ViewProvider::isShow() const { return pcModeSwitch->whichChild.getValue() != -1; } @@ -846,7 +846,7 @@ void ViewProvider::updateData(const App::Property* prop) ext->extensionUpdateData(prop); } -SoSeparator* ViewProvider::getBackRoot(void) const +SoSeparator* ViewProvider::getBackRoot() const { auto vector = getExtensionsDerivedFromType(); for (Gui::ViewProviderExtension* ext : vector) { @@ -857,7 +857,7 @@ SoSeparator* ViewProvider::getBackRoot(void) const return nullptr; } -SoGroup* ViewProvider::getChildRoot(void) const +SoGroup* ViewProvider::getChildRoot() const { auto vector = getExtensionsDerivedFromType(); for (Gui::ViewProviderExtension* ext : vector) { @@ -868,7 +868,7 @@ SoGroup* ViewProvider::getChildRoot(void) const return nullptr; } -SoSeparator* ViewProvider::getFrontRoot(void) const +SoSeparator* ViewProvider::getFrontRoot() const { auto vector = getExtensionsDerivedFromType(); for (Gui::ViewProviderExtension* ext : vector) { @@ -879,7 +879,7 @@ SoSeparator* ViewProvider::getFrontRoot(void) const return nullptr; } -std::vector< App::DocumentObject* > ViewProvider::claimChildren(void) const +std::vector< App::DocumentObject* > ViewProvider::claimChildren() const { std::vector< App::DocumentObject* > vec; auto vector = getExtensionsDerivedFromType(); @@ -891,7 +891,7 @@ std::vector< App::DocumentObject* > ViewProvider::claimChildren(void) const return vec; } -std::vector< App::DocumentObject* > ViewProvider::claimChildren3D(void) const +std::vector< App::DocumentObject* > ViewProvider::claimChildren3D() const { std::vector< App::DocumentObject* > vec; auto vector = getExtensionsDerivedFromType(); diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index ed7682e52e..b82acdf2da 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -128,18 +128,18 @@ public: virtual ~ViewProvider(); // returns the root node of the Provider (3D) - virtual SoSeparator* getRoot(void) const {return pcRoot;} + virtual SoSeparator* getRoot() const {return pcRoot;} // return the mode switch node of the Provider (3D) - SoSwitch *getModeSwitch(void) const {return pcModeSwitch;} + SoSwitch *getModeSwitch() const {return pcModeSwitch;} SoTransform *getTransformNode() const {return pcTransform;} // returns the root for the Annotations. - SoSeparator* getAnnotation(void); + SoSeparator* getAnnotation(); // returns the root node of the Provider (3D) - virtual SoSeparator* getFrontRoot(void) const; + virtual SoSeparator* getFrontRoot() const; // returns the root node where the children gets collected(3D) - virtual SoGroup* getChildRoot(void) const; + virtual SoGroup* getChildRoot() const; // returns the root node of the Provider (3D) - virtual SoSeparator* getBackRoot(void) const; + virtual SoSeparator* getBackRoot() const; ///Indicate whether to be added to scene graph or not virtual bool canAddToSceneGraph() const {return true;} @@ -149,7 +149,7 @@ public: * scene graph. This affects the visibility and the 3D * position of the object. */ - virtual std::vector claimChildren3D(void) const; + virtual std::vector claimChildren3D() const; /** @name Selection handling * This group of methods do the selection handling. @@ -159,8 +159,8 @@ public: //@{ /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel(void) const; - virtual bool isSelectable(void) const {return true;} + virtual bool useNewSelectionModel() const; + virtual bool isSelectable() const {return true;} /// return a hit element given the picked point which contains the full node path virtual bool getElementPicked(const SoPickedPoint *, std::string &subname) const; /// return a hit element to the selection path or 0 @@ -241,7 +241,7 @@ public: */ //@{ /// deliver the icon shown in the tree view - virtual QIcon getIcon(void) const; + virtual QIcon getIcon() const; /** @name Methods used by the Tree * If you want to take control over the @@ -258,7 +258,7 @@ public: * be used for any kind of grouping needed for a special * purpose. */ - virtual std::vector claimChildren(void) const; + virtual std::vector claimChildren() const; //@} /** @name Drag and drop @@ -379,19 +379,19 @@ public: /** @name Display mode methods */ //@{ - std::string getActiveDisplayMode(void) const; + std::string getActiveDisplayMode() const; /// set the display mode virtual void setDisplayMode(const char* ModeName); /// get the default display mode virtual const char* getDefaultDisplayMode() const; /// returns a list of all possible display modes - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; /// Hides the view provider - virtual void hide(void); + virtual void hide(); /// Shows the view provider - virtual void show(void); + virtual void show(); /// checks whether the view provider is visible or not - virtual bool isShow(void) const; + virtual bool isShow() const; void setVisible(bool); bool isVisible() const; void setLinkVisible(bool); @@ -462,7 +462,7 @@ public: /// If null is returned then no transaction will be opened. virtual const char* getTransactionText() const { return nullptr; } /// is called by the tree if the user double clicks on the object - virtual bool doubleClicked(void) { return false; } + virtual bool doubleClicked() { return false; } /// is called when the provider is in edit and the mouse is moved virtual bool mouseMove(const SbVec2s &cursorPos, View3DInventorViewer* viewer); /// is called when the Provider is in edit and the mouse is clicked diff --git a/src/Gui/ViewProviderAnnotation.cpp b/src/Gui/ViewProviderAnnotation.cpp index c85cce261d..bf2d3b159e 100644 --- a/src/Gui/ViewProviderAnnotation.cpp +++ b/src/Gui/ViewProviderAnnotation.cpp @@ -163,7 +163,7 @@ void ViewProviderAnnotation::onChanged(const App::Property* prop) } } -std::vector ViewProviderAnnotation::getDisplayModes(void) const +std::vector ViewProviderAnnotation::getDisplayModes() const { // add modes std::vector StrList; @@ -333,7 +333,7 @@ void ViewProviderAnnotationLabel::onChanged(const App::Property* prop) } } -std::vector ViewProviderAnnotationLabel::getDisplayModes(void) const +std::vector ViewProviderAnnotationLabel::getDisplayModes() const { // add modes std::vector StrList; @@ -399,7 +399,7 @@ void ViewProviderAnnotationLabel::updateData(const App::Property* prop) ViewProviderDocumentObject::updateData(prop); } -bool ViewProviderAnnotationLabel::doubleClicked(void) +bool ViewProviderAnnotationLabel::doubleClicked() { Gui::Application::Instance->activeDocument()->setEdit(this); return true; diff --git a/src/Gui/ViewProviderAnnotation.h b/src/Gui/ViewProviderAnnotation.h index f986bb9c08..39d5659619 100644 --- a/src/Gui/ViewProviderAnnotation.h +++ b/src/Gui/ViewProviderAnnotation.h @@ -46,7 +46,7 @@ class GuiExport ViewProviderAnnotation : public ViewProviderDocumentObject public: /// Constructor - ViewProviderAnnotation(void); + ViewProviderAnnotation(); virtual ~ViewProviderAnnotation(); // Display properties @@ -60,7 +60,7 @@ public: void attach(App::DocumentObject *); void updateData(const App::Property*); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; void setDisplayMode(const char* ModeName); protected: @@ -90,7 +90,7 @@ class GuiExport ViewProviderAnnotationLabel : public ViewProviderDocumentObject public: /// Constructor - ViewProviderAnnotationLabel(void); + ViewProviderAnnotationLabel(); virtual ~ViewProviderAnnotationLabel(); // Display properties @@ -103,12 +103,12 @@ public: void attach(App::DocumentObject *); void updateData(const App::Property*); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; void setDisplayMode(const char* ModeName); /** @name Edit methods */ //@{ - bool doubleClicked(void); + bool doubleClicked(); void setupContextMenu(QMenu*, QObject*, const char*); protected: bool setEdit(int ModNum); diff --git a/src/Gui/ViewProviderBuilder.h b/src/Gui/ViewProviderBuilder.h index ec27ac9f01..4c732974f3 100644 --- a/src/Gui/ViewProviderBuilder.h +++ b/src/Gui/ViewProviderBuilder.h @@ -43,7 +43,7 @@ class GuiExport ViewProviderBuilder { public: /// Constructor - ViewProviderBuilder(void); + ViewProviderBuilder(); virtual ~ViewProviderBuilder(); virtual void buildNodes(const App::Property*, std::vector&) const = 0; @@ -59,7 +59,7 @@ class GuiExport ViewProviderColorBuilder : public ViewProviderBuilder { public: /// Constructor - ViewProviderColorBuilder(void); + ViewProviderColorBuilder(); virtual ~ViewProviderColorBuilder(); virtual void buildNodes(const App::Property*, std::vector&) const; }; diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp index 89c02024d3..08fa38ea32 100644 --- a/src/Gui/ViewProviderDocumentObject.cpp +++ b/src/Gui/ViewProviderDocumentObject.cpp @@ -224,7 +224,7 @@ void ViewProviderDocumentObject::onChanged(const App::Property* prop) ViewProvider::onChanged(prop); } -void ViewProviderDocumentObject::hide(void) +void ViewProviderDocumentObject::hide() { ViewProvider::hide(); // use this bit to check whether 'Visibility' must be adjusted @@ -280,7 +280,7 @@ void ViewProviderDocumentObject::setModeSwitch() { ViewProvider::setModeSwitch(); } -void ViewProviderDocumentObject::show(void) +void ViewProviderDocumentObject::show() { if(TreeWidget::isObjectShowable(getObject())) ViewProvider::show(); diff --git a/src/Gui/ViewProviderDocumentObject.h b/src/Gui/ViewProviderDocumentObject.h index f18c4fed03..77626aa68b 100644 --- a/src/Gui/ViewProviderDocumentObject.h +++ b/src/Gui/ViewProviderDocumentObject.h @@ -70,9 +70,9 @@ public: /// Set the active mode, i.e. the first item of the 'Display' property. void setActiveMode(); /// Hide the object in the view - virtual void hide(void) override; + virtual void hide() override; /// Show the object in the view - virtual void show(void) override; + virtual void show() override; /// Is called by the tree if the user double clicks on the object. It returns the string /// for the transaction that will be shown in the undo/redo dialog. /// If null is returned then no transaction will be opened. @@ -91,7 +91,7 @@ public: /// Run a redraw void updateView(); /// Get the object of this ViewProvider object - App::DocumentObject *getObject(void) const {return pcObject;} + App::DocumentObject *getObject() const {return pcObject;} /// Asks the view provider if the given object can be deleted. virtual bool canDelete(App::DocumentObject* obj) const override; /// Get the GUI document to this ViewProvider object diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp index 8423e926f9..986f129c21 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.cpp +++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp @@ -50,18 +50,18 @@ ViewProviderDocumentObjectGroup::~ViewProviderDocumentObjectGroup() { } -std::vector ViewProviderDocumentObjectGroup::getDisplayModes(void) const +std::vector ViewProviderDocumentObjectGroup::getDisplayModes() const { // empty return std::vector(); } -bool ViewProviderDocumentObjectGroup::isShow(void) const +bool ViewProviderDocumentObjectGroup::isShow() const { return Visibility.getValue(); } -QIcon ViewProviderDocumentObjectGroup::getIcon(void) const +QIcon ViewProviderDocumentObjectGroup::getIcon() const { return mergeGreyableOverlayIcons (Gui::BitmapFactory().iconFromTheme(sPixmap)); } diff --git a/src/Gui/ViewProviderDocumentObjectGroup.h b/src/Gui/ViewProviderDocumentObjectGroup.h index 5bcf7a5aa8..ae3f6ef3a6 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.h +++ b/src/Gui/ViewProviderDocumentObjectGroup.h @@ -42,11 +42,11 @@ public: virtual ~ViewProviderDocumentObjectGroup(); /// returns a list of all possible modes - std::vector getDisplayModes(void) const override; - bool isShow(void) const override; + std::vector getDisplayModes() const override; + bool isShow() const override; /// deliver the icon shown in the tree view - virtual QIcon getIcon(void) const override; + virtual QIcon getIcon() const override; protected: void getViewProviders(std::vector&) const; diff --git a/src/Gui/ViewProviderDocumentObjectPyImp.cpp b/src/Gui/ViewProviderDocumentObjectPyImp.cpp index 2a2aaa8c07..41a7030d6f 100644 --- a/src/Gui/ViewProviderDocumentObjectPyImp.cpp +++ b/src/Gui/ViewProviderDocumentObjectPyImp.cpp @@ -37,7 +37,7 @@ using namespace Gui; // returns a string which represents the object e.g. when printed in python -std::string ViewProviderDocumentObjectPy::representation(void) const +std::string ViewProviderDocumentObjectPy::representation() const { std::stringstream str; str << ""; @@ -55,7 +55,7 @@ PyObject* ViewProviderDocumentObjectPy::update(PyObject *args) } PY_CATCH; } -Py::Object ViewProviderDocumentObjectPy::getObject(void) const +Py::Object ViewProviderDocumentObjectPy::getObject() const { App::DocumentObject* obj = getViewProviderDocumentObjectPtr()->getObject(); return Py::Object(obj->getPyObject(), true); // do not inc'ref twice @@ -82,7 +82,7 @@ void ViewProviderDocumentObjectPy::setForceUpdate(Py::Boolean arg) getViewProviderDocumentObjectPtr()->forceUpdate(arg); } -Py::Object ViewProviderDocumentObjectPy::getDocument(void) const +Py::Object ViewProviderDocumentObjectPy::getDocument() const { Document* doc = getViewProviderDocumentObjectPtr()->getDocument(); return Py::asObject(doc->getPyObject()); // do not inc'ref twice diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp index 91e50ded7f..1d3ed1c713 100644 --- a/src/Gui/ViewProviderDragger.cpp +++ b/src/Gui/ViewProviderDragger.cpp @@ -76,7 +76,7 @@ void ViewProviderDragger::updateData(const App::Property* prop) ViewProviderDocumentObject::updateData(prop); } -bool ViewProviderDragger::doubleClicked(void) +bool ViewProviderDragger::doubleClicked() { Gui::Application::Instance->activeDocument()->setEdit(this, (int)ViewProvider::Default); return true; diff --git a/src/Gui/ViewProviderDragger.h b/src/Gui/ViewProviderDragger.h index e8f247ff35..17e2b545ea 100644 --- a/src/Gui/ViewProviderDragger.h +++ b/src/Gui/ViewProviderDragger.h @@ -54,7 +54,7 @@ public: /** @name Edit methods */ //@{ - bool doubleClicked(void) override; + bool doubleClicked() override; void setupContextMenu(QMenu*, QObject*, const char*) override; void updateData(const App::Property*) override; diff --git a/src/Gui/ViewProviderExtension.cpp b/src/Gui/ViewProviderExtension.cpp index 1f422134df..e9fb56c0ca 100644 --- a/src/Gui/ViewProviderExtension.cpp +++ b/src/Gui/ViewProviderExtension.cpp @@ -63,7 +63,7 @@ void ViewProviderExtension::extensionUpdateData(const App::Property*) { } -PyObject* ViewProviderExtension::getExtensionPyObject(void) { +PyObject* ViewProviderExtension::getExtensionPyObject() { if (ExtensionPythonObject.is(Py::_None())){ // ref counter is set to 1 diff --git a/src/Gui/ViewProviderExtension.h b/src/Gui/ViewProviderExtension.h index 8ba57142ee..f09b1feba3 100644 --- a/src/Gui/ViewProviderExtension.h +++ b/src/Gui/ViewProviderExtension.h @@ -61,13 +61,13 @@ public: Gui::ViewProviderDocumentObject* getExtendedViewProvider(); const Gui::ViewProviderDocumentObject* getExtendedViewProvider() const; - virtual std::vector extensionClaimChildren3D(void) const { + virtual std::vector extensionClaimChildren3D() const { return std::vector(); } virtual bool extensionOnDelete(const std::vector &){ return true;} virtual void extensionBeforeDelete(){} - virtual std::vector extensionClaimChildren(void) const { + virtual std::vector extensionClaimChildren() const { return std::vector(); } virtual bool extensionCanDragObjects() const { return false; } @@ -88,19 +88,19 @@ public: { return -1; } /// Hides the view provider - virtual void extensionHide(void) { } + virtual void extensionHide() { } /// Shows the view provider - virtual void extensionShow(void) { } + virtual void extensionShow() { } - virtual void extensionModeSwitchChange(void) { } + virtual void extensionModeSwitchChange() { } - virtual SoSeparator* extensionGetFrontRoot(void) const {return nullptr;} - virtual SoGroup* extensionGetChildRoot(void) const {return nullptr;} - virtual SoSeparator* extensionGetBackRoot(void) const {return nullptr;} + virtual SoSeparator* extensionGetFrontRoot() const {return nullptr;} + virtual SoGroup* extensionGetChildRoot() const {return nullptr;} + virtual SoSeparator* extensionGetBackRoot() const {return nullptr;} virtual void extensionAttach(App::DocumentObject* ) { } virtual void extensionReattach(App::DocumentObject* ) { } virtual void extensionSetDisplayMode(const char* ) { } - virtual std::vector extensionGetDisplayModes(void) const {return std::vector();} + virtual std::vector extensionGetDisplayModes() const {return std::vector();} virtual void extensionSetupContextMenu(QMenu*, QObject*, const char*) {} //update data of extended opject diff --git a/src/Gui/ViewProviderExtensionPyImp.cpp b/src/Gui/ViewProviderExtensionPyImp.cpp index 3bb08a0392..0c5f8052fc 100644 --- a/src/Gui/ViewProviderExtensionPyImp.cpp +++ b/src/Gui/ViewProviderExtensionPyImp.cpp @@ -35,7 +35,7 @@ using namespace Gui; // returns a string which represent the object e.g. when printed in python -std::string ViewProviderExtensionPy::representation(void) const +std::string ViewProviderExtensionPy::representation() const { return std::string(""); } diff --git a/src/Gui/ViewProviderExtern.cpp b/src/Gui/ViewProviderExtern.cpp index 805f660c0f..c169f381b9 100644 --- a/src/Gui/ViewProviderExtern.cpp +++ b/src/Gui/ViewProviderExtern.cpp @@ -143,7 +143,7 @@ const char* ViewProviderExtern::getDefaultDisplayMode() const return (modes.empty() ? "" : modes.front().c_str()); } -std::vector ViewProviderExtern::getDisplayModes(void) const +std::vector ViewProviderExtern::getDisplayModes() const { return modes; } diff --git a/src/Gui/ViewProviderExtern.h b/src/Gui/ViewProviderExtern.h index 6be47c868c..2fc3889e1e 100644 --- a/src/Gui/ViewProviderExtern.h +++ b/src/Gui/ViewProviderExtern.h @@ -50,7 +50,7 @@ public: void adjustDocumentName(const char* docname); virtual const char* getDefaultDisplayMode() const; - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; virtual void updateData(const App::Property*){} private: diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp index ea61a19773..35012dff48 100644 --- a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp +++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp @@ -64,7 +64,7 @@ ViewProviderGeoFeatureGroupExtension::~ViewProviderGeoFeatureGroupExtension() } -std::vector ViewProviderGeoFeatureGroupExtension::extensionClaimChildren3D(void) const { +std::vector ViewProviderGeoFeatureGroupExtension::extensionClaimChildren3D() const { //all object in the group must be claimed in 3D, as we are a coordinate system for all of them auto* ext = getExtendedViewProvider()->getObject()->getExtensionByType(); @@ -75,7 +75,7 @@ std::vector ViewProviderGeoFeatureGroupExtension::extensio return std::vector(); } -std::vector ViewProviderGeoFeatureGroupExtension::extensionClaimChildren(void) const { +std::vector ViewProviderGeoFeatureGroupExtension::extensionClaimChildren() const { auto* group = getExtendedViewProvider()->getObject()->getExtensionByType(); const std::vector &model = group->Group.getValues (); @@ -129,7 +129,7 @@ void ViewProviderGeoFeatureGroupExtension::extensionSetDisplayMode(const char* M ViewProviderGroupExtension::extensionSetDisplayMode( ModeName ); } -std::vector ViewProviderGeoFeatureGroupExtension::extensionGetDisplayModes(void) const +std::vector ViewProviderGeoFeatureGroupExtension::extensionGetDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderGroupExtension::extensionGetDisplayModes(); diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.h b/src/Gui/ViewProviderGeoFeatureGroupExtension.h index 0a9171b8a8..b32ddcb709 100644 --- a/src/Gui/ViewProviderGeoFeatureGroupExtension.h +++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.h @@ -37,25 +37,25 @@ class GuiExport ViewProviderGeoFeatureGroupExtension : public ViewProviderGroupE public: /// Constructor - ViewProviderGeoFeatureGroupExtension(void); + ViewProviderGeoFeatureGroupExtension(); virtual ~ViewProviderGeoFeatureGroupExtension(); - virtual std::vector extensionClaimChildren3D(void)const override; - virtual std::vector< App::DocumentObject* > extensionClaimChildren(void) const override; + virtual std::vector extensionClaimChildren3D()const override; + virtual std::vector< App::DocumentObject* > extensionClaimChildren() const override; virtual SoSeparator* extensionGetFrontRoot() const override {return pcGroupFront;} virtual SoSeparator* extensionGetBackRoot() const override {return pcGroupBack;} - virtual SoGroup* extensionGetChildRoot(void) const override {return pcGroupChildren;} + virtual SoGroup* extensionGetChildRoot() const override {return pcGroupChildren;} virtual void extensionAttach(App::DocumentObject* pcObject) override; virtual void extensionSetDisplayMode(const char* ModeName) override; - virtual std::vector extensionGetDisplayModes(void) const override; + virtual std::vector extensionGetDisplayModes() const override; virtual void extensionFinishRestoring() override; /// Show the object in the view: suppresses behavior of DocumentObjectGroup - virtual void extensionShow(void) override { + virtual void extensionShow() override { ViewProviderExtension::extensionShow(); // clazy:exclude=skipped-base-method } /// Hide the object in the view: suppresses behavior of DocumentObjectGroup - virtual void extensionHide(void) override { + virtual void extensionHide() override { ViewProviderExtension::extensionHide(); // clazy:exclude=skipped-base-method } diff --git a/src/Gui/ViewProviderGeometryObject.h b/src/Gui/ViewProviderGeometryObject.h index e0da40eef6..2b31f01325 100644 --- a/src/Gui/ViewProviderGeometryObject.h +++ b/src/Gui/ViewProviderGeometryObject.h @@ -67,7 +67,7 @@ public: void attach(App::DocumentObject *pcObject); void updateData(const App::Property*); - bool isSelectable(void) const {return Selectable.getValue();} + bool isSelectable() const {return Selectable.getValue();} /** * Returns a list of picked points from the geometry under \a getRoot(). diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp index e69ef437ec..3653896784 100644 --- a/src/Gui/ViewProviderGroupExtension.cpp +++ b/src/Gui/ViewProviderGroupExtension.cpp @@ -108,13 +108,13 @@ void ViewProviderGroupExtension::extensionDropObject(App::DocumentObject* obj) { Gui::Command::doCommand(Gui::Command::App, cmd.toUtf8()); } -std::vector< App::DocumentObject* > ViewProviderGroupExtension::extensionClaimChildren(void) const { +std::vector< App::DocumentObject* > ViewProviderGroupExtension::extensionClaimChildren() const { auto* group = getExtendedViewProvider()->getObject()->getExtensionByType(); return std::vector(group->Group.getValues()); } -void ViewProviderGroupExtension::extensionShow(void) { +void ViewProviderGroupExtension::extensionShow() { // avoid possible infinite recursion if (guard) @@ -134,7 +134,7 @@ void ViewProviderGroupExtension::extensionShow(void) { ViewProviderExtension::extensionShow(); } -void ViewProviderGroupExtension::extensionHide(void) { +void ViewProviderGroupExtension::extensionHide() { // avoid possible infinite recursion if (guard) diff --git a/src/Gui/ViewProviderGroupExtension.h b/src/Gui/ViewProviderGroupExtension.h index 77f5b0931c..ea7fbfe44f 100644 --- a/src/Gui/ViewProviderGroupExtension.h +++ b/src/Gui/ViewProviderGroupExtension.h @@ -35,10 +35,10 @@ class GuiExport ViewProviderGroupExtension : public ViewProviderExtension public: /// Constructor - ViewProviderGroupExtension(void); + ViewProviderGroupExtension(); virtual ~ViewProviderGroupExtension(); - virtual std::vector extensionClaimChildren(void)const override; + virtual std::vector extensionClaimChildren()const override; virtual bool extensionCanDragObjects() const override; virtual bool extensionCanDragObject(App::DocumentObject*) const override; virtual void extensionDragObject(App::DocumentObject*) override; @@ -46,8 +46,8 @@ public: virtual bool extensionCanDropObject(App::DocumentObject*) const override; virtual void extensionDropObject(App::DocumentObject*) override; - virtual void extensionHide(void) override; - virtual void extensionShow(void) override; + virtual void extensionHide() override; + virtual void extensionShow() override; virtual bool extensionOnDelete(const std::vector &) override; diff --git a/src/Gui/ViewProviderInventorObject.cpp b/src/Gui/ViewProviderInventorObject.cpp index e3b6574964..46b8778cbe 100644 --- a/src/Gui/ViewProviderInventorObject.cpp +++ b/src/Gui/ViewProviderInventorObject.cpp @@ -77,7 +77,7 @@ void ViewProviderInventorObject::setDisplayMode(const char* ModeName) ViewProviderDocumentObject::setDisplayMode(ModeName); } -std::vector ViewProviderInventorObject::getDisplayModes(void) const +std::vector ViewProviderInventorObject::getDisplayModes() const { std::vector StrList; StrList.emplace_back("File+Buffer"); diff --git a/src/Gui/ViewProviderInventorObject.h b/src/Gui/ViewProviderInventorObject.h index 7d9b0066b1..cb8ad9e32e 100644 --- a/src/Gui/ViewProviderInventorObject.h +++ b/src/Gui/ViewProviderInventorObject.h @@ -45,7 +45,7 @@ public: void setDisplayMode(const char* ModeName); std::vector getDisplayModes() const; void updateData(const App::Property*); - bool useNewSelectionModel(void) const {return true;} + bool useNewSelectionModel() const {return true;} private: void adjustSelectionNodes(SoNode* child, const char* docname, const char* objname); diff --git a/src/Gui/ViewProviderLine.h b/src/Gui/ViewProviderLine.h index f45e4baf65..68eafd0074 100644 --- a/src/Gui/ViewProviderLine.h +++ b/src/Gui/ViewProviderLine.h @@ -34,7 +34,7 @@ class GuiExport ViewProviderLine : public ViewProviderOriginFeature { PROPERTY_HEADER(Gui::ViewProviderLine); public: /// Constructor - ViewProviderLine(void); + ViewProviderLine(); virtual ~ViewProviderLine(); virtual void attach ( App::DocumentObject * ); diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index 59e23d392b..7cc07e1673 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -887,14 +887,14 @@ LinkView::~LinkView() { unlink(linkOwner); } -PyObject *LinkView::getPyObject(void) +PyObject *LinkView::getPyObject() { if (PythonObject.is(Py::_None())) PythonObject = Py::Object(new LinkViewPy(this),true); return Py::new_reference_to(PythonObject); } -void LinkView::setInvalid(void) { +void LinkView::setInvalid() { if (!PythonObject.is(Py::_None())){ Base::PyObjectBase* obj = (Base::PyObjectBase*)PythonObject.ptr(); obj->setInvalid(); @@ -1672,7 +1672,7 @@ void ViewProviderLink::reattach(App::DocumentObject *obj) { ViewProviderDocumentObject::reattach(obj); } -std::vector ViewProviderLink::getDisplayModes(void) const +std::vector ViewProviderLink::getDisplayModes() const { std::vector StrList = inherited::getDisplayModes(); StrList.emplace_back("Link"); @@ -2100,7 +2100,7 @@ ViewProvider *ViewProviderLink::getLinkedView( return nullptr; } -std::vector ViewProviderLink::claimChildren(void) const { +std::vector ViewProviderLink::claimChildren() const { auto ext = getLinkExtension(); std::vector ret; diff --git a/src/Gui/ViewProviderLink.h b/src/Gui/ViewProviderLink.h index c3c34d93af..3d7580e75e 100644 --- a/src/Gui/ViewProviderLink.h +++ b/src/Gui/ViewProviderLink.h @@ -52,7 +52,7 @@ public: void extensionFinishRestoring() override; bool extensionCanDragObject(App::DocumentObject*) const override { return false; } bool extensionCanDropObject(App::DocumentObject*) const override { return false; } - void extensionModeSwitchChange(void) override; + void extensionModeSwitchChange() override; bool isLinkVisible() const; void setLinkVisible(bool); @@ -78,7 +78,7 @@ public: LinkView &operator=(const LinkView&) = delete; LinkView(const LinkView&) = delete; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual void unlink(LinkInfoPtr) override; virtual void onLinkedIconChange(LinkInfoPtr) override; @@ -201,19 +201,19 @@ public: void attach(App::DocumentObject *pcObj) override; void reattach(App::DocumentObject *pcObj) override; - bool isSelectable(void) const override; + bool isSelectable() const override; - bool useNewSelectionModel(void) const override {return true;} + bool useNewSelectionModel() const override {return true;} void updateData(const App::Property*) override; void onChanged(const App::Property* prop) override; - std::vector claimChildren(void) const override; + std::vector claimChildren() const override; bool getElementPicked(const SoPickedPoint *, std::string &) const override; bool getDetailPath(const char *, SoFullPath *, bool, SoDetail *&) const override; void finishRestoring() override; - QIcon getIcon(void) const override; + QIcon getIcon() const override; bool canDragObjects() const override; bool canDragObject(App::DocumentObject*) const override; @@ -228,7 +228,7 @@ public: bool onDelete(const std::vector &) override; bool canDelete(App::DocumentObject* obj) const override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; void setupContextMenu(QMenu*, QObject*, const char*) override; diff --git a/src/Gui/ViewProviderLinkPyImp.cpp b/src/Gui/ViewProviderLinkPyImp.cpp index 7b19ada206..a81a25fb7a 100644 --- a/src/Gui/ViewProviderLinkPyImp.cpp +++ b/src/Gui/ViewProviderLinkPyImp.cpp @@ -36,7 +36,7 @@ using namespace Gui; // returns a string which represents the object e.g. when printed in python -std::string ViewProviderLinkPy::representation(void) const +std::string ViewProviderLinkPy::representation() const { std::stringstream str; str << ""; diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp index ed31857564..51415a8ac9 100644 --- a/src/Gui/ViewProviderMaterialObject.cpp +++ b/src/Gui/ViewProviderMaterialObject.cpp @@ -50,7 +50,7 @@ ViewProviderMaterialObject::~ViewProviderMaterialObject() { } -bool ViewProviderMaterialObject::doubleClicked(void) +bool ViewProviderMaterialObject::doubleClicked() { Gui::Application::Instance->activeDocument()->setEdit(this, (int)ViewProvider::Default); return true; diff --git a/src/Gui/ViewProviderMaterialObject.h b/src/Gui/ViewProviderMaterialObject.h index 76e890b5aa..0181e1ca36 100644 --- a/src/Gui/ViewProviderMaterialObject.h +++ b/src/Gui/ViewProviderMaterialObject.h @@ -40,12 +40,12 @@ public: /// destructor. virtual ~ViewProviderMaterialObject(); - QIcon getIcon(void) const; + QIcon getIcon() const; - bool doubleClicked(void); + bool doubleClicked(); // shows solid in the tree - virtual bool isShow(void) const{return true;} + virtual bool isShow() const{return true;} }; diff --git a/src/Gui/ViewProviderMeasureDistance.cpp b/src/Gui/ViewProviderMeasureDistance.cpp index 4923382981..b965ff7fa4 100644 --- a/src/Gui/ViewProviderMeasureDistance.cpp +++ b/src/Gui/ViewProviderMeasureDistance.cpp @@ -141,7 +141,7 @@ void ViewProviderMeasureDistance::onChanged(const App::Property* prop) } } -std::vector ViewProviderMeasureDistance::getDisplayModes(void) const +std::vector ViewProviderMeasureDistance::getDisplayModes() const { // add modes std::vector StrList; diff --git a/src/Gui/ViewProviderMeasureDistance.h b/src/Gui/ViewProviderMeasureDistance.h index 149246306e..15a56b95fc 100644 --- a/src/Gui/ViewProviderMeasureDistance.h +++ b/src/Gui/ViewProviderMeasureDistance.h @@ -79,7 +79,7 @@ class GuiExport ViewProviderMeasureDistance : public ViewProviderDocumentObject public: /// Constructor - ViewProviderMeasureDistance(void); + ViewProviderMeasureDistance(); virtual ~ViewProviderMeasureDistance(); // Display properties @@ -91,8 +91,8 @@ public: void attach(App::DocumentObject *); void updateData(const App::Property*); - bool useNewSelectionModel(void) const {return true;} - std::vector getDisplayModes(void) const; + bool useNewSelectionModel() const {return true;} + std::vector getDisplayModes() const; void setDisplayMode(const char* ModeName); static void measureDistanceCallback(void * ud, SoEventCallback * n); diff --git a/src/Gui/ViewProviderOrigin.cpp b/src/Gui/ViewProviderOrigin.cpp index a04e063a6f..129043a574 100644 --- a/src/Gui/ViewProviderOrigin.cpp +++ b/src/Gui/ViewProviderOrigin.cpp @@ -66,11 +66,11 @@ ViewProviderOrigin::~ViewProviderOrigin() { pcGroupChildren = nullptr; } -std::vector ViewProviderOrigin::claimChildren(void) const { +std::vector ViewProviderOrigin::claimChildren() const { return static_cast( getObject() )->OriginFeatures.getValues (); } -std::vector ViewProviderOrigin::claimChildren3D(void) const { +std::vector ViewProviderOrigin::claimChildren3D() const { return claimChildren (); } @@ -80,7 +80,7 @@ void ViewProviderOrigin::attach(App::DocumentObject* pcObject) addDisplayMaskMode(pcGroupChildren, "Base"); } -std::vector ViewProviderOrigin::getDisplayModes(void) const +std::vector ViewProviderOrigin::getDisplayModes() const { return { "Base" }; } diff --git a/src/Gui/ViewProviderOrigin.h b/src/Gui/ViewProviderOrigin.h index eedf442733..f5af0b5b5e 100644 --- a/src/Gui/ViewProviderOrigin.h +++ b/src/Gui/ViewProviderOrigin.h @@ -48,13 +48,13 @@ public: /// @name Override methods ///@{ - virtual std::vector claimChildren(void) const; - virtual std::vector claimChildren3D(void) const; + virtual std::vector claimChildren() const; + virtual std::vector claimChildren3D() const; - virtual SoGroup* getChildRoot(void) const {return pcGroupChildren;}; + virtual SoGroup* getChildRoot() const {return pcGroupChildren;}; virtual void attach(App::DocumentObject* pcObject); - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; virtual void setDisplayMode(const char* ModeName); ///@} diff --git a/src/Gui/ViewProviderOriginGroupExtension.h b/src/Gui/ViewProviderOriginGroupExtension.h index 23b0c181cc..852e862de8 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.h +++ b/src/Gui/ViewProviderOriginGroupExtension.h @@ -36,11 +36,11 @@ class GuiExport ViewProviderOriginGroupExtension : public ViewProviderGeoFeature public: /// Constructor - ViewProviderOriginGroupExtension(void); + ViewProviderOriginGroupExtension(); virtual ~ViewProviderOriginGroupExtension(); - virtual std::vector extensionClaimChildren(void)const override; - virtual std::vector extensionClaimChildren3D(void)const override; + virtual std::vector extensionClaimChildren()const override; + virtual std::vector extensionClaimChildren3D()const override; virtual void extensionAttach(App::DocumentObject *pcObject) override; virtual void extensionUpdateData(const App::Property* prop) override; diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp index ad8a9c97db..bcac0fc3b1 100644 --- a/src/Gui/ViewProviderPart.cpp +++ b/src/Gui/ViewProviderPart.cpp @@ -76,7 +76,7 @@ void ViewProviderPart::setupContextMenu(QMenu* menu, QObject* receiver, const ch ViewProviderDragger::setupContextMenu(menu, receiver, member); } -bool ViewProviderPart::doubleClicked(void) +bool ViewProviderPart::doubleClicked() { //make the part the active one @@ -108,7 +108,7 @@ bool ViewProviderPart::doubleClicked(void) return true; } -QIcon ViewProviderPart::getIcon(void) const +QIcon ViewProviderPart::getIcon() const { // the original Part object for this ViewProviderPart App::Part* part = static_cast(this->getObject()); diff --git a/src/Gui/ViewProviderPart.h b/src/Gui/ViewProviderPart.h index 55c4b5043c..f6263beac7 100644 --- a/src/Gui/ViewProviderPart.h +++ b/src/Gui/ViewProviderPart.h @@ -41,12 +41,12 @@ public: /// destructor. virtual ~ViewProviderPart(); - virtual bool doubleClicked(void) override; + virtual bool doubleClicked() override; virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; /// deliver the icon shown in the tree view /// override from ViewProvider.h - virtual QIcon getIcon(void) const override; + virtual QIcon getIcon() const override; protected: /// get called by the container whenever a property has been changed diff --git a/src/Gui/ViewProviderPlacement.h b/src/Gui/ViewProviderPlacement.h index aaeea64815..2d6238bc6a 100644 --- a/src/Gui/ViewProviderPlacement.h +++ b/src/Gui/ViewProviderPlacement.h @@ -46,18 +46,18 @@ class GuiExport ViewProviderPlacement : public ViewProviderGeometryObject public: /// Constructor - ViewProviderPlacement(void); + ViewProviderPlacement(); virtual ~ViewProviderPlacement(); void attach(App::DocumentObject *) override; void updateData(const App::Property*) override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; void setDisplayMode(const char* ModeName) override; /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel(void) const override {return true;} + virtual bool useNewSelectionModel() const override {return true;} /// indicates if the ViewProvider can be selected - virtual bool isSelectable(void) const override; + virtual bool isSelectable() const override; virtual bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const override; virtual bool getDetailPath(const char *, SoFullPath *, bool, SoDetail *&) const override; diff --git a/src/Gui/ViewProviderPlane.h b/src/Gui/ViewProviderPlane.h index 76b60ec0a7..91ec417ae7 100644 --- a/src/Gui/ViewProviderPlane.h +++ b/src/Gui/ViewProviderPlane.h @@ -35,7 +35,7 @@ class GuiExport ViewProviderPlane : public ViewProviderOriginFeature PROPERTY_HEADER(Gui::ViewProviderPlane); public: /// Constructor - ViewProviderPlane(void); + ViewProviderPlane(); virtual ~ViewProviderPlane(); virtual void attach ( App::DocumentObject * ); diff --git a/src/Gui/ViewProviderPyImp.cpp b/src/Gui/ViewProviderPyImp.cpp index 6e8126f3d5..f795203e7e 100644 --- a/src/Gui/ViewProviderPyImp.cpp +++ b/src/Gui/ViewProviderPyImp.cpp @@ -54,7 +54,7 @@ using namespace Gui; // returns a string which represent the object e.g. when printed in python -std::string ViewProviderPy::representation(void) const +std::string ViewProviderPy::representation() const { return ""; } diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderPythonFeature.cpp index 7e6d6f1e4d..9416d90d33 100644 --- a/src/Gui/ViewProviderPythonFeature.cpp +++ b/src/Gui/ViewProviderPythonFeature.cpp @@ -479,7 +479,7 @@ ViewProviderPythonFeatureImp::unsetEditViewer(View3DInventorViewer *viewer) } ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::doubleClicked(void) +ViewProviderPythonFeatureImp::doubleClicked() { FC_PY_CALL_CHECK(doubleClicked) @@ -762,7 +762,7 @@ bool ViewProviderPythonFeatureImp::getDefaultDisplayMode(std::string &mode) cons return true; } -std::vector ViewProviderPythonFeatureImp::getDisplayModes(void) const +std::vector ViewProviderPythonFeatureImp::getDisplayModes() const { std::vector modes; _FC_PY_CALL_CHECK(getDisplayModes,return(modes)); diff --git a/src/Gui/ViewProviderPythonFeature.h b/src/Gui/ViewProviderPythonFeature.h index ed2aeb0bfc..6b347bf598 100644 --- a/src/Gui/ViewProviderPythonFeature.h +++ b/src/Gui/ViewProviderPythonFeature.h @@ -64,7 +64,7 @@ public: ValueT unsetEdit(int ModNum); ValueT setEditViewer(View3DInventorViewer*, int ModNum); ValueT unsetEditViewer(View3DInventorViewer*); - ValueT doubleClicked(void); + ValueT doubleClicked(); bool setupContextMenu(QMenu* menu); /** @name Update data methods*/ @@ -85,7 +85,7 @@ public: /// get the default display mode bool getDefaultDisplayMode(std::string &mode) const; /// returns a list of all possible modes - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; /// set the display mode std::string setDisplayMode(const char* ModeName); //@} @@ -454,7 +454,7 @@ public: return ViewProviderT::getDefaultDisplayMode(); } /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const override { + virtual std::vector getDisplayModes() const override { std::vector modes = ViewProviderT::getDisplayModes(); std::vector more_modes = imp->getDisplayModes(); modes.insert(modes.end(), more_modes.begin(), more_modes.end()); @@ -590,7 +590,7 @@ public: } protected: - virtual bool doubleClicked(void) override + virtual bool doubleClicked() override { App::AutoTransaction committer; switch (imp->doubleClicked()) { diff --git a/src/Gui/ViewProviderVRMLObject.cpp b/src/Gui/ViewProviderVRMLObject.cpp index 0579941e30..40f9ce9188 100644 --- a/src/Gui/ViewProviderVRMLObject.cpp +++ b/src/Gui/ViewProviderVRMLObject.cpp @@ -86,7 +86,7 @@ void ViewProviderVRMLObject::setDisplayMode(const char* ModeName) ViewProviderDocumentObject::setDisplayMode( ModeName ); } -std::vector ViewProviderVRMLObject::getDisplayModes(void) const +std::vector ViewProviderVRMLObject::getDisplayModes() const { std::vector StrList; StrList.emplace_back("VRML"); diff --git a/src/Gui/WhatsThis.cpp b/src/Gui/WhatsThis.cpp index 64ceefb705..0db2264abd 100644 --- a/src/Gui/WhatsThis.cpp +++ b/src/Gui/WhatsThis.cpp @@ -54,7 +54,7 @@ StdCmdDescription::~StdCmdDescription() { } -Action * StdCmdDescription::createAction(void) +Action * StdCmdDescription::createAction() { Action *pcAction = Command::createAction(); pcAction->setCheckable( true ); diff --git a/src/Gui/WhatsThis.h b/src/Gui/WhatsThis.h index c55c26391c..4c58d4b185 100644 --- a/src/Gui/WhatsThis.h +++ b/src/Gui/WhatsThis.h @@ -45,7 +45,7 @@ public: static void setSource( const QString& ); protected: - Action* createAction(void); + Action* createAction(); void activated(int iMsg); private: diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index 6fcd71e64a..58a03bfdae 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -78,7 +78,7 @@ void WindowParameter::OnChange(Base::Subject &rCaller, const char * Base::Console().Log("Parameter has changed and window (%s) has not overridden this function!",_handle->GetGroupName()); } -ParameterGrp::handle WindowParameter::getWindowParameter(void) +ParameterGrp::handle WindowParameter::getWindowParameter() { return _handle; } @@ -87,7 +87,7 @@ ParameterGrp::handle WindowParameter::getWindowParameter(void) * Returns a handle to the parameter group to the user parameter * under BaseApp/Preferences. */ -ParameterGrp::handle WindowParameter::getDefaultParameter(void) +ParameterGrp::handle WindowParameter::getDefaultParameter() { return App::GetApplication().GetUserParameter().GetGroup("BaseApp")->GetGroup("Preferences"); } diff --git a/src/Gui/Window.h b/src/Gui/Window.h index 6a85101d16..c4a17a8541 100644 --- a/src/Gui/Window.h +++ b/src/Gui/Window.h @@ -42,9 +42,9 @@ public: void OnChange(Base::Subject &rCaller, const char * sReason); /// get the parameters - static ParameterGrp::handle getDefaultParameter(void); + static ParameterGrp::handle getDefaultParameter(); /// return the parameter group of this window - ParameterGrp::handle getWindowParameter(void); + ParameterGrp::handle getWindowParameter(); private: ParameterGrp::handle _handle; diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index d17f73348e..4663e366b2 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -456,7 +456,7 @@ void Workbench::addTaskWatcher(const std::vector &W taskView->addTaskWatcher(Watcher); } -void Workbench::removeTaskWatcher(void) +void Workbench::removeTaskWatcher() { Gui::TaskView::TaskView* taskView = Control().taskPanel(); if (taskView) diff --git a/src/Gui/Workbench.h b/src/Gui/Workbench.h index a56ee2d7de..9ea1b10aff 100644 --- a/src/Gui/Workbench.h +++ b/src/Gui/Workbench.h @@ -93,7 +93,7 @@ public: /// helper to add TaskWatcher to the TaskView void addTaskWatcher(const std::vector &Watcher); /// remove the added TaskWatcher - void removeTaskWatcher(void); + void removeTaskWatcher(); static void createLinkMenu(MenuItem *); diff --git a/src/Gui/WorkbenchPyImp.cpp b/src/Gui/WorkbenchPyImp.cpp index 9136fced82..a9beff4a50 100644 --- a/src/Gui/WorkbenchPyImp.cpp +++ b/src/Gui/WorkbenchPyImp.cpp @@ -43,7 +43,7 @@ using namespace Gui; */ // returns a string which represent the object e.g. when printed in python -std::string WorkbenchPy::representation(void) const +std::string WorkbenchPy::representation() const { return std::string(""); }