mirror of
https://github.com/moveit/moveit_task_constructor.git
synced 2025-11-04 14:49:57 +08:00
fix Trusty/Indigo build
This commit is contained in:
parent
1bc485658e
commit
40cfceb557
@ -46,6 +46,7 @@
|
|||||||
#include <QHeaderView>
|
#include <QHeaderView>
|
||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
#include <qevent.h>
|
#include <qevent.h>
|
||||||
|
#include <numeric>
|
||||||
|
|
||||||
namespace moveit_rviz_plugin {
|
namespace moveit_rviz_plugin {
|
||||||
|
|
||||||
@ -306,7 +307,9 @@ AutoAdjustingTreeView::AutoAdjustingTreeView(QWidget *parent)
|
|||||||
: QTreeView(parent)
|
: QTreeView(parent)
|
||||||
{
|
{
|
||||||
// consider viewportSizeHint()
|
// consider viewportSizeHint()
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
|
||||||
setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
|
setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoAdjustingTreeView::setStretchSection(int section)
|
void AutoAdjustingTreeView::setStretchSection(int section)
|
||||||
|
|||||||
@ -150,7 +150,7 @@ public:
|
|||||||
|
|
||||||
class AutoAdjustingTreeView : public QTreeView {
|
class AutoAdjustingTreeView : public QTreeView {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(int stretchSection MEMBER stretch_section_ READ stretchSection WRITE setStretchSection)
|
Q_PROPERTY(int stretchSection READ stretchSection WRITE setStretchSection)
|
||||||
|
|
||||||
mutable std::vector<int> size_hints_; // size hints for sections
|
mutable std::vector<int> size_hints_; // size hints for sections
|
||||||
QList<int> auto_hide_cols_; // auto-hiding sections
|
QList<int> auto_hide_cols_; // auto-hiding sections
|
||||||
@ -165,7 +165,7 @@ public:
|
|||||||
void setAutoHideSections(const QList<int> §ions);
|
void setAutoHideSections(const QList<int> §ions);
|
||||||
|
|
||||||
void setModel(QAbstractItemModel *model);
|
void setModel(QAbstractItemModel *model);
|
||||||
QSize viewportSizeHint() const override;
|
QSize viewportSizeHint() const;
|
||||||
void resizeEvent(QResizeEvent *event) override;
|
void resizeEvent(QResizeEvent *event) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -40,6 +40,7 @@
|
|||||||
|
|
||||||
#include <rviz/panel.h>
|
#include <rviz/panel.h>
|
||||||
#include <moveit/macros/class_forward.h>
|
#include <moveit/macros/class_forward.h>
|
||||||
|
#include <QModelIndex>
|
||||||
|
|
||||||
namespace moveit_rviz_plugin {
|
namespace moveit_rviz_plugin {
|
||||||
|
|
||||||
|
|||||||
@ -35,6 +35,8 @@
|
|||||||
/* Author: Robert Haschke */
|
/* Author: Robert Haschke */
|
||||||
|
|
||||||
#include "flat_merge_proxy_model.h"
|
#include "flat_merge_proxy_model.h"
|
||||||
|
#include <vector>
|
||||||
|
#include <numeric>
|
||||||
|
|
||||||
namespace moveit_rviz_plugin {
|
namespace moveit_rviz_plugin {
|
||||||
namespace utils {
|
namespace utils {
|
||||||
|
|||||||
@ -103,7 +103,7 @@ private:
|
|||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))
|
||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsMoved(QModelIndex,int,int,QModelIndex,int))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsMoved(QModelIndex,int,int,QModelIndex,int))
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
#if QT_VERSION >= 0x050000 // due to moc issue we need to use the hex number
|
||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))
|
||||||
#else
|
#else
|
||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex))
|
||||||
|
|||||||
@ -35,6 +35,7 @@
|
|||||||
/* Author: Robert Haschke */
|
/* Author: Robert Haschke */
|
||||||
|
|
||||||
#include "tree_merge_proxy_model.h"
|
#include "tree_merge_proxy_model.h"
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace moveit_rviz_plugin {
|
namespace moveit_rviz_plugin {
|
||||||
namespace utils {
|
namespace utils {
|
||||||
|
|||||||
@ -106,7 +106,7 @@ private:
|
|||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))
|
||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsMoved(QModelIndex,int,int,QModelIndex,int))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsMoved(QModelIndex,int,int,QModelIndex,int))
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
#if QT_VERSION >= 0x050000 // due to moc issue we need to use the hex number
|
||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))
|
||||||
#else
|
#else
|
||||||
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex))
|
Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex))
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user