Commit 7659b1d7 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Reorganize headers and prepare compliance with Qt5

parent a5b83481
......@@ -36,13 +36,13 @@ SET(${PLUGIN_NAME}_HEADERS
numericalconstraintpicker.hh
configurationlist.hh
twojointsconstraint.hh
listjointconstraint.hh
joint-action.hh
)
SET(${PLUGIN_NAME}_HEADERS_NO_MOC
roadmap.hh
conversions.hh
listjointconstraint.hh
)
SET(${PLUGIN_NAME}_FORMS
......
#include "configurationlist.hh"
#include <iostream>
#include <QDropEvent>
#include <QUrl>
#include <iostream>
#include <QShortcut>
#include "configurationlist.hh"
#include "configurationlistwidget.hh"
namespace hpp {
......
......@@ -4,6 +4,8 @@
#include "hpp/corbaserver/common.hh"
#include "hpp/corbaserver/client.hh"
#include <hppwidgetsplugin/hppwidgetsplugin.hh>
namespace hpp {
namespace gui {
const int ConfigurationListWidget::ConfigRole = Qt::UserRole + 1;
......
......@@ -8,7 +8,6 @@
#include "hpp/corbaserver/common.hh"
#include <hppwidgetsplugin/hppwidgetsplugin.hh>
#include "configurationlist.hh"
Q_DECLARE_METATYPE (hpp::floatSeq*)
......@@ -19,6 +18,8 @@ namespace Ui {
namespace hpp {
namespace gui {
class HppWidgetsPlugin;
/// Widget to define initial and goal configurations of the problem.
class ConfigurationListWidget : public QWidget
{
......
#include "hppwidgetsplugin/constraintwidget.hh"
#include <QMessageBox>
#include <QDockWidget>
#include <omniORB4/CORBA.h>
#include "gepetto/gui/meta.hh"
#include "gepetto/gui/mainwindow.hh"
#include "hppwidgetsplugin/constraintwidget.hh"
#include "hppwidgetsplugin/hppwidgetsplugin.hh"
#include "hppwidgetsplugin/transformconstraintwidget.hh"
#include "hppwidgetsplugin/numericalconstraintpicker.hh"
#include "hppwidgetsplugin/ui_constraintwidget.h"
......
......@@ -2,17 +2,19 @@
#define HPP_GUI_CONSTRAINTWIDGET_HH
#include <QWidget>
#include <QDockWidget>
#include "hppwidgetsplugin/hppwidgetsplugin.hh"
#include "hppwidgetsplugin/iconstraint.hh"
class QDockWidget;
namespace Ui {
class ConstraintWidget;
}
namespace hpp {
namespace gui {
class HppWidgetsPlugin;
/// Widget that allows to create constraints.
class ConstraintWidget : public QWidget
{
......
......@@ -4,6 +4,7 @@
#include <boost/algorithm/string.hpp>
#include <QDockWidget>
#include <QMessageBox>
#include <gepetto/gui/mainwindow.hh>
#include <gepetto/gui/windows-manager.hh>
......@@ -220,7 +221,7 @@ namespace hpp {
{
closeConnection ();
hpp_ = new hpp::corbaServer::Client (0,0);
QByteArray iiop = getHppIIOPurl ().toAscii();
QByteArray iiop = getHppIIOPurl ().toLatin1();
hpp_->connect (iiop.constData ());
}
......
......@@ -4,6 +4,8 @@
#include <gepetto/gui/plugin-interface.hh>
#include <hpp/corbaserver/client.hh>
class QDockWidget;
namespace hpp {
namespace gui {
class SolverWidget;
......
#include <omniORB4/CORBA.h>
#include "hppwidgetsplugin/joint-tree-item.hh"
#include <iostream>
#include <QDoubleSpinBox>
#include <QMenu>
#include <QPushButton>
#include <omniORB4/CORBA.h>
#include <hpp/corbaserver/client.hh>
#include <gepetto/viewer/group-node.h>
......
#ifndef HPP_GUI_JOINTTREEITEM_HH
#define HPP_GUI_JOINTTREEITEM_HH
#include <QStandardItem>
#include <QItemDelegate>
#include <QDoubleSpinBox>
#include <QSlider>
#include <QMenu>
#include <QPushButton>
#include <QStandardItem>
#include <hpp/corbaserver/robot.hh>
#include <gepetto/gui/fwd.hh>
......@@ -14,6 +11,10 @@
#include "hppwidgetsplugin/hppwidgetsplugin.hh"
class QDoubleSpinBox;
class QMenu;
class QPushButton;
namespace hpp {
namespace gui {
class IntegratorWheel : public QSlider
......
#include <omniORB4/CORBA.h>
#include <QMenu>
#include "hppwidgetsplugin/jointtreewidget.hh"
#include "hppwidgetsplugin/ui_jointtreewidget.h"
......
#include "listjointconstraint.hh"
#include <QVBoxLayout>
#include <QWidget>
#include <QLabel>
#include <QListWidget>
namespace hpp {
namespace gui {
ListJointConstraint::ListJointConstraint(HppWidgetsPlugin *plugin)
......
#ifndef LISTJOINTCONSTRAINT_HH
#define LISTJOINTCONSTRAINT_HH
#include <QWidget>
#include "iconstraint.hh"
#include "hppwidgetsplugin.hh"
class QListWidget;
class QWidget;
namespace hpp {
namespace gui {
class ListJointConstraint : public IConstraint
......
#include <QHBoxLayout>
#include "hppwidgetsplugin/numericalconstraintpicker.hh"
#include "hppwidgetsplugin/ui_numericalconstraintpicker.h"
#include <iostream>
#include <QHBoxLayout>
#include "hppwidgetsplugin/ui_numericalconstraintpicker.h"
#include "hppwidgetsplugin/hppwidgetsplugin.hh"
namespace hpp {
namespace gui {
......
......@@ -6,7 +6,6 @@
#include <omniORB4/CORBA.h>
#include "gepetto/gui/meta.hh"
#include "hppwidgetsplugin/hppwidgetsplugin.hh"
namespace Ui {
class NumericalConstraintPicker;
......@@ -14,6 +13,8 @@ class NumericalConstraintPicker;
namespace hpp {
namespace gui {
class HppWidgetsPlugin;
class NumericalConstraintPicker : public QWidget
{
Q_OBJECT
......
#include "hppwidgetsplugin/pathplayer.hh"
#include <QDoubleSpinBox>
#include <QFileDialog>
#include <QTextBrowser>
#include <QProgressDialog>
#include <QPushButton>
#include <QSpinBox>
#include <QSlider>
#include <QtConcurrent>
#include <hpp/corbaserver/common.hh>
#include <hpp/corbaserver/client.hh>
......@@ -11,6 +20,7 @@
#include "hppwidgetsplugin/conversions.hh"
#include "hppwidgetsplugin/ui_pathplayerwidget.h"
#include "hppwidgetsplugin/joint-action.hh"
#include <hppwidgetsplugin/hppwidgetsplugin.hh>
namespace hpp {
namespace gui {
......
......@@ -2,13 +2,15 @@
#define HPP_GUI_PATHPLAYER_HH
#include <QWidget>
#include <QSpinBox>
#include <QSlider>
#include <QPushButton>
#include <gepetto/gui/fwd.hh>
#include <hppwidgetsplugin/hppwidgetsplugin.hh>
class QDoubleSpinBox;
class QProcess;
class QPushButton;
class QSpinBox;
class QSlider;
class QTextBrowser;
namespace Ui {
class PathPlayerWidget;
......@@ -16,6 +18,8 @@ namespace Ui {
namespace hpp {
namespace gui {
class HppWidgetsPlugin;
class PathPlayer : public QWidget
{
Q_OBJECT
......
#include "hppwidgetsplugin/solverwidget.hh"
#include "hppwidgetsplugin/ui_solverwidget.h"
#include <QComboBox>
#include <QDialogButtonBox>
#include <QDoubleSpinBox>
#include <QFileDialog>
#include <QListWidget>
#include <QMessageBox>
#include <QtConcurrent>
#include <hpp/corbaserver/client.hh>
#include <QFormLayout>
#include <QMessageBox>
#include "gepetto/gui/mainwindow.hh"
#include "gepetto/gui/windows-manager.hh"
......
......@@ -2,12 +2,13 @@
#define HPP_GUI_SOLVERWIDGET_HH
#include <QWidget>
#include <QComboBox>
#include <QFormLayout>
#include "gepetto/gui/fwd.hh"
#include "hppwidgetsplugin/hppwidgetsplugin.hh"
class QComboBox;
class QDoubleSpinBox;
namespace Ui {
class SolverWidget;
}
......
#include "gepetto/gui/mainwindow.hh"
#include "transformwidget.hh"
#include <QVBoxLayout>
#include "gepetto/gui/mainwindow.hh"
namespace hpp {
namespace gui {
namespace {
......
Supports Markdown
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