From 2dea4225e4ef8bcf62c702ddf14e4c43e9bc99fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 13 Sep 2019 16:45:36 +0200 Subject: [PATCH] Fix qdoc macro issue --- docs/config.qdocconf | 2 +- libnymea-gpio/gpio.cpp | 18 ++++++++++-------- libnymea-gpio/gpiobutton.cpp | 1 + libnymea-gpio/gpiobutton.h | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/config.qdocconf b/docs/config.qdocconf index 69cc0d8..e55b75d 100644 --- a/docs/config.qdocconf +++ b/docs/config.qdocconf @@ -27,4 +27,4 @@ sourcedirs = ../libnymea-gpio headers.fileextensions = "*.h" sources.fileextensions = "*.cpp" -Cpp.ignoredirectives = Q_DECLARE_METATYPE Q_DECLARE_LOGGING_CATEGORY Q_LOGGING_CATEGORY +Cpp.ignoredirectives = Q_DECLARE_METATYPE Q_DECLARE_LOGGING_CATEGORY Q_LOGGING_CATEGORY Q_ENUM diff --git a/libnymea-gpio/gpio.cpp b/libnymea-gpio/gpio.cpp index 432fde2..915e3b0 100644 --- a/libnymea-gpio/gpio.cpp +++ b/libnymea-gpio/gpio.cpp @@ -74,7 +74,8 @@ */ -/*! \enum Gpio::Direction +/*! + \enum Gpio::Direction This enum type specifies the dirction a Gpio. \value DirectionInput @@ -85,19 +86,21 @@ The direction is not valid. */ -/*! \enum Gpio::Value +/*! + \enum Gpio::Value This enum type specifies the value a Gpio. + \value ValueInvalid + The value is not valid. \value ValueLow The Gpio is low. \value ValueHigh The Gpio is high. - \value ValueInvalid - The value is not valid. + */ - -/*! \enum Gpio::Edge +/*! + \enum Gpio::Edge This enum type specifies the edge interrupt type of a Gpio. \value EdgeFalling @@ -357,8 +360,7 @@ bool Gpio::activeLow() return false; } -/*! Returns true if the \a edge of this GPIO could be set correctly. The \a edge parameter specifies, - * when an interrupt occurs. */ +/*! Returns true if the \a edge of this GPIO could be set correctly. The \a edge parameter specifies, when an interrupt occurs. */ bool Gpio::setEdgeInterrupt(Gpio::Edge edge) { diff --git a/libnymea-gpio/gpiobutton.cpp b/libnymea-gpio/gpiobutton.cpp index 093e39a..30431e0 100644 --- a/libnymea-gpio/gpiobutton.cpp +++ b/libnymea-gpio/gpiobutton.cpp @@ -21,6 +21,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "gpiobutton.h" +#include "gpiomonitor.h" GpioButton::GpioButton(int gpioNumber, QObject *parent) : QObject(parent), diff --git a/libnymea-gpio/gpiobutton.h b/libnymea-gpio/gpiobutton.h index 57f8aec..65e55a1 100644 --- a/libnymea-gpio/gpiobutton.h +++ b/libnymea-gpio/gpiobutton.h @@ -27,7 +27,7 @@ #include #include -#include "gpiomonitor.h" +class GpioMonitor; class GpioButton : public QObject {