Commit 76bbda20 authored by Robert Maynard's avatar Robert Maynard

Teach extension/qt about its new location.

parent 85a6e76b
......@@ -34,62 +34,9 @@ endif()
#install the library and exports the library when used from a build tree
smtk_install_library(SMTKCore DEPENDS cJSON)
#add the Qt GUI code
if(SMTK_BUILD_QT)
add_subdirectory(Qt)
#we should at some point roll this into smtk_source_group
get_directory_property(QAttrLibSrcs DIRECTORY Qt DEFINITION QAttrLibSrcs)
smtk_prepend_string("Qt" QAttrLibSrcs ${QAttrLibSrcs})
get_directory_property(QAttrLibHeaders DIRECTORY Qt DEFINITION QAttrLibHeaders)
smtk_prepend_string("Qt" QAttrLibHeaders ${QAttrLibHeaders})
get_directory_property(QAttrLibUIs DIRECTORY Qt DEFINITION QAttrLibUIs)
smtk_prepend_string("Qt" QAttrLibUIs ${QAttrLibUIs})
qt4_wrap_cpp(MOC_BUILT_SOURCES ${QAttrLibHeaders})
qt4_wrap_ui(UI_BUILT_SOURCES ${QAttrLibUIs})
qt4_add_resources(RCS_RESOURCES Qt/qtEntityItemModelIcons.qrc Qt/qtAttributeIcons.qrc)
source_group("Qt_Source" FILES ${QAttrLibSrcs} ${QAttrLibUIs})
source_group("Qt_Generated" FILES ${MOC_BUILT_SOURCES} ${UI_BUILT_SOURCES} ${RCS_RESOURCES})
source_group("Qt_Header" FILES ${QAttrLibMocHeaders})
set(qtsmtk_headers ${QAttrLibHeaders})
set(qtsmtk_srcs
${QAttrLibSrcs}
${MOC_BUILT_SOURCES}
${UI_BUILT_SOURCES}
${RCS_RESOURCES}
)
add_library(QtSMTK ${qtsmtk_srcs})
# On Mac OS X, set the directory included as part of the installed library's path:
set_target_properties(QtSMTK PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
#we need to add the location of the moc files to the include dir for qtsmtk
target_include_directories(QtSMTK PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
#set QtSMTK to link to qtGUI and include dirs
qt4_use_modules(QtSMTK LINK_PUBLIC Core Gui)
#set QtSMTK to publicly link to SMTKCore
target_link_libraries(QtSMTK LINK_PUBLIC SMTKCore)
smtk_export_header(QtSMTK QtSMTKExports.h)
#install the library and exports the library when used from a build tree
smtk_install_library(QtSMTK DEPENDS SMTKCore)
add_executable(qtAttributePreview Qt/qtAttributePreview.cxx)
target_link_libraries(qtAttributePreview LINK_PUBLIC QtSMTK)
endif()
#add the extensions code
add_subdirectory(extension)
################################################################################
# setup install rules
################################################################################
install(FILES PublicPointerDefs.h DESTINATION include/smtk)
#setup the exports for the library when used from an installed location
......@@ -139,10 +86,16 @@ if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/smtk.py ${CMAKE_INSTALL_PREFIX}/python/smtk.py )" )
endif()
################################################################################
# Build smtk extensions
#add libraries that extend other projects to have support for SMTK
#for example extension/vtk allows you to show smtk models in vtk
################################################################################
add_subdirectory(extension)
################################################################################
# Build model bridges
# Now that the main components of smtk have been built we can build the custom
# model bridges that the user has enabled
################################################################################
add_subdirectory(bridge)
add_subdirectory(bridge)
\ No newline at end of file
#add the Qt GUI code if enabled
if(SMTK_BUILD_QT)
add_subdirectory(qt)
endif()
if(SMTK_BUILD_ParaView)
# Only include the ParaView use-file in subdirectories
# that require ParaView include paths. Otherwise, command
......
......@@ -71,6 +71,38 @@ set(QAttrLibHeaders
#install the headers
smtk_public_headers(${QAttrLibHeaders})
qt4_wrap_cpp(MOC_BUILT_SOURCES ${QAttrLibHeaders})
qt4_wrap_ui(QtSMTK_UI_BUILT_SOURCES ${QAttrLibUIs})
qt4_add_resources(RCS_RESOURCES qtEntityItemModelIcons.qrc qtAttributeIcons.qrc)
source_group("Qt_Source" FILES ${QAttrLibSrcs} ${QAttrLibUIs})
source_group("Qt_Generated" FILES ${MOC_BUILT_SOURCES} ${QtSMTK_UI_BUILT_SOURCES} ${RCS_RESOURCES})
source_group("Qt_Header" FILES ${QAttrLibMocHeaders})
add_library(QtSMTK
${QAttrLibSrcs}
${MOC_BUILT_SOURCES}
${QtSMTK_UI_BUILT_SOURCES}
${RCS_RESOURCES}
)
# On Mac OS X, set the directory included as part of the installed library's path:
set_target_properties(QtSMTK PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
#we need to add the location of the moc files to the include dir for qtsmtk
target_include_directories(QtSMTK PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
#set QtSMTK to link to qtGUI and include dirs
qt4_use_modules(QtSMTK LINK_PUBLIC Core Gui)
#set QtSMTK to publicly link to SMTKCore
target_link_libraries(QtSMTK LINK_PUBLIC SMTKCore)
smtk_export_header(QtSMTK QtSMTKExports.h)
#install the library and exports the library when used from a build tree
smtk_install_library(QtSMTK DEPENDS SMTKCore)
if (SMTK_ENABLE_TESTING)
add_subdirectory(testing)
endif()
......@@ -20,13 +20,13 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtAssociationWidget.h"
#include "smtk/extension/qt/qtAssociationWidget.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtTableWidget.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtItem.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtTableWidget.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/Definition.h"
......@@ -40,7 +40,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "smtk/model/GroupEntity.h"
#include "smtk/model/EntityListPhrase.h"
#include "smtk/model/SimpleModelSubphrases.h"
#include "smtk/Qt/qtEntityItemModel.h"
#include "smtk/extension/qt/qtEntityItemModel.h"
#include <QStringList>
#include <QComboBox>
......
......@@ -28,7 +28,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define __smtk_attribute_qtAssociationWidget_h
#include <QWidget>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
#include "smtk/model/ModelEntity.h"
......
......@@ -19,15 +19,15 @@ PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN
MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtAttribute.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtGroupItem.h"
#include "smtk/Qt/qtInputsItem.h"
#include "smtk/Qt/qtFileItem.h"
#include "smtk/Qt/qtAttributeRefItem.h"
#include "smtk/Qt/qtVoidItem.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtGroupItem.h"
#include "smtk/extension/qt/qtInputsItem.h"
#include "smtk/extension/qt/qtFileItem.h"
#include "smtk/extension/qt/qtAttributeRefItem.h"
#include "smtk/extension/qt/qtVoidItem.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/DoubleItem.h"
......
......@@ -26,7 +26,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define __smtk_attribute_qtAttribute_h
#include <QObject>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
class qtAttributeInternals;
......
......@@ -20,12 +20,12 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtAttributeRefItem.h"
#include "smtk/extension/qt/qtAttributeRefItem.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtAttributeView.h"
#include "smtk/Qt/qtNewAttributeWidget.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtAttributeView.h"
#include "smtk/extension/qt/qtNewAttributeWidget.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/Definition.h"
#include "smtk/attribute/Manager.h"
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtAttributeRefItem_h
#define __smtk_attribute_qtAttributeRefItem_h
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
#include <QComboBox>
class qtAttributeRefItemInternals;
......
......@@ -20,16 +20,16 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtAttributeView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtTableWidget.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtAttributeRefItem.h"
#include "smtk/Qt/qtAssociationWidget.h"
#include "smtk/Qt/qtReferencesWidget.h"
#include "smtk/Qt/qtItem.h"
#include "smtk/Qt/qtVoidItem.h"
#include "smtk/extension/qt/qtAttributeView.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtTableWidget.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtAttributeRefItem.h"
#include "smtk/extension/qt/qtAssociationWidget.h"
#include "smtk/extension/qt/qtReferencesWidget.h"
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/qtVoidItem.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/RefItem.h"
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtAttributeView_h
#define __smtk_attribute_qtAttributeView_h
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtBaseView.h"
#include <QMap>
#include <QStyledItemDelegate>
......
......@@ -19,9 +19,9 @@ PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN
MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/attribute/Definition.h"
#include "smtk/attribute/Manager.h"
......
......@@ -26,7 +26,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define __smtk_attribute_qtBaseView_h
#include <QObject>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
#include <QList>
......
......@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
// self includes
#include "smtk/Qt/qtColorButton.h"
#include "smtk/extension/qt/qtColorButton.h"
// Qt includes
#include <QColorDialog>
......
......@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef pq_ColorChooserButton_h
#define pq_ColorChooserButton_h
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
#include <QToolButton>
#include <QColor>
......
......@@ -20,7 +20,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtDiscreteValueEditor.h"
#include "smtk/extension/qt/qtDiscreteValueEditor.h"
#include <QComboBox>
#include <QHBoxLayout>
......@@ -32,9 +32,9 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "smtk/attribute/ValueItem.h"
#include "smtk/attribute/ValueItemDefinition.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/qtUIManager.h"
using namespace smtk::attribute;
......
......@@ -26,7 +26,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtDiscreteValueEditor_h
#define __smtk_attribute_qtDiscreteValueEditor_h
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
#include <QtGui/QWidget>
class qtDiscreteValueEditorInternals;
......
#include "smtk/Qt/qtEntityItemDelegate.h"
#include "smtk/extension/qt/qtEntityItemDelegate.h"
#include "smtk/Qt/qtEntityItemModel.h"
#include "smtk/Qt/qtEntityItemEditor.h"
#include "smtk/extension/qt/qtEntityItemModel.h"
#include "smtk/extension/qt/qtEntityItemEditor.h"
#include <QApplication>
#include <QPainter>
......
#ifndef __smtk_qt_QEntityItemDelegate_h
#define __smtk_qt_QEntityItemDelegate_h
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include <QStyledItemDelegate>
......
#include "smtk/Qt/qtEntityItemEditor.h"
#include "smtk/extension/qt/qtEntityItemEditor.h"
#include <QtGui/QLineEdit>
#include <QtGui/QHBoxLayout>
......
#ifndef __smtk_qt_QEntityItemEditor_h
#define __smtk_qt_QEntityItemEditor_h
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include <QtGui/QWidget>
class QLineEdit;
......
#include "smtk/Qt/qtEntityItemModel.h"
#include "smtk/extension/qt/qtEntityItemModel.h"
#include "smtk/model/Entity.h"
#include "smtk/model/EntityPhrase.h"
......
......@@ -4,9 +4,8 @@
#include "QAbstractItemModel"
#include "QIcon"
#include "smtk/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
#include "smtk/QtSMTKExports.h" // For EXPORT macro.
#include "smtk/extension/qt/QtSMTKExports.h" // For EXPORT macro.
#include "smtk/model/DescriptivePhrase.h"
namespace smtk {
......
......@@ -20,10 +20,10 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtFileItem.h"
#include "smtk/extension/qt/qtFileItem.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/attribute/DirectoryItem.h"
#include "smtk/attribute/DirectoryItemDefinition.h"
#include "smtk/attribute/FileItem.h"
......
......@@ -41,7 +41,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtFileItem_h
#define __smtk_attribute_qtFileItem_h
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
class qtFileItemInternals;
......
......@@ -20,12 +20,12 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtGroupItem.h"
#include "smtk/extension/qt/qtGroupItem.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/Qt/qtAttributeRefItem.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/qtAttributeRefItem.h"
#include "smtk/attribute/ValueItem.h"
#include "smtk/attribute/ValueItemDefinition.h"
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtGroupItem_h
#define __smtk_attribute_qtGroupItem_h
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
class qtGroupItemInternals;
......
......@@ -20,9 +20,9 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtGroupView.h"
#include "smtk/extension/qt/qtGroupView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/view/Base.h"
#include "smtk/view/Group.h"
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtGroupView_h
#define __smtk_attribute_qtGroupView_h
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/view/Base.h"
class qtGroupViewInternals;
......
......@@ -20,11 +20,11 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtInputsItem.h"
#include "smtk/extension/qt/qtInputsItem.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/Qt/qtOverlay.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/qtOverlay.h"
#include <QCheckBox>
#include <QFrame>
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtInputsItem_h
#define __smtk_attribute_qtInputsItem_h
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
class qtInputsItemInternals;
class QBoxLayout;
......
......@@ -20,11 +20,11 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtInstancedView.h"
#include "smtk/extension/qt/qtInstancedView.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/view/Instanced.h"
#include "smtk/view/Root.h"
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtInstancedView_h
#define __smtk_attribute_qtInstancedView_h
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtBaseView.h"
class qtInstancedViewInternals;
class QScrollArea;
......
......@@ -19,11 +19,11 @@ PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN
MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtItem.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtBaseView.h"
#include "smtk/Qt/qtOverlay.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/extension/qt/qtOverlay.h"
#include "smtk/attribute/Item.h"
#include "smtk/attribute/ItemDefinition.h"
......
......@@ -26,7 +26,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define __smtk_attribute_qtItem_h
#include <QObject>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
class qtItemInternals;
......
......@@ -20,13 +20,13 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtModelEntityView.h"
#include "smtk/extension/qt/qtModelEntityView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtTableWidget.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtItem.h"
#include "smtk/Qt/qtAssociationWidget.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtTableWidget.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtItem.h"
#include "smtk/extension/qt/qtAssociationWidget.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/Definition.h"
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtModelEntityView_h
#define __smtk_attribute_qtModelEntityView_h
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtBaseView.h"
#include <vector>
......
#include "smtk/Qt/qtModelPanel.h"
#include "smtk/extension/qt/qtModelPanel.h"
#include "smtk/model/Entity.h"
#include "smtk/model/FloatData.h"
......@@ -7,9 +7,9 @@
#include "smtk/model/ModelEntity.h"
#include "smtk/model/Manager.h"
#include "smtk/model/StringData.h"
#include "smtk/Qt/qtEntityItemDelegate.h"
#include "smtk/Qt/qtEntityItemModel.h"
#include "smtk/Qt/qtModelView.h"
#include "smtk/extension/qt/qtEntityItemDelegate.h"
#include "smtk/extension/qt/qtEntityItemModel.h"
#include "smtk/extension/qt/qtModelView.h"
#include <QPointer>
......
......@@ -27,8 +27,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define _qtModelPanel_h
#include <QWidget>
#include "smtk/QtSMTKExports.h"
#include "smtk/Qt/qtModelView.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/extension/qt/qtModelView.h"
#include "smtk/util/UUID.h"
namespace smtk {
......
#include "smtk/Qt/qtModelView.h"
#include "smtk/extension/qt/qtModelView.h"
#include "smtk/model/Entity.h"
#include "smtk/model/DescriptivePhrase.h"
......@@ -9,7 +9,7 @@
#include "smtk/model/Manager.h"
#include "smtk/model/StringData.h"
#include "smtk/Qt/qtEntityItemDelegate.h"
#include "smtk/extension/qt/qtEntityItemDelegate.h"
#include "smtk/model/EntityPhrase.h"
#include "smtk/model/EntityListPhrase.h"
......
......@@ -27,8 +27,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define _qtModelView_h
#include <QTreeView>
#include "smtk/QtSMTKExports.h"
#include "smtk/Qt/qtEntityItemModel.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/extension/qt/qtEntityItemModel.h"
#include "smtk/util/UUID.h"
class QDropEvent;
......
......@@ -28,7 +28,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include <QDialog>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
namespace smtk
......
#include "smtk/Qt/qtOverlay.h"
#include "smtk/extension/qt/qtOverlay.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QPainter>
......
......@@ -3,7 +3,7 @@
#include <QWidget>
#include <QPointer>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
namespace smtk
{
......
......@@ -20,12 +20,12 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtReferencesWidget.h"
#include "smtk/extension/qt/qtReferencesWidget.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtTableWidget.h"
#include "smtk/Qt/qtAttribute.h"
#include "smtk/Qt/qtItem.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtTableWidget.h"
#include "smtk/extension/qt/qtAttribute.h"
#include "smtk/extension/qt/qtItem.h"
#include "smtk/attribute/Attribute.h"
#include "smtk/attribute/Definition.h"
......
......@@ -28,7 +28,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#define __smtk_attribute_qtReferencesWidget_h
#include <QWidget>
#include "smtk/QtSMTKExports.h"
#include "smtk/extension/qt/QtSMTKExports.h"
#include "smtk/PublicPointerDefs.h"
class qtReferencesWidgetInternals;
......
......@@ -20,10 +20,10 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtRootView.h"
#include "smtk/extension/qt/qtRootView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtGroupView.h"
#include "smtk/extension/qt/qtUIManager.h"
#include "smtk/extension/qt/qtGroupView.h"
#include "smtk/view/Root.h"
#include <QFrame>
......
......@@ -27,7 +27,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __smtk_attribute_qtRootView_h
#define __smtk_attribute_qtRootView_h
#include "smtk/Qt/qtBaseView.h"
#include "smtk/extension/qt/qtBaseView.h"
#include "smtk/view/Base.h"
class qtRootViewInternals;
......
......@@ -20,11 +20,11 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "smtk/Qt/qtSimpleExpressionView.h"
#include "smtk/extension/qt/qtSimpleExpressionView.h"
#include "smtk/Qt/qtUIManager.h"
#include "smtk/Qt/qtTableWidget.h"