Commit c6fb361c authored by Antoine Regimbeau's avatar Antoine Regimbeau

COMP: change <QtOpenGL> to <QGLWidget> and OTB_USE_QT4 to OTB_USE_QT5

parent 42caa92b
......@@ -190,7 +190,7 @@ private:
*/
Ui::MaplaMainWindow* m_UI;
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
/**
* \brief OTB-applications tool-box controller.
*/
......
......@@ -39,7 +39,7 @@
// Monteverdi includes (sorted by alphabetic order)
//
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
#include "mvdOTBApplicationsModel.h"
#endif
......
......@@ -42,7 +42,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
# include "mvdApplicationLauncher.h"
# include "mvdApplicationsToolBoxController.h"
# include "mvdOTBApplicationsModel.h"
......@@ -86,7 +86,7 @@ MaplaMainWindow
::MaplaMainWindow( QWidget * p, Qt::WindowFlags flags ) :
I18nMainWindow( p, flags ),
m_UI( new mvd::Ui::MaplaMainWindow() )
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
,
m_ApplicationsToolBoxController( NULL )
#endif
......@@ -110,7 +110,7 @@ MaplaMainWindow
setObjectName( "Mapla" );
setWindowTitle( PROJECT_NAME " Application Launcher" );
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
assert( m_ApplicationsToolBoxController==NULL );
......@@ -124,16 +124,16 @@ MaplaMainWindow
setCentralWidget( m_ApplicationsToolBoxController->GetWidget() );
#else // OTB_USE_QT4
#else // OTB_USE_QT5
setCentralWidget(
new QLabel(
tr( "Enable OTB_USE_QT4 preprocessor definition at compile time!" ),
tr( "Enable OTB_USE_QT5 preprocessor definition at compile time!" ),
this
)
);
#endif // OTB_USE_QT4
#endif // OTB_USE_QT5
if( !RestoreLayout( Monteverdi_UI_VERSION ) )
{
......@@ -148,7 +148,7 @@ MaplaMainWindow
{
//
// OTB application support.
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
QObject::connect(
m_ApplicationsToolBoxController->GetWidget(),
......@@ -217,7 +217,7 @@ MaplaMainWindow
::OnApplicationToLaunchSelected( const QString & appName,
const QString & )
{
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
assert( MaplaApplication::ConstInstance()!=NULL );
assert( MaplaApplication::ConstInstance()->GetModel()!=NULL );
......@@ -241,7 +241,7 @@ MaplaMainWindow
appWindow->show();
#endif // OTB_USE_QT4
#endif // OTB_USE_QT5
}
/*****************************************************************************/
......
......@@ -221,9 +221,9 @@ protected slots:
/**
*/
#if defined( OTB_USE_QT4 ) && USE_OTB_APPS
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS
void OnApplicationToLaunchSelected( const QString & appName, const QString & docName );
#endif // defined( OTB_USE_QT4 ) && USE_OTB_APPS
#endif // defined( OTB_USE_QT5 ) && USE_OTB_APPS
/**
*/
......@@ -396,7 +396,7 @@ private:
QDockWidget* m_HistogramDock;
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
/**
* \brief OTB-applications browser dock-widget.
*/
......
......@@ -40,7 +40,7 @@
#include "mvdStackedLayerModel.h"
//
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
# include "mvdOTBApplicationsModel.h"
#endif
......@@ -121,7 +121,7 @@ void
Application
::OpenApplicationsBrowser()
{
#ifdef OTB_USE_QT4
#ifdef OTB_USE_QT5
m_OTBApplicationsModel = new OTBApplicationsModel( this );
m_OTBApplicationsModel->BuildModel();
......
......@@ -43,7 +43,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#if defined( OTB_USE_QT4 ) && USE_OTB_APPS
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS
# include "mvdApplicationLauncher.h"
# include "mvdApplicationsToolBoxController.h"
# include "mvdOTBApplicationsModel.h"
......@@ -131,7 +131,7 @@ MainWindow
m_PixelDescriptionDock(NULL),
#endif // USE_PIXEL_DESCRIPTION
m_HistogramDock( NULL ),
#if defined( OTB_USE_QT4 ) && USE_OTB_APPS
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS
m_OtbApplicationsBrowserDock(NULL),
#endif
m_ImageView( NULL ),
......@@ -2209,7 +2209,7 @@ MainWindow
}
/*****************************************************************************/
#if defined( OTB_USE_QT4 ) && USE_OTB_APPS
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS
void
MainWindow
......@@ -2294,7 +2294,7 @@ MainWindow
);
}
#endif // defined( OTB_USE_QT4 ) && USE_OTB_APPS
#endif // defined( OTB_USE_QT5 ) && USE_OTB_APPS
/*****************************************************************************/
#if USE_TABBED_VIEW
......@@ -2324,7 +2324,7 @@ MainWindow
QWidget* appWidget = m_CentralTabWidget->widget( index );
assert( appWidget!=NULL );
#if defined( OTB_USE_QT4 ) && USE_OTB_APPS
#if defined( OTB_USE_QT5 ) && USE_OTB_APPS
assert( appWidget==qobject_cast< Wrapper::QtWidgetView* >( appWidget ) );
Wrapper::QtWidgetView* appWidgetView =
......
......@@ -31,7 +31,8 @@
//
// Qt includes (sorted by alphabetic order)
#include <QtOpenGL>
#include <QGLWidget>
// #include <QtOpenGL>
//
// System includes (sorted by alphabetic order)
......
......@@ -27,7 +27,8 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtOpenGL>
#include <QGLWidget>
// #include <QtOpenGL>
//
// System includes (sorted by alphabetic order)
......
......@@ -27,7 +27,8 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtOpenGL>
#include <QGLWidget>
// #include <QtOpenGL>
//
// System includes (sorted by alphabetic order)
......
......@@ -75,7 +75,7 @@ void QtWidgetStringParameter::DoCreateWidget()
void QtWidgetStringParameter::SetValue(const QString& value)
{
m_StringParam->SetValue(value.toAscii().constData());
m_StringParam->SetValue(value.toLatin1().constData());
// notify of value change
QString key( m_StringParam->GetKey() );
emit ParameterChanged(key);
......
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