SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

CMake refactoring

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-04 22:31:50 +03:00
parent bd421ff5af
commit c576a14deb
29 changed files with 316 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/piqt_widgets/CMakeLists.txt
View File

@@ -1,9 +1,14 @@
include(PIPMacros)
pip_code_model(CCM "${ROOT_DIR}/pip/libs/main/io_devices/piiodevice.h" "${ROOT_DIR}/pip/libs/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
piqt_library(piqt_utils "Gui" "qad_utils;qad_widgets;qad_blockview;piqt" ${CCM})
find_package(PIP)
if (PIP_FOUND AND BUILDING_pip)
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
add_dependencies(piqt_utils${_v} pip_cmg)
endif()
endforeach()
project(piqt_utils)
pip_code_model(CCM "${pip_ROOT_SRC}/libs/main/io_devices/piiodevice.h" "${pip_ROOT_SRC}/libs/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es" ABSOLUTE)
qad_library(piqt_utils "Gui" "qad_blockview;qad_piqt" ${CCM})
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
add_dependencies(qad_piqt_utils${_v} pip_cmg)
endif()
endforeach()
endif()

4
libs/piqt_widgets/piqt_connection_edit.h
View File

@@ -22,7 +22,7 @@
#include <QDialog>
#include "piconnection.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
namespace Ui {
@@ -33,7 +33,7 @@ class FilterItem;
class DeviceItem;
class SenderItem;
class PIQT_UTILS_EXPORT ConnectionEdit: public QDialog {
class QAD_PIQT_UTILS_EXPORT ConnectionEdit: public QDialog {
Q_OBJECT
public:
explicit ConnectionEdit(QWidget * parent = 0);

10
libs/piqt_widgets/piqt_connection_view.h
View File

@@ -22,14 +22,14 @@
#include "blockview.h"
#include "piconnection.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
const int __CV_Device = 1;
const int __CV_Filter = 2;
const int __CV_Sender = 3;
class PIQT_UTILS_EXPORT DeviceItem: public BlockItem {
class QAD_PIQT_UTILS_EXPORT DeviceItem: public BlockItem {
public:
DeviceItem();
@@ -55,7 +55,7 @@ protected:
};
class PIQT_UTILS_EXPORT FilterItem: public BlockItem {
class QAD_PIQT_UTILS_EXPORT FilterItem: public BlockItem {
public:
FilterItem();
@@ -85,7 +85,7 @@ protected:
};
class PIQT_UTILS_EXPORT SenderItem: public BlockItem {
class QAD_PIQT_UTILS_EXPORT SenderItem: public BlockItem {
public:
SenderItem();
@@ -105,7 +105,7 @@ protected:
};
class PIQT_UTILS_EXPORT ConnectionView: public BlockView {
class QAD_PIQT_UTILS_EXPORT ConnectionView: public BlockView {
Q_OBJECT
public:
explicit ConnectionView(QWidget * parent = 0);

6
libs/piqt_widgets/piqt_highlighter.h
View File

@@ -23,11 +23,11 @@
#include <QSyntaxHighlighter>
#include <QTextCursor>
#include <QTextCharFormat>
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
class QTextDocument;
class PIQT_UTILS_EXPORT ConfigHighlighter : public QSyntaxHighlighter
class QAD_PIQT_UTILS_EXPORT ConfigHighlighter : public QSyntaxHighlighter
{
Q_OBJECT
public:
@@ -38,7 +38,7 @@ public:
private:
void highlightBlock(const QString &text);
struct PIQT_UTILS_EXPORT HighlightingRule {
struct QAD_PIQT_UTILS_EXPORT HighlightingRule {
QRegExp pattern;
QTextCharFormat format;
};

8
libs/piqt_widgets/piqt_iodevice_edit.h
View File

@@ -22,14 +22,14 @@
#include <QWidget>
#include "qad_types.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
class QLineEdit;
class QToolButton;
class IODeviceEditDialog;
class PIQT_UTILS_EXPORT IODeviceEdit: public QWidget {
class QAD_PIQT_UTILS_EXPORT IODeviceEdit: public QWidget {
Q_OBJECT
Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
@@ -61,14 +61,14 @@ signals:
};
class PIQT_UTILS_EXPORT __IODeviceEditRegistrator__ {
class QAD_PIQT_UTILS_EXPORT __IODeviceEditRegistrator__ {
public:
__IODeviceEditRegistrator__();
};
static __IODeviceEditRegistrator__ __iodeviceeditregistrator__;
PIQT_UTILS_EXPORT void QAD_IODevice_toString(const QVariant & v, QString & r);
QAD_PIQT_UTILS_EXPORT void QAD_IODevice_toString(const QVariant & v, QString & r);
#endif // PIQT_IODEVICE_EDIT_H

4
libs/piqt_widgets/piqt_iodevice_edit_dialog.h
View File

@@ -23,13 +23,13 @@
#include <QDialog>
#include "qad_types.h"
#include "propertystorage.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
namespace Ui {
class IODeviceEditDialog;
}
class PIQT_UTILS_EXPORT IODeviceEditDialog: public QDialog {
class QAD_PIQT_UTILS_EXPORT IODeviceEditDialog: public QDialog {
Q_OBJECT
public:
explicit IODeviceEditDialog(QWidget * parent = 0);