Commit 4556ac92 authored by Lefebvre, Jordan's avatar Lefebvre, Jordan
Browse files

Adding decl spec to radixwidgets for shared windows build.

parent 9bba7987
......@@ -4,3 +4,5 @@ testframework
CMakeLists.txt.user
.vscode
build/
CMakeSettings.json
.vs/
......@@ -48,7 +48,6 @@ ELSE()
navigationactionmanager.hh
navigationmodel.hh
navigationwidget.hh
vtkchartwidget.hh
)
SET(SOURCES
${SOURCES}
......@@ -57,8 +56,16 @@ ELSE()
navigationitem.cc
navigationmodel.cc
navigationwidget.cc
vtkchartwidget.cc
)
IF(TPL_ENABLE_VTK)
SET(HEADERS ${HEADER}
vtkchartwidget.hh
)
SET(SOURCES
${SOURCES}
vtkchartwidget.cc
)
ENDIF()
QT5_WRAP_CPP(MOC_FILES
${HEADERS}
)
......
......@@ -14,6 +14,7 @@ ELSE()
ENDIF()
TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
LIB_REQUIRED_PACKAGES radixcore radixbug
LIB_REQUIRED_TPLS ${QT_PACKAGES}
LIB_OPTIONAL_TPLS VTK
)
......
......@@ -5,12 +5,9 @@
#include <QWidget>
#include "radixwidgets/navigationwidget.hh"
namespace Ui
{
class MainWindow;
}
#include "radixcore/visibility.hh"
class MainWindow : public QMainWindow
class RADIX_PUBLIC MainWindow : public QMainWindow
{
Q_OBJECT
......
......@@ -7,11 +7,12 @@
#include <functional>
#include <memory>
#include "radixcore/visibility.hh"
#include "radixwidgets/navigationitem.hh"
namespace radix
{
class NavigationActionManager : public QObject
class RADIX_PUBLIC NavigationActionManager : public QObject
{
Q_OBJECT
public:
......
......@@ -82,6 +82,7 @@ int NavigationItem::row() const
{
return p->parent->p->children.indexOf(const_cast<NavigationItem *>(this));
}
return 0;
}
NavigationItem *NavigationItem::parentItem() { return p->parent; }
......
......@@ -4,9 +4,10 @@
#include <memory>
#include "radixcore/visibility.hh"
namespace radix
{
class NavigationItem
class RADIX_PUBLIC NavigationItem
{
public:
NavigationItem(QVariant data, NavigationItem *parentItem = nullptr);
......
......@@ -5,12 +5,13 @@
#include <memory>
#include "radixcore/visibility.hh"
namespace radix
{
// Forward declaration
class NavigationItem;
class NavigationModel : public QAbstractItemModel
class RADIX_PUBLIC NavigationModel : public QAbstractItemModel
{
Q_OBJECT
public:
......
......@@ -25,7 +25,7 @@
namespace radix
{
class NavigationItemSortFilterProxyModel::PImpl
class RADIX_PUBLIC NavigationItemSortFilterProxyModel::PImpl
{
public:
QHash<QModelIndex, bool> seen;
......@@ -73,7 +73,7 @@ bool NavigationItemSortFilterProxyModel::filterAcceptsRow(
return accepts(index);
}
class NavigationWidget::PImpl
class RADIX_PUBLIC NavigationWidget::PImpl
{
public:
QLineEdit* filter;
......
......@@ -6,6 +6,8 @@
#include <QStyledItemDelegate>
#include <QWidget>
#include "radixcore/visibility.hh"
#include <memory>
QT_BEGIN_NAMESPACE
......@@ -20,7 +22,7 @@ class NavigationItem;
class NavigationModel;
class NavigationActionManager;
class NavigationItemSortFilterProxyModel : public QSortFilterProxyModel
class RADIX_PUBLIC NavigationItemSortFilterProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
......@@ -39,7 +41,7 @@ class NavigationItemSortFilterProxyModel : public QSortFilterProxyModel
std::unique_ptr<PImpl, void (*)(PImpl*)> p;
};
class NavigationWidget : public QWidget
class RADIX_PUBLIC NavigationWidget : public QWidget
{
Q_OBJECT
......
......@@ -4,9 +4,10 @@
#include <QLineEdit>
#include <QWidget>
#include "radixcore/visibility.hh"
namespace radix
{
class NumberPadWidget : public QLineEdit
class RADIX_PUBLIC NumberPadWidget : public QLineEdit
{
Q_OBJECT
......
......@@ -9,7 +9,7 @@
namespace radix
{
class TableView::PImpl
class RADIX_PUBLIC TableView::PImpl
{
public:
bool allow_paste;
......
......@@ -5,6 +5,8 @@
#include <memory>
#include "radixcore/visibility.hh"
namespace radix
{
/**
......@@ -13,7 +15,7 @@ namespace radix
* provides for copy
* */
class TableView : public QTableView
class RADIX_PUBLIC TableView : public QTableView
{
Q_OBJECT
......
......@@ -2,13 +2,15 @@
#define RADIX_RADIXWIDGETS_TABWIDGET_HH_
#include <QTabWidget>
#include "radixcore/visibility.hh"
namespace radix
{
/**
* * @brief The RouteTabs class
* * Tabs displaying each route
* */
class TabWidget : public QTabWidget
class RADIX_PUBLIC TabWidget : public QTabWidget
{
Q_OBJECT
......
......@@ -10,9 +10,11 @@
#include <vtkRenderer.h>
#include <vtkSmartPointer.h>
#include "radixcore/visibility.hh"
namespace radix
{
class VTKChartWidget : public QVTKOpenGLWidget
class RADIX_PUBLIC VTKChartWidget : public QVTKOpenGLWidget
{
Q_OBJECT
......
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