OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Submenus. Minor refactoring

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-20 09:44:55 +01:00
parent e0b6062eca
commit 931bc71deb
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -667,8 +667,6 @@ std::vector<RimWellPath*> RimContextCommandBuilder::allWellPaths()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimContextCommandBuilder::createExecuteScriptForCasesFeatureMenu(caf::CmdFeatureMenuBuilder& menuBuilder) void RimContextCommandBuilder::createExecuteScriptForCasesFeatureMenu(caf::CmdFeatureMenuBuilder& menuBuilder)
{ {
//menuBuilder << "RicExecuteScriptForCasesFeature";
// Execute script on selection of cases // Execute script on selection of cases
RiuMainWindow* ruiMainWindow = RiuMainWindow::instance(); RiuMainWindow* ruiMainWindow = RiuMainWindow::instance();
if (ruiMainWindow) if (ruiMainWindow)

5
Fwk/AppFwk/cafCommand/cafCmdFeature.cpp
View File

@@ -184,12 +184,13 @@ void CmdFeature::disableModelChangeContribution()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// /// Returns action user data.
/// May be called from onActionTriggered only
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const QVariant CmdFeature::userData() const const QVariant CmdFeature::userData() const
{ {
QAction* action = qobject_cast<QAction*>(sender()); QAction* action = qobject_cast<QAction*>(sender());
if (!action) return QVariant(); CAF_ASSERT(action);
return action->data(); return action->data();
} }

3
Fwk/AppFwk/cafCommand/cafCmdFeatureMenuBuilder.h
View File

@@ -59,7 +59,6 @@ class CmdFeatureMenuBuilder
{ {
public: public:
CmdFeatureMenuBuilder(); CmdFeatureMenuBuilder();
//CmdFeatureMenuBuilder(const CmdFeatureMenuBuilder& other);
virtual ~CmdFeatureMenuBuilder(); virtual ~CmdFeatureMenuBuilder();
CmdFeatureMenuBuilder& operator<<(const QString& commandIdOrSeparator); CmdFeatureMenuBuilder& operator<<(const QString& commandIdOrSeparator);
@@ -73,8 +72,6 @@ public:
void appendToMenu(QMenu* menu); void appendToMenu(QMenu* menu);
// const std::vector<MenuItem> items() const;
private: private:
struct MenuItem struct MenuItem
{ {