Commit d222a2e2 authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[STLYE] changed "master" to "main" in code and comments

parent ad7ce893
......@@ -219,7 +219,7 @@ private:
boost::shared_ptr< WROIManager > m_roiManager; //!< stores a pointer to the roi manager
std::vector< osg::ref_ptr< WROI > > m_rois; //!< list of rois in this this branch,
// first in the list is the master roi
// first in the list is the main roi
/**
* the property object for the module
*/
......
......@@ -56,14 +56,14 @@ public:
boost::shared_ptr< WRMBranch > addBranch();
/**
* Adds a new master ROI
* Adds a new main ROI
*
* \param newRoi
*/
void addRoi( osg::ref_ptr< WROI > newRoi );
/**
* Adds a new ROI below a master ROI
* Adds a new ROI below a main ROI
*
* \param newRoi
* \param parentRoi
......
......@@ -83,9 +83,9 @@ WQtModuleConfig::WQtModuleConfig( QWidget* parent, Qt::WindowFlags f ):
QTabWidget* tab = new QTabWidget( this );
tab->addTab( p1, "Allowed Modules" );
tab->addTab( p2, "Module Paths" );
QVBoxLayout* masterLayout = new QVBoxLayout();
masterLayout->addWidget( tab );
setLayout( masterLayout );
QVBoxLayout* mainLayout = new QVBoxLayout();
mainLayout->addWidget( tab );
setLayout( mainLayout );
QString helpText = "This dialog allows you to modify the list of modules used everywhere in OpenWalnut. The list contains all loaded modules. "
"By default, the list is interpreted as white-list. This means, you have to select the modules you want "
......@@ -204,7 +204,7 @@ WQtModuleConfig::WQtModuleConfig( QWidget* parent, Qt::WindowFlags f ):
connect( defButtons, SIGNAL( accepted() ), this, SLOT( accept() ) );
connect( defButtons, SIGNAL( rejected() ), this, SLOT( reject() ) );
connect( defButtons->button( QDialogButtonBox::RestoreDefaults ), SIGNAL( clicked() ), this, SLOT( reset() ) );
masterLayout->addWidget( defButtons );
mainLayout->addWidget( defButtons );
// initialize the widgets
loadListsFromSettings();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment