Commit 9f0ce08c authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Make HppManipulationWidgetsPlugin compliant with Qt5

parent 1d4e3d93
......@@ -40,11 +40,17 @@ SET(${PLUGIN_NAME}_FORMS
SET(${PLUGIN_NAME}_RESOURCES
)
QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
IF(USE_QT4)
QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
INCLUDE(${QT_USE_FILE})
ELSE(USE_QT4)
QT5_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
QT5_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
QT5_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
ENDIF(USE_QT4)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_SHARED)
......@@ -74,4 +80,3 @@ TARGET_LINK_LIBRARIES(${PLUGIN_NAME} "hppwidgetsplugin" ${QT_LIBRARIES})
PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} "hpp-manipulation-corba")
INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION lib/gepetto-gui-plugins)
#include "hppmanipulationwidgetsplugin/hppmanipulationwidgetsplugin.hh"
#include <QAction>
#include <QDockWidget>
#include <QLayout>
#include <QListWidgetItem>
#include <QPushButton>
#include <QVBoxLayout>
#include "hppmanipulationwidgetsplugin/roadmap.hh"
#include "gepetto/gui/mainwindow.hh"
#include "gepetto/gui/windows-manager.hh"
......@@ -112,7 +119,7 @@ namespace hpp {
{
HppWidgetsPlugin::openConnection();
hpp_ = new HppManipClient (0,0);
QByteArray iiop = getHppIIOPurl ().toAscii();
QByteArray iiop = getHppIIOPurl ().toLatin1();
hpp_->connect (iiop.constData ());
}
......@@ -510,6 +517,8 @@ namespace hpp {
constraintWidget_->addConstraint(new ManipulationLockedJoint(this));
}
#ifdef USE_QT4
Q_EXPORT_PLUGIN2 (hppmanipulationwidgetsplugin, HppManipulationWidgetsPlugin)
#endif // USE_QT4
} // namespace gui
} // namespace hpp
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