Commit 57b44e80 authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[FIX] eliminated more Qt deprecation warnings that appeared lately

parent d222a2e2
......@@ -213,7 +213,7 @@ void WMainWindow::setupGUI()
//network Editor
m_networkEditor = NULL;
m_networkEditor = new WQtNetworkEditor( this );
m_networkEditor->setFeatures( QDockWidget::AllDockWidgetFeatures );
m_networkEditor->setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
// strangely, the QGraphics* objects do not properly forward drag/drop events. We need to explicitly handle them.
connect( m_networkEditor->getView(), SIGNAL( dragDrop( QDropEvent* ) ),
......@@ -221,7 +221,7 @@ void WMainWindow::setupGUI()
// the control panel instance is needed for the menu
m_controlPanel = new WQtControlPanel( this );
m_controlPanel->setFeatures( QDockWidget::AllDockWidgetFeatures );
m_controlPanel->setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
m_controlPanel->addSubject( "Default Subject" );
// add all docks
......@@ -388,7 +388,7 @@ void WMainWindow::setupGUI()
{
m_navAxial = boost::shared_ptr< WQtNavGLWidget >( new WQtNavGLWidget( "Axial View", "Axial View", this, "Axial Slice",
m_mainGLWidget ) );
m_navAxial->setFeatures( QDockWidget::AllDockWidgetFeatures );
m_navAxial->setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
m_navAxial->setSliderProperty( WKernel::getRunningKernel()->getSelectionManager()->getPropAxialPos() );
m_navAxial->getGLWidget()->setCameraManipulator( WQtGLWidget::NO_OP );
......@@ -396,7 +396,7 @@ void WMainWindow::setupGUI()
m_navCoronal = boost::shared_ptr< WQtNavGLWidget >( new WQtNavGLWidget( "Coronal View", "Coronal View", this, "Coronal Slice",
m_mainGLWidget ) );
m_navCoronal->setFeatures( QDockWidget::AllDockWidgetFeatures );
m_navCoronal->setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
m_navCoronal->setSliderProperty( WKernel::getRunningKernel()->getSelectionManager()->getPropCoronalPos() );
m_navCoronal->getGLWidget()->setCameraManipulator( WQtGLWidget::NO_OP );
......@@ -405,7 +405,7 @@ void WMainWindow::setupGUI()
m_navSagittal =
boost::shared_ptr< WQtNavGLWidget >( new WQtNavGLWidget( "Sagittal View", "Sagittal View", this, "Sagittal Slice",
m_mainGLWidget ) );
m_navSagittal->setFeatures( QDockWidget::AllDockWidgetFeatures );
m_navSagittal->setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
m_navSagittal->setSliderProperty( WKernel::getRunningKernel()->getSelectionManager()->getPropSagittalPos() );
m_navSagittal->getGLWidget()->setCameraManipulator( WQtGLWidget::NO_OP );
......
......@@ -237,7 +237,7 @@ int WQtGLWidget::translateButton( QMouseEvent* event )
{
case( Qt::LeftButton ):
return 1;
case( Qt::MidButton ):
case( Qt::MiddleButton ):
return 2;
case( Qt::RightButton ):
return 3;
......
......@@ -74,7 +74,6 @@ WQtGui::WQtGui( const boost::program_options::variables_map& options, int argc,
m_optionsMap( options ),
m_loadDeferredOnce( true )
{
QCoreApplication::setAttribute( Qt::AA_X11InitThreads );
}
WQtGui::~WQtGui()
......
......@@ -45,7 +45,7 @@ WQtMessageDock::WQtMessageDock( QString dockTitle, QWidget* parent ):
{
setObjectName( "MessageDock:" + dockTitle );
setAllowedAreas( Qt::AllDockWidgetAreas );
setFeatures( QDockWidget::AllDockWidgetFeatures );
setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
// log messages
m_logList = new QListWidget( this );
......
......@@ -65,7 +65,7 @@ WQtColormapper::WQtColormapper( QWidget* parent )
+ QString().setNum( WGETexture3D::MAX_NUMBER_OF_TEXTURES )
+ "</b> textures will be applied." );
this->setAllowedAreas( Qt::AllDockWidgetAreas );
this->setFeatures( QDockWidget::AllDockWidgetFeatures );
this->setFeatures( QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable );
m_textureListWidget->setDragDropMode( QAbstractItemView::InternalMove );
// be notified when moving items around
......
......@@ -174,7 +174,7 @@ void WQtNetworkEditorView::mousePressEvent( QMouseEvent* event )
}
// also ignore middle mouse button
if( event->button() == Qt::MidButton )
if( event->button() == Qt::MiddleButton )
{
event->accept();
return;
......@@ -193,7 +193,7 @@ void WQtNetworkEditorView::mousePressEvent( QMouseEvent* event )
void WQtNetworkEditorView::mouseReleaseEvent( QMouseEvent* event )
{
// middle mouse button release: open add-menu
if( event->button() == Qt::MidButton )
if( event->button() == Qt::MiddleButton )
{
if( m_addMenu )
{
......
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