Commit cc7628ac authored by Martin Heistermann's avatar Martin Heistermann
Browse files

fix ODR conflict with Plugin-InfoMeshObject

parent 9f0dfd83
......@@ -47,9 +47,9 @@
* *
\*===========================================================================*/
#include "infoDialog.hh"
#include "InfoSkeletonDialog.hh"
InfoDialog::InfoDialog(QWidget *parent)
InfoSkeletonDialog::InfoSkeletonDialog(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
......
......@@ -55,11 +55,11 @@
#include <QtGui>
#endif
class InfoDialog : public QDialog, public Ui::InfoWidget
class InfoSkeletonDialog : public QDialog, public Ui::InfoSkeletonWidget
{
Q_OBJECT
public:
explicit InfoDialog(QWidget *parent = 0);
explicit InfoSkeletonDialog(QWidget *parent = 0);
};
......@@ -74,7 +74,7 @@ void InfoSkeletonObjectPlugin::initializePlugin() {
if ( OpenFlipper::Options::gui()) {
// Create info dialog
info_ = new InfoDialog();
info_ = new InfoSkeletonDialog();
}
}
......
......@@ -69,7 +69,7 @@
#include <OpenFlipper/common/Types.hh>
#include <ObjectTypes/Skeleton/Skeleton.hh>
#include "infoDialog.hh"
#include "InfoSkeletonDialog.hh"
//== CLASS DEFINITION =========================================================
......@@ -133,7 +133,7 @@ class InfoSkeletonObjectPlugin : public QObject, BaseInterface, InformationInter
private :
void printSkeletonInfo( Skeleton* _id, unsigned int _objectId, unsigned int _index, ACG::Vec3d& _hitPoint );
InfoDialog* info_;
InfoSkeletonDialog* info_;
public slots:
/// get total number of joints for a given skeleton
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>InfoWidget</class>
<widget class="QDialog" name="InfoWidget">
<class>InfoSkeletonWidget</class>
<widget class="QDialog" name="InfoSkeletonWidget">
<property name="geometry">
<rect>
<x>0</x>
......@@ -837,7 +837,7 @@
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>InfoWidget</receiver>
<receiver>InfoSkeletonWidget</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
......
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