Commit 249b4700 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[CHANGE] removed obsolete boost::signals2::signal1. Also fixed c++11 incompatibility in boost.

parent 11acd86f
......@@ -63,7 +63,7 @@ WPickInfo WPickHandler::getHitResult()
return m_hitResult;
}
boost::signals2::signal1< void, WPickInfo >* WPickHandler::getPickSignal()
boost::signals2::signal< void( WPickInfo ) >* WPickHandler::getPickSignal()
{
return &m_pickSignal;
}
......
......@@ -86,7 +86,7 @@ public:
/**
* returns the m_pickSignal to for registering to it.
*/
boost::signals2::signal1< void, WPickInfo >* getPickSignal();
boost::signals2::signal< void( WPickInfo ) >* getPickSignal();
/**
* setter for paint mode
......@@ -126,7 +126,7 @@ private:
*/
void updatePickInfoModifierKeys( WPickInfo* pickInfo );
boost::signals2::signal1< void, WPickInfo > m_pickSignal; //!< One can register to this signal to receive pick events.
boost::signals2::signal< void( WPickInfo ) > m_pickSignal; //!< One can register to this signal to receive pick events.
};
#endif // WPICKHANDLER_H
......@@ -838,7 +838,7 @@ void WMainWindow::openNotImplementedDialog()
"It is not yet implemented." );
}
boost::signals2::signal1< void, std::vector< std::string > >* WMainWindow::getLoaderSignal()
boost::signals2::signal< void( std::vector< std::string > ) >* WMainWindow::getLoaderSignal()
{
return &m_loaderSignal;
}
......
......@@ -110,7 +110,7 @@ public:
*
* \return the signal
*/
boost::signals2::signal1< void, std::vector< std::string > >* getLoaderSignal();
boost::signals2::signal< void( std::vector< std::string > ) >* getLoaderSignal();
/**
* Searches for a custom dock widget with a given name and returns it, if
......@@ -496,7 +496,7 @@ private:
*/
WSharedSequenceContainer< CustomWidgets > m_customWidgets;
boost::signals2::signal1< void, std::vector< std::string > > m_loaderSignal; //!< boost signal for open file dialog
boost::signals2::signal< void( std::vector< std::string > ) > m_loaderSignal; //!< boost signal for open file dialog
/**
* Combine a module with a prototype only if the module is available. Else, nothing happens.
......
......@@ -383,7 +383,7 @@ boost::shared_ptr< WModule > WQtGui::getSelectedModule()
return m_mainWindow->getControlPanel()->getSelectedModule();
}
boost::signals2::signal1< void, std::vector< std::string > >* WQtGui::getLoadButtonSignal()
boost::signals2::signal< void( std::vector< std::string > ) >* WQtGui::getLoadButtonSignal()
{
return m_mainWindow->getLoaderSignal();
}
......
......@@ -148,7 +148,7 @@ public:
/**
* getter functions for the signales proved by the gui
*/
boost::signals2::signal1< void, std::vector< std::string > >* getLoadButtonSignal();
boost::signals2::signal< void( std::vector< std::string > ) >* getLoadButtonSignal();
/**
* Returns the current main window instance or NULL if not existent.
......
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