Gui: redundant void 2
This commit is contained in:
+15
-15
@@ -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<const App::Document*, Gui::Document*>::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<std::string,std::string>& 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<std::string,std::string>& cfg = App::Application::Config();
|
||||
std::map<std::string,std::string>::const_iterator it;
|
||||
|
||||
+15
-15
@@ -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 );
|
||||
//@}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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 "<AxisOrigin>";
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
+1
-1
@@ -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;}
|
||||
|
||||
|
||||
|
||||
+23
-23
@@ -265,12 +265,12 @@ void Command::addToGroup(ActionGroup* group)
|
||||
group->addAction(_pcAction->findChild<QAction*>());
|
||||
}
|
||||
|
||||
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<Gui::Document*> cList)
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
/// returns the begin of a online help page
|
||||
const char * Command::beginCmdHelp(void)
|
||||
const char * Command::beginCmdHelp()
|
||||
{
|
||||
return "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
|
||||
"<html>\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 "</body></html>\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 <Command*> CommandManager::getModuleCommands(const char *sModName) c
|
||||
return vCmds;
|
||||
}
|
||||
|
||||
std::vector <Command*> CommandManager::getAllCommands(void) const
|
||||
std::vector <Command*> CommandManager::getAllCommands() const
|
||||
{
|
||||
std::vector <Command*> 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<std::string, Command*>::iterator It= _sCommands.begin();It!=_sCommands.end();++It) {
|
||||
It->second->testActive();
|
||||
|
||||
+36
-36
@@ -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<Gui::Document*> 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 <Command*> getAllCommands(void) const;
|
||||
std::vector <Command*> 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<std::string, Command*>& 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);
|
||||
|
||||
+32
-32
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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());
|
||||
|
||||
+11
-11
@@ -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());
|
||||
|
||||
@@ -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("<Command object>");
|
||||
}
|
||||
|
||||
+12
-12
@@ -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();
|
||||
|
||||
|
||||
@@ -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<ViewProviderDocumentObject*>(vp));
|
||||
}
|
||||
|
||||
bool StdCmdGroup::isActive(void)
|
||||
bool StdCmdGroup::isActive()
|
||||
{
|
||||
return hasActiveDocument();
|
||||
}
|
||||
|
||||
namespace Gui {
|
||||
|
||||
void CreateStructureCommands(void)
|
||||
void CreateStructureCommands()
|
||||
{
|
||||
CommandManager &rcCmdMgr = Application::Instance->commandManager();
|
||||
|
||||
|
||||
+16
-16
@@ -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();
|
||||
|
||||
|
||||
+54
-54
@@ -114,7 +114,7 @@ void StdOrthographicCamera::activated(int iMsg)
|
||||
}
|
||||
}
|
||||
|
||||
bool StdOrthographicCamera::isActive(void)
|
||||
bool StdOrthographicCamera::isActive()
|
||||
{
|
||||
View3DInventor* view = qobject_cast<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(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<View3DInventor*>(getMainWindow()->activeWindow()));
|
||||
}
|
||||
@@ -2378,7 +2378,7 @@ void StdViewZoomOut::activated(int iMsg)
|
||||
}
|
||||
}
|
||||
|
||||
bool StdViewZoomOut::isActive(void)
|
||||
bool StdViewZoomOut::isActive()
|
||||
{
|
||||
return (qobject_cast<View3DInventor*>(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();
|
||||
|
||||
|
||||
+15
-15
@@ -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();
|
||||
|
||||
|
||||
+5
-5
@@ -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;
|
||||
|
||||
+1
-1
@@ -128,7 +128,7 @@ private:
|
||||
};
|
||||
|
||||
/// Get the global instance
|
||||
inline ControlSingleton& Control(void)
|
||||
inline ControlSingleton& Control()
|
||||
{
|
||||
return ControlSingleton::instance();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ DlgEditFileIncludePropertyExternal::~DlgEditFileIncludePropertyExternal()
|
||||
}
|
||||
|
||||
|
||||
int DlgEditFileIncludePropertyExternal::Do(void)
|
||||
int DlgEditFileIncludePropertyExternal::Do()
|
||||
{
|
||||
QFileInfo file = QString::fromUtf8(Prop.getValue());
|
||||
assert(file.exists());
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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"));
|
||||
|
||||
@@ -65,7 +65,7 @@ protected Q_SLOTS:
|
||||
void on_tabMacroWidget_currentChanged(int index);
|
||||
|
||||
protected:
|
||||
void fillUpList(void);
|
||||
void fillUpList();
|
||||
|
||||
protected:
|
||||
QString macroPath;
|
||||
|
||||
@@ -937,7 +937,7 @@ ParameterGroupItem::~ParameterGroupItem()
|
||||
_hcGrp->ClearObserver();
|
||||
}
|
||||
|
||||
void ParameterGroupItem::fillUp(void)
|
||||
void ParameterGroupItem::fillUp()
|
||||
{
|
||||
// filling up groups
|
||||
std::vector<Base::Reference<ParameterGrp> > vhcParamGrp = _hcGrp->GetGroups();
|
||||
|
||||
@@ -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<ParameterGrp> _hcGrp;
|
||||
};
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
+17
-17
@@ -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<Gui::BaseView*>::iterator it;
|
||||
if (d->_editViewProvider) {
|
||||
@@ -1022,7 +1022,7 @@ std::vector<std::pair<ViewProviderDocumentObject*,int> > 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<std::string> Document::getUndoVector(void) const
|
||||
std::vector<std::string> Document::getUndoVector() const
|
||||
{
|
||||
return getDocument()->getAvailableUndoNames();
|
||||
}
|
||||
|
||||
/// Get a string vector with the 'Redo' actions
|
||||
std::vector<std::string> Document::getRedoVector(void) const
|
||||
std::vector<std::string> 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;
|
||||
|
||||
+17
-17
@@ -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<std::pair<ViewProviderDocumentObject*,int> > 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<MDIView*> 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<std::string> getUndoVector(void) const;
|
||||
std::vector<std::string> getUndoVector() const;
|
||||
/// Get an Redo string vector with the Redo names
|
||||
std::vector<std::string> getRedoVector(void) const;
|
||||
std::vector<std::string> 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;
|
||||
|
||||
@@ -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 << "<GUI Document object at " << getDocumentPtr() << ">";
|
||||
@@ -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<Base::MatrixPy*>(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());
|
||||
}
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
@@ -66,13 +66,13 @@ public:
|
||||
void setDisplayName(DisplayName);
|
||||
void OnChange(Base::Subject<const char*> &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 */
|
||||
//@{
|
||||
|
||||
@@ -31,7 +31,7 @@ class ExpressionBinding;
|
||||
class ExpressionBindingPy : public Py::PythonExtension<ExpressionBindingPy>
|
||||
{
|
||||
public:
|
||||
static void init_type(void); // announce properties and methods
|
||||
static void init_type(); // announce properties and methods
|
||||
|
||||
ExpressionBindingPy(ExpressionBinding*);
|
||||
~ExpressionBindingPy();
|
||||
|
||||
@@ -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){
|
||||
|
||||
@@ -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;
|
||||
|
||||
+11
-11
@@ -330,7 +330,7 @@ void InputField::pushToHistory(const QString &valueq)
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<QString> InputField::getHistory(void)
|
||||
std::vector<QString> InputField::getHistory()
|
||||
{
|
||||
std::vector<QString> res;
|
||||
|
||||
@@ -349,7 +349,7 @@ std::vector<QString> InputField::getHistory(void)
|
||||
return res;
|
||||
}
|
||||
|
||||
void InputField::setToLastUsedValue(void)
|
||||
void InputField::setToLastUsedValue()
|
||||
{
|
||||
std::vector<QString> hist = getHistory();
|
||||
if(!hist.empty())
|
||||
@@ -378,7 +378,7 @@ void InputField::pushToSavedValues(const QString &valueq)
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<QString> InputField::getSavedValues(void)
|
||||
std::vector<QString> InputField::getSavedValues()
|
||||
{
|
||||
std::vector<QString> 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;
|
||||
|
||||
+14
-14
@@ -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<QString> getHistory(void);
|
||||
std::vector<QString> 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<QString> getSavedValues(void);
|
||||
std::vector<QString> getSavedValues();
|
||||
//@}
|
||||
|
||||
void bind(const App::ObjectIdentifier &_path);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 "<Link view>";
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
+2
-2
@@ -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());
|
||||
|
||||
|
||||
+3
-3
@@ -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
|
||||
|
||||
@@ -1107,7 +1107,7 @@ QList<QWidget*> 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);
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -89,7 +89,7 @@ MergeDocuments::~MergeDocuments()
|
||||
connectImport.disconnect();
|
||||
}
|
||||
|
||||
unsigned int MergeDocuments::getMemSize (void) const
|
||||
unsigned int MergeDocuments::getMemSize () const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -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<App::DocumentObject*> importObjects(std::istream&);
|
||||
void importObject(const std::vector<App::DocumentObject*>& o, Base::XMLReader & r);
|
||||
void exportObject(const std::vector<App::DocumentObject*>& o, Base::Writer & w);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -414,7 +414,7 @@ StdCmdDownloadOnlineHelp::~StdCmdDownloadOnlineHelp()
|
||||
delete wget;
|
||||
}
|
||||
|
||||
Action * StdCmdDownloadOnlineHelp::createAction(void)
|
||||
Action * StdCmdDownloadOnlineHelp::createAction()
|
||||
{
|
||||
Action *pcAction;
|
||||
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ void PreferenceUiForm::changeEvent(QEvent *e)
|
||||
}
|
||||
|
||||
template <typename PW>
|
||||
void PreferenceUiForm::loadPrefWidgets(void)
|
||||
void PreferenceUiForm::loadPrefWidgets()
|
||||
{
|
||||
QList<PW> pw = form->findChildren<PW>();
|
||||
for (typename QList<PW>::iterator it = pw.begin(); it != pw.end(); ++it)
|
||||
@@ -156,7 +156,7 @@ void PreferenceUiForm::loadPrefWidgets(void)
|
||||
}
|
||||
|
||||
template <typename PW>
|
||||
void PreferenceUiForm::savePrefWidgets(void)
|
||||
void PreferenceUiForm::savePrefWidgets()
|
||||
{
|
||||
QList<PW> pw = form->findChildren<PW>();
|
||||
for (typename QList<PW>::iterator it = pw.begin(); it != pw.end(); ++it)
|
||||
|
||||
@@ -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())
|
||||
{
|
||||
|
||||
@@ -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<const char*> &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;
|
||||
|
||||
@@ -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<OutputStdout>
|
||||
{
|
||||
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<OutputStderr>
|
||||
{
|
||||
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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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("<Workbench object>");
|
||||
}
|
||||
|
||||
@@ -633,7 +633,7 @@ void QuantitySpinBox::setUnitText(const QString& str)
|
||||
}
|
||||
}
|
||||
|
||||
QString QuantitySpinBox::unitText(void)
|
||||
QString QuantitySpinBox::unitText()
|
||||
{
|
||||
Q_D(QuantitySpinBox);
|
||||
return d->unitStr;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 <ReportOutput> reportView;
|
||||
void showReportView(void);
|
||||
void showReportView();
|
||||
};
|
||||
|
||||
} // namespace DockWnd
|
||||
|
||||
@@ -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<PyCFunction>(reinterpret_cast<void (*) (void)>( SelectionSingleton::sSetPreselection )), METH_VARARGS|METH_KEYWORDS,
|
||||
{"setPreselection", reinterpret_cast<PyCFunction>(reinterpret_cast<void (*) ()>( SelectionSingleton::sSetPreselection )), METH_VARARGS|METH_KEYWORDS,
|
||||
"setPreselection(obj, subName, x=0, y=0, z=0, type=1) -> None\n"
|
||||
"\n"
|
||||
"Set preselected object.\n"
|
||||
|
||||
+6
-6
@@ -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<unsigned int>(_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<T*> SelectionSingleton::getObjectsOfType(const char* pDocName
|
||||
}
|
||||
|
||||
/// Get the global instance
|
||||
inline SelectionSingleton& Selection(void)
|
||||
inline SelectionSingleton& Selection()
|
||||
{
|
||||
return SelectionSingleton::instance();
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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<std::vector<SelectionObject> > 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<Node_Block> 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();
|
||||
|
||||
@@ -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()) << ",[";
|
||||
|
||||
@@ -57,28 +57,28 @@ public:
|
||||
PyObject* getPyObject();
|
||||
|
||||
/// get the SubElement name of this SelectionObject
|
||||
inline const std::vector<std::string> &getSubNames(void) const { return SubNames; }
|
||||
inline const std::vector<std::string> &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<Base::Vector3d> getPickedPoints(void) const { return SelPoses; }
|
||||
inline const std::vector<Base::Vector3d> 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;
|
||||
|
||||
|
||||
@@ -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 "<SelectionObject>";
|
||||
}
|
||||
@@ -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<std::string> 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<Base::Vector3d>& points = getSelectionObjectPtr()->getPickedPoints();
|
||||
|
||||
|
||||
@@ -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()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ SoFCBackgroundGradient::~SoFCBackgroundGradient()
|
||||
}
|
||||
|
||||
// doc from parent
|
||||
void SoFCBackgroundGradient::initClass(void)
|
||||
void SoFCBackgroundGradient::initClass()
|
||||
{
|
||||
SO_NODE_INIT_CLASS(SoFCBackgroundGradient,SoNode,"Node");
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ SoSkipBoundingGroup::~SoSkipBoundingGroup()
|
||||
}
|
||||
|
||||
void
|
||||
SoSkipBoundingGroup::initClass(void)
|
||||
SoSkipBoundingGroup::initClass()
|
||||
{
|
||||
SO_NODE_INIT_CLASS(SoSkipBoundingGroup,SoGroup,"Group");
|
||||
}
|
||||
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ SoFCSelection::~SoFCSelection()
|
||||
|
||||
// doc from parent
|
||||
void
|
||||
SoFCSelection::initClass(void)
|
||||
SoFCSelection::initClass()
|
||||
{
|
||||
SO_NODE_INIT_CLASS(SoFCSelection,SoGroup,"Group");
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<SoSVGVectorOutput*>(SoVectorizeAction::getOutput());
|
||||
}
|
||||
|
||||
void SoFCVectorizeSVGAction::printHeader(void) const
|
||||
void SoFCVectorizeSVGAction::printHeader() const
|
||||
{
|
||||
std::ostream& str = this->getSVGOutput()->getFileStream();
|
||||
str << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" << std::endl;
|
||||
@@ -421,18 +421,18 @@ void SoFCVectorizeSVGAction::printHeader(void) const
|
||||
str << "<g>" << std::endl;
|
||||
}
|
||||
|
||||
void SoFCVectorizeSVGAction::printFooter(void) const
|
||||
void SoFCVectorizeSVGAction::printFooter() const
|
||||
{
|
||||
std::ostream& str = this->getSVGOutput()->getFileStream();
|
||||
str << "</g>" << std::endl;
|
||||
str << "</svg>";
|
||||
}
|
||||
|
||||
void SoFCVectorizeSVGAction::printViewport(void) const
|
||||
void SoFCVectorizeSVGAction::printViewport() const
|
||||
{
|
||||
}
|
||||
|
||||
void SoFCVectorizeSVGAction::printBackground(void) const
|
||||
void SoFCVectorizeSVGAction::printBackground() const
|
||||
{
|
||||
if (!getBackgroundState()) {
|
||||
return;
|
||||
|
||||
@@ -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<SoU3DVectorOutput*>(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();
|
||||
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
virtual ~LicenseView();
|
||||
|
||||
void setSource(const QUrl & url);
|
||||
const char *getName(void) const {
|
||||
const char *getName() const {
|
||||
return "LicenseView";
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -55,7 +55,7 @@ TaskDialog::~TaskDialog()
|
||||
|
||||
//==== Slots ===============================================================
|
||||
|
||||
const std::vector<QWidget*> &TaskDialog::getDialogContent(void) const
|
||||
const std::vector<QWidget*> &TaskDialog::getDialogContent() const
|
||||
{
|
||||
return Content;
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace TaskView {
|
||||
class ControlPy : public Py::PythonExtension<ControlPy>
|
||||
{
|
||||
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:
|
||||
|
||||
@@ -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<Gui::SelectionObject> temp = Gui::Selection().getSelectionEx();
|
||||
@@ -182,7 +182,7 @@ void TaskSelectLinkProperty::sendSelection2Property(void)
|
||||
|
||||
}
|
||||
|
||||
void TaskSelectLinkProperty::checkSelectionStatus(void)
|
||||
void TaskSelectLinkProperty::checkSelectionStatus()
|
||||
{
|
||||
QPalette palette(QApplication::palette());
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<TaskWatcher*> &Watcher)
|
||||
addTaskWatcher();
|
||||
}
|
||||
|
||||
void TaskView::clearTaskWatcher(void)
|
||||
void TaskView::clearTaskWatcher()
|
||||
{
|
||||
std::vector<TaskWatcher*> 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<TaskWatcher*>::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
|
||||
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
friend class Gui::ControlSingleton;
|
||||
|
||||
void addTaskWatcher(const std::vector<TaskWatcher*> &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();
|
||||
|
||||
@@ -59,7 +59,7 @@ TaskWatcher::~TaskWatcher()
|
||||
|
||||
//==== implementer ===========================================================================
|
||||
|
||||
std::vector<QWidget*> &TaskWatcher::getWatcherContent(void)
|
||||
std::vector<QWidget*> &TaskWatcher::getWatcherContent()
|
||||
{
|
||||
return Content;
|
||||
}
|
||||
|
||||
@@ -44,11 +44,11 @@ public:
|
||||
TaskWatcher(const char* Filter);
|
||||
virtual ~TaskWatcher();
|
||||
|
||||
std::vector<QWidget*> &getWatcherContent(void);
|
||||
std::vector<QWidget*> &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();
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user