Commit 8a1234be authored by Bob Obara's avatar Bob Obara

ENH: Fixing header guards

Made all the guards to be consistant in the extension/qt directory - __smtk_extenstion_xxxx_h
parent 4ee97c0c
Pipeline #14740 passed with stage
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtSection
#ifndef __smtk_attribute_qtAssociationWidget_h
#define __smtk_attribute_qtAssociationWidget_h
#ifndef __smtk_extension_qtAssociationWidget_h
#define __smtk_extension_qtAssociationWidget_h
#include <QWidget>
#include "smtk/extension/qt/Exports.h"
......
......@@ -10,8 +10,8 @@
// .NAME qtAttribute - a class that encapsulates the UI of an Attribute
// .SECTION Description
#ifndef __smtk_attribute_qtAttribute_h
#define __smtk_attribute_qtAttribute_h
#ifndef __smtk_extension_qtAttribute_h
#define __smtk_extension_qtAttribute_h
#include <QObject>
#include <QPointer>
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtSection
#ifndef __smtk_attribute_qtAttributeDisplay_h
#define __smtk_attribute_qtAttributeDisplay_h
#ifndef __smtk_extension_qtAttributeDisplay_h
#define __smtk_extension_qtAttributeDisplay_h
#include <QWidget>
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtAttributeRefItem_h
#define __smtk_attribute_qtAttributeRefItem_h
#ifndef __smtk_extension_qtAttributeRefItem_h
#define __smtk_extension_qtAttributeRefItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtSection
#ifndef __smtk_attribute_qtAttributeView_h
#define __smtk_attribute_qtAttributeView_h
#ifndef __smtk_extension_qtAttributeView_h
#define __smtk_extension_qtAttributeView_h
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -10,8 +10,8 @@
// .NAME qtBaseView - a base class for all view types
// .SECTION Description
#ifndef __smtk_attribute_qtBaseView_h
#define __smtk_attribute_qtBaseView_h
#ifndef __smtk_extension_qtBaseView_h
#define __smtk_extension_qtBaseView_h
#include <QObject>
#include <QList>
......
......@@ -8,8 +8,8 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef __smtk_qt_qtCheckItemComboBox_h
#define __smtk_qt_qtCheckItemComboBox_h
#ifndef __smtk_extension_qtCheckItemComboBox_h
#define __smtk_extension_qtCheckItemComboBox_h
#include "smtk/extension/qt/Exports.h"
#include "smtk/PublicPointerDefs.h"
......@@ -75,4 +75,4 @@ class SMTKQTEXT_EXPORT qtCheckItemComboBox : public QComboBox
} // namespace extension
} // namespace smtk
#endif // __smtk_qt_qtCheckItemComboBox_h
#endif // __smtk_extension_qtCheckItemComboBox_h
......@@ -13,10 +13,10 @@
#include <QCheckBox>
#include <QFrame>
#include "ui_qtCollapsibleGroupWidgetInternals.h"
using namespace smtk;
using namespace smtk::extension;
//----------------------------------------------------------------------------
class smtk::qtCollapsibleGroupWidgetInternals : public Ui::qtCollapsibleGroupWidgetInternals
class smtk::extension::qtCollapsibleGroupWidgetInternals : public Ui::qtCollapsibleGroupWidgetInternals
{
public:
qtCollapsibleGroupWidgetInternals() {}
......
......@@ -11,39 +11,41 @@
// .SECTION Description
// .SECTION See Also
#ifndef __qtCollapsibleGroupWidget_h
#define __qtCollapsibleGroupWidget_h
#ifndef __smtk_extension_qtCollapsibleGroupWidget_h
#define __smtk_extension_qtCollapsibleGroupWidget_h
#include <QWidget>
class QFrame;
namespace smtk
{
class qtCollapsibleGroupWidgetInternals;
class qtCollapsibleGroupWidget: public QWidget
namespace extension
{
Q_OBJECT
class qtCollapsibleGroupWidgetInternals;
class qtCollapsibleGroupWidget: public QWidget
{
Q_OBJECT
public:
qtCollapsibleGroupWidget(QWidget *parent);
virtual ~qtCollapsibleGroupWidget();
public:
qtCollapsibleGroupWidget(QWidget *parent);
virtual ~qtCollapsibleGroupWidget();
QLayout *contentsLayout() const;
void setContentsLayout(QLayout *newLayout);
QFrame *contents() const;
void setName(const QString &newName);
QString name() const;
public slots:
void open();
void collapse();
protected:
qtCollapsibleGroupWidgetInternals *m_internals;
private:
QLayout *contentsLayout() const;
void setContentsLayout(QLayout *newLayout);
QFrame *contents() const;
void setName(const QString &newName);
QString name() const;
public slots:
void open();
void collapse();
protected:
qtCollapsibleGroupWidgetInternals *m_internals;
private:
};
};
};
#endif /* __qtCollapsibleGroupWidget_h */
#endif /* __smtk_extension_qtCollapsibleGroupWidget_h */
......@@ -11,8 +11,8 @@
// .SECTION Description
// .SECTION See Also
#ifndef __smtk_attribute_qtDiscreteValueEditor_h
#define __smtk_attribute_qtDiscreteValueEditor_h
#ifndef __smtk_extension_qtDiscreteValueEditor_h
#define __smtk_extension_qtDiscreteValueEditor_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -8,8 +8,8 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef __smtk_qt_QEntityItemDelegate_h
#define __smtk_qt_QEntityItemDelegate_h
#ifndef __smtk_extension_QEntityItemDelegate_h
#define __smtk_extension_QEntityItemDelegate_h
#include "smtk/extension/qt/Exports.h"
......@@ -95,4 +95,4 @@ protected:
} // namespace extension
} // namespace smtk
#endif // __smtk_qt_QEntityItemDelegate_h
#endif // __smtk_extension_QEntityItemDelegate_h
......@@ -8,8 +8,8 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef __smtk_qt_QEntityItemEditor_h
#define __smtk_qt_QEntityItemEditor_h
#ifndef __smtk_extension_QEntityItemEditor_h
#define __smtk_extension_QEntityItemEditor_h
#include "smtk/extension/qt/Exports.h"
#include <QtGui/QWidget>
......@@ -43,4 +43,4 @@ protected:
} // namespace model
} // namespace smtk
#endif // __smtk_qt_QEntityItemEditor_h
#endif // __smtk_extension_QEntityItemEditor_h
......@@ -8,8 +8,8 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef __smtk_qt_qtEntityItemModel_h
#define __smtk_qt_qtEntityItemModel_h
#ifndef __smtk_extension_qtEntityItemModel_h
#define __smtk_extension_qtEntityItemModel_h
#include "QAbstractItemModel"
#include "QIcon"
......@@ -200,4 +200,4 @@ bool QEntityItemModel::foreach_phrase(T& visitor, C& collector, const QModelInde
} // namespace model
} // namespace smtk
#endif // __smtk_qt_qtEntityItemModel_h
#endif // __smtk_extension_qtEntityItemModel_h
......@@ -26,8 +26,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtFileItem_h
#define __smtk_attribute_qtFileItem_h
#ifndef __smtk_extension_qtFileItem_h
#define __smtk_extension_qtFileItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtGroupItem_h
#define __smtk_attribute_qtGroupItem_h
#ifndef __smtk_extension_qtGroupItem_h
#define __smtk_extension_qtGroupItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -361,7 +361,7 @@ void qtGroupView::addGroupBoxEntry(qtBaseView* child)
{
return;
}
smtk::qtCollapsibleGroupWidget *gw = new qtCollapsibleGroupWidget(frame);
smtk::extension::qtCollapsibleGroupWidget *gw = new qtCollapsibleGroupWidget(frame);
this->Widget->layout()->addWidget(gw);
gw->setName(child->getObject()->title().c_str());
gw->contentsLayout()->addWidget(child->widget());
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtBaseView
#ifndef __smtk_attribute_qtGroupView_h
#define __smtk_attribute_qtGroupView_h
#ifndef __smtk_extension_qtGroupView_h
#define __smtk_extension_qtGroupView_h
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtInputsItem_h
#define __smtk_attribute_qtInputsItem_h
#ifndef __smtk_extension_qtInputsItem_h
#define __smtk_extension_qtInputsItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtSection
#ifndef __smtk_attribute_qtInstancedView_h
#define __smtk_attribute_qtInstancedView_h
#ifndef __smtk_extension_qtInstancedView_h
#define __smtk_extension_qtInstancedView_h
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -10,8 +10,8 @@
// .NAME qtItem - an abstract UI class for attribute item
// .SECTION Description
#ifndef __smtk_attribute_qtItem_h
#define __smtk_attribute_qtItem_h
#ifndef __smtk_extension_qtItem_h
#define __smtk_extension_qtItem_h
#include <QObject>
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtMeshSelectionItem_h
#define __smtk_attribute_qtMeshSelectionItem_h
#ifndef __smtk_extension_qtMeshSelectionItem_h
#define __smtk_extension_qtMeshSelectionItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtModelEntityItem_h
#define __smtk_attribute_qtModelEntityItem_h
#ifndef __smtk_extension_qtModelEntityItem_h
#define __smtk_extension_qtModelEntityItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtBaseView
#ifndef __smtk_attribute_qtModelView_h
#define __smtk_attribute_qtModelView_h
#ifndef __smtk_extension_qtModelView_h
#define __smtk_extension_qtModelView_h
#include "smtk/extension/qt/qtBaseView.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtSection
#ifndef __smtk_attribute_qtModelOperationWidget_h
#define __smtk_attribute_qtModelOperationWidget_h
#ifndef __smtk_extension_qtModelOperationWidget_h
#define __smtk_extension_qtModelOperationWidget_h
#include <QWidget>
#include "smtk/extension/qt/Exports.h"
......
......@@ -11,8 +11,8 @@
// .SECTION Description
// .SECTION Caveats
#ifndef _qtModelPanel_h
#define _qtModelPanel_h
#ifndef __smtk_extension_qtModelPanel_h
#define __smtk_extension_qtModelPanel_h
#include "smtk/extension/qt/Exports.h"
#include "smtk/extension/qt/qtModelView.h"
......@@ -50,4 +50,4 @@ private:
} // namespace model
} // namespace smtk
#endif // !_qtModelPanel_h
#endif // __smtk_extension_qtModelPanel_h
......@@ -11,8 +11,8 @@
// .SECTION Description
// .SECTION Caveats
#ifndef _qtModelView_h
#define _qtModelView_h
#ifndef __smtk_extension_qtModelView_h
#define __smtk_extension_qtModelView_h
#include "smtk/extension/qt/Exports.h"
#include "smtk/extension/qt/qtEntityItemModel.h"
......@@ -201,4 +201,4 @@ namespace smtk {
} // namespace extension
} // namespace smtk
#endif // !_qtModelView_h
#endif // __smtk_extension_qtModelView_h
......@@ -11,8 +11,8 @@
// .SECTION Description
// .SECTION Caveats
#ifndef __smtk_attribute_qtNewAttributeWidget_h
#define __smtk_attribute_qtNewAttributeWidget_h
#ifndef __smtk_extension_qtNewAttributeWidget_h
#define __smtk_extension_qtNewAttributeWidget_h
#include <QDialog>
......
......@@ -17,8 +17,8 @@
// area and its tab becomes selected or unselected, which is not what we want.
// .SECTION Caveats
#ifndef _qtOperatorDockWidget_h
#define _qtOperatorDockWidget_h
#ifndef __smtk_extension_qtOperatorDockWidget_h
#define __smtk_extension_qtOperatorDockWidget_h
#include "smtk/extension/qt/Exports.h"
#include <QDockWidget>
......@@ -45,4 +45,4 @@ protected:
} // namespace model
} // namespace smtk
#endif // !_qtOperatorDockWidget_h
#endif // __smtk_extension_qtOperatorDockWidget_h
......@@ -15,7 +15,7 @@
#include <QComboBox>
#include <QStringList>
using namespace smtk::attribute;
using namespace smtk::extension;
qtOverlay::qtOverlay(QWidget * parentW ) : QWidget(parentW)
{
......
......@@ -8,7 +8,7 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef _qtOverlay_h
#ifndef __smtk_extension_qtOverlay_h
#define _qtOverlay_h
#include <QWidget>
......@@ -17,7 +17,7 @@
namespace smtk
{
namespace attribute
namespace extension
{
class SMTKQTEXT_EXPORT qtOverlay : public QWidget
{
......@@ -61,4 +61,4 @@ namespace smtk
};
};
#endif // !_qtOverlay_
#endif // __smtk_extension_qtOverlay_
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtSection
#ifndef __smtk_attribute_qtReferencesWidget_h
#define __smtk_attribute_qtReferencesWidget_h
#ifndef __smtk_extension_qtReferencesWidget_h
#define __smtk_extension_qtReferencesWidget_h
#include <QWidget>
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtBaseView
#ifndef __smtk_attribute_qtSimpleExpressionView_h
#define __smtk_attribute_qtSimpleExpressionView_h
#ifndef __smtk_extension_qtSimpleExpressionView_h
#define __smtk_extension_qtSimpleExpressionView_h
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -13,6 +13,7 @@
#include <QKeyEvent>
#include <QHeaderView>
using namespace smtk::extension;
//-----------------------------------------------------------------------------
qtTableWidget::qtTableWidget(QWidget* p)
......
......@@ -19,35 +19,38 @@
// 5. Customized Drag-n-Drop
// .SECTION Caveats
#ifndef _qtTableWidget_h
#define _qtTableWidget_h
#ifndef __smtk_extension_qtTableWidget_h
#define __smtk_extension_qtTableWidget_h
#include <QTableWidget>
#include "smtk/extension/qt/Exports.h"
class QKeyEvent;
class SMTKQTEXT_EXPORT qtTableWidget : public QTableWidget
{
Q_OBJECT
public:
qtTableWidget(QWidget* p = NULL);
~qtTableWidget();
QModelIndexList getSelectedIndexes() const
namespace smtk {
namespace extension {
class SMTKQTEXT_EXPORT qtTableWidget : public QTableWidget
{
return this->selectedIndexes();
}
public slots:
signals:
void keyPressed(QKeyEvent*);
protected slots:
virtual void keyPressEvent(QKeyEvent*);
Q_OBJECT
public:
qtTableWidget(QWidget* p = NULL);
~qtTableWidget();
QModelIndexList getSelectedIndexes() const
{
return this->selectedIndexes();
}
public slots:
signals:
void keyPressed(QKeyEvent*);
protected slots:
virtual void keyPressEvent(QKeyEvent*);
};
};
};
#endif // !_qtTableWidget_h
#endif // __smtk_extension_qtTableWidget_h
......@@ -12,8 +12,8 @@
// .SECTION Description
// .SECTION See Also
#ifndef __smtk_attribute_qtUIManager_h
#define __smtk_attribute_qtUIManager_h
#ifndef __smtk_extension_qtUIManager_h
#define __smtk_extension_qtUIManager_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
......@@ -12,8 +12,8 @@
// .SECTION See Also
// qtItem
#ifndef __smtk_attribute_qtVoidItem_h
#define __smtk_attribute_qtVoidItem_h
#ifndef __smtk_extension_qtVoidItem_h
#define __smtk_extension_qtVoidItem_h
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/Exports.h"
......
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