Commit b300721a authored by Jan Möbius's avatar Jan Möbius

PickModeInterface make const std::string reference

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13342 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 3047d911
......@@ -70,7 +70,7 @@ class PickingInterface {
*
* @param _mode Identifier of Picking mode or "Separator" to add a Separator
*/
virtual void addPickMode( const std::string _mode) {};
virtual void addPickMode( const std::string& _mode) {};
/** \brief Add a new picking mode to the examiner which will be invisible
*
......@@ -80,7 +80,7 @@ class PickingInterface {
*
* @param _mode Identifier of Picking mode or "Separator" to add a Separator
*/
virtual void addHiddenPickMode( const std::string _mode ) {};
virtual void addHiddenPickMode( const std::string& _mode ) {};
/** \brief Set the cursor of the given PickMode
*
......@@ -89,7 +89,7 @@ class PickingInterface {
* @param _mode Identifier of Picking mode
* @param _cursor the new cursor
*/
virtual void setPickModeCursor( const std::string _mode , QCursor _cursor ) {};
virtual void setPickModeCursor( const std::string& _mode , QCursor _cursor ) {};
/** \brief Set mouse tracking for the given PickMode
*
......@@ -99,7 +99,7 @@ class PickingInterface {
* @param _mode Identifier of Picking mode
* @param _mouseTracking new state of mouseTracking
*/
virtual void setPickModeMouseTracking( const std::string _mode , bool _mouseTracking ) {};
virtual void setPickModeMouseTracking( const std::string& _mode , bool _mouseTracking ) {};
/** \brief Set the additional toolbar of the given PickMode
*
......@@ -108,7 +108,7 @@ class PickingInterface {
* @param _mode Identifier of Picking mode
* @param _toolbar the toolbar
*/
virtual void setPickModeToolbar( const std::string _mode , QToolBar * _toolbar ) {};
virtual void setPickModeToolbar( const std::string& _mode , QToolBar * _toolbar ) {};
/** \brief Removes the additional toolbar of the given PickMode
*
......@@ -116,7 +116,7 @@ class PickingInterface {
*
* @param _mode Identifier of Picking mode
*/
virtual void removePickModeToolbar( const std::string _mode ) {};
virtual void removePickModeToolbar( const std::string& _mode ) {};
private slots:
......
......@@ -1152,31 +1152,31 @@ void Core::loadPlugin(QString filename, bool silent, QString& _licenseErrors, QO
connect(coreWidget_,SIGNAL(signalPickModeChanged (const std::string &)),
plugin,SLOT(slotPickModeChanged( const std::string &)));
if ( checkSignal(plugin,"addPickMode(const std::string)") )
connect(plugin,SIGNAL(addPickMode( const std::string )),
this,SLOT(slotAddPickMode( const std::string )),Qt::DirectConnection);
if ( checkSignal(plugin,"addPickMode(const std::string&)") )
connect(plugin,SIGNAL(addPickMode( const std::string& )),
this,SLOT(slotAddPickMode( const std::string& )),Qt::DirectConnection);
if ( checkSignal(plugin,"addHiddenPickMode(const std::string)") )
connect(plugin,SIGNAL(addHiddenPickMode( const std::string )),
this,SLOT(slotAddHiddenPickMode( const std::string )),Qt::DirectConnection);
if ( checkSignal(plugin,"addHiddenPickMode(const std::string&)") )
connect(plugin,SIGNAL(addHiddenPickMode( const std::string& )),
this,SLOT(slotAddHiddenPickMode( const std::string& )),Qt::DirectConnection);
if ( checkSignal(plugin,"setPickModeCursor(const std::string,QCursor)") )
if ( checkSignal(plugin,"setPickModeCursor(const std::string&,QCursor)") )
for ( uint i = 0 ; i < OpenFlipper::Options::examinerWidgets() ; ++i )
connect(plugin,SIGNAL(setPickModeCursor( const std::string ,QCursor)),
coreWidget_,SLOT(setPickModeCursor( const std::string ,QCursor)),Qt::DirectConnection);
connect(plugin,SIGNAL(setPickModeCursor( const std::string& ,QCursor)),
coreWidget_,SLOT(setPickModeCursor( const std::string& ,QCursor)),Qt::DirectConnection);
if ( checkSignal(plugin,"setPickModeMouseTracking(const std::string,bool)") )
if ( checkSignal(plugin,"setPickModeMouseTracking(const std::string&,bool)") )
for ( uint i = 0 ; i < OpenFlipper::Options::examinerWidgets() ; ++i )
connect(plugin,SIGNAL(setPickModeMouseTracking( const std::string ,bool)),
coreWidget_,SLOT(setPickModeMouseTracking( const std::string ,bool)),Qt::DirectConnection);
connect(plugin,SIGNAL(setPickModeMouseTracking( const std::string& ,bool)),
coreWidget_,SLOT(setPickModeMouseTracking( const std::string& ,bool)),Qt::DirectConnection);
if ( checkSignal(plugin,"setPickModeToolbar(const std::string,QToolBar*)") )
connect(plugin,SIGNAL(setPickModeToolbar (const std::string, QToolBar*)),
coreWidget_,SLOT(setPickModeToolbar (const std::string, QToolBar*)),Qt::DirectConnection);
if ( checkSignal(plugin,"setPickModeToolbar(const std::string&,QToolBar*)") )
connect(plugin,SIGNAL(setPickModeToolbar (const std::string&, QToolBar*)),
coreWidget_,SLOT(setPickModeToolbar (const std::string&, QToolBar*)),Qt::DirectConnection);
if ( checkSignal(plugin,"removePickModeToolbar(const std::string)") )
connect(plugin,SIGNAL(removePickModeToolbar( const std::string)),
coreWidget_,SLOT(removePickModeToolbar( const std::string)),Qt::DirectConnection);
if ( checkSignal(plugin,"removePickModeToolbar(const std::string&)") )
connect(plugin,SIGNAL(removePickModeToolbar( const std::string&)),
coreWidget_,SLOT(removePickModeToolbar( const std::string&)),Qt::DirectConnection);
}
......
......@@ -102,10 +102,10 @@ public:
void nodeVisibilityChanged(int);
// PickingInterface
void addPickMode( const std::string _mode );
void addHiddenPickMode( const std::string _mode );
void setPickModeMouseTracking (const std::string _mode, bool _mouseTracking);
void setPickModeToolbar (const std::string _mode, QToolBar * _toolbar);
void addPickMode( const std::string& _mode );
void addHiddenPickMode( const std::string& _mode );
void setPickModeMouseTracking (const std::string& _mode, bool _mouseTracking);
void setPickModeToolbar (const std::string& _mode, QToolBar * _toolbar);
// ContextMenuInterface
void addContextMenuItem(QAction* _action , ContextMenuType _type);
......
......@@ -130,10 +130,10 @@ Q_INTERFACES(SelectionInterface)
void keyShortcutEvent(int _key, Qt::KeyboardModifiers _modifiers = Qt::NoModifier);
// PickingInterface
void addPickMode(const std::string _mode);
void setPickModeMouseTracking(const std::string _mode, bool _mouseTracking);
void setPickModeCursor(const std::string _mode, QCursor _cursor);
void setPickModeToolbar (const std::string _mode, QToolBar * _toolbar);
void addPickMode(const std::string& _mode);
void setPickModeMouseTracking(const std::string& _mode, bool _mouseTracking);
void setPickModeCursor(const std::string& _mode, QCursor _cursor);
void setPickModeToolbar (const std::string& _mode, QToolBar * _toolbar);
// KeyInterface
void registerKey(int _key, Qt::KeyboardModifiers _modifiers, QString _description, bool _multiUse = false);
......
......@@ -49,10 +49,10 @@ class SkeletonEditingPlugin : public QObject, BaseInterface, MouseInterface, Key
void getCurrentRenderer(unsigned int _viewer, QString& _rendererName);
// PickingInterface
void addPickMode( const std::string _mode );
void addHiddenPickMode( const std::string _mode );
void setPickModeMouseTracking (const std::string _mode, bool _mouseTracking);
void setPickModeToolbar (const std::string _mode, QToolBar * _toolbar);
void addPickMode( const std::string& _mode );
void addHiddenPickMode( const std::string& _mode );
void setPickModeMouseTracking (const std::string& _mode, bool _mouseTracking);
void setPickModeToolbar (const std::string& _mode, QToolBar * _toolbar);
// ContextMenuInterface
void addContextMenuItem(QAction* _action , ContextMenuType _type);
......
......@@ -71,7 +71,7 @@ class TopologyPlugin : public QObject, BaseInterface , MouseInterface, KeyInterf
void updatedObject(int _id, const UpdateType _type);
// PickingInterface
void addHiddenPickMode( const std::string _mode );
void addHiddenPickMode( const std::string& _mode );
// BackupInterface
void createBackup( int _objectid, QString _name, UpdateType _type = UPDATE_ALL);
......
......@@ -88,10 +88,10 @@ class TypeLightPlugin : public QObject, BaseInterface, LoadSaveInterface, Loggin
void getToolBar( QString _name, QToolBar*& _toolbar );
// PickingInterface
void addPickMode(const std::string _mode);
void addHiddenPickMode(const std::string _mode);
void setPickModeMouseTracking (const std::string _mode, bool _mouseTracking);
void setPickModeToolbar(const std::string _mode, QToolBar * _toolbar);
void addPickMode(const std::string& _mode);
void addHiddenPickMode(const std::string& _mode);
void setPickModeMouseTracking (const std::string& _mode, bool _mouseTracking);
void setPickModeToolbar(const std::string& _mode, QToolBar * _toolbar);
private slots:
......
......@@ -94,7 +94,7 @@ class ViewControlPlugin : public QObject, BaseInterface , PickingInterface, Logg
void updateView();
//PickingInterface
void addHiddenPickMode( const std::string _mode );
void addHiddenPickMode( const std::string& _mode );
//LoggingInterface
void log(Logtype _type, QString _message);
......@@ -150,14 +150,14 @@ class ViewControlPlugin : public QObject, BaseInterface , PickingInterface, Logg
*/
std::vector <ShaderInfo> shaderList_;
QToolBar* toolbar_;
QToolBar* toolbar_;
QActionGroup* toolbarViewingDirections_;
QAction* viewTop_;
QAction* viewBottom_;
QAction* viewLeft_;
QAction* viewRight_;
QAction* viewFront_;
QAction* viewBack_;
QAction* viewTop_;
QAction* viewBottom_;
QAction* viewLeft_;
QAction* viewRight_;
QAction* viewFront_;
QAction* viewBack_;
private slots:
QString version() { return QString("1.0"); };
......
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