mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-15 05:32:21 +00:00
Fixes so that lupdate doesn't throw warnings (#4788)
src/Gui/CalendarItemDelegates.h:
ColumnDelegatingItemDelegate
- uses tr() so should call Q_OBJECT
CalendarDetailedDayDelegate
- uses tr() so should call Q_OBJECT
Moved Q_OBJECT to the top of the class for consistency and this also guarantees it's private (which it has to be).
src/Gui/ColorButton.h:
- Moved the comment from Colors.h here.
src/Gui/Colors.h:
- Removed #if 0 code that confused lupdate since it doesn't understand preprocessor macros.
This commit is contained in:
@@ -115,6 +115,7 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
class CalendarHeadlineDelegate : public QStyledItemDelegate {
|
class CalendarHeadlineDelegate : public QStyledItemDelegate {
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
enum Roles {
|
enum Roles {
|
||||||
DayRole = Qt::UserRole + 1 // [CalendarDay] Calendar day
|
DayRole = Qt::UserRole + 1 // [CalendarDay] Calendar day
|
||||||
@@ -153,6 +154,7 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
class CalendarCompactDayDelegate : public QStyledItemDelegate {
|
class CalendarCompactDayDelegate : public QStyledItemDelegate {
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
enum Roles {
|
enum Roles {
|
||||||
DayRole = Qt::UserRole + 1, // [CalendarDay] Calendar day
|
DayRole = Qt::UserRole + 1, // [CalendarDay] Calendar day
|
||||||
@@ -191,6 +193,7 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
class AgendaMultiDelegate : public QStyledItemDelegate {
|
class AgendaMultiDelegate : public QStyledItemDelegate {
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
enum Roles {
|
enum Roles {
|
||||||
// Qt::DisplayRole // [QString] The default text to display
|
// Qt::DisplayRole // [QString] The default text to display
|
||||||
@@ -229,6 +232,7 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
class AgendaEntryDelegate : public QStyledItemDelegate {
|
class AgendaEntryDelegate : public QStyledItemDelegate {
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
enum Roles {
|
enum Roles {
|
||||||
EntryRole = Qt::UserRole, // [CalendarEntry] Entry to be displayed
|
EntryRole = Qt::UserRole, // [CalendarEntry] Entry to be displayed
|
||||||
|
|||||||
@@ -25,6 +25,9 @@
|
|||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QColor>
|
#include <QColor>
|
||||||
|
|
||||||
|
// color chooser that also supports the standard colors (CPLOTMARKER, CPOWER)
|
||||||
|
// and returns them as a QColor(1,1,1,<int>) where <int> is the color number
|
||||||
|
// .e.g CPOWER is 18, see below for full list
|
||||||
class ColorButton : public QPushButton
|
class ColorButton : public QPushButton
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|||||||
@@ -162,17 +162,6 @@ class GCColor : public QObject
|
|||||||
static QStringList getConfigKeys();
|
static QStringList getConfigKeys();
|
||||||
};
|
};
|
||||||
|
|
||||||
// color chooser that also supports the standard colors (CPLOTMARKER, CPOWER)
|
|
||||||
// and returns them as a QColor(1,1,1,<int>) where <int> is the color number
|
|
||||||
// .e.g CPOWER is 18, see below for full list
|
|
||||||
#if 0
|
|
||||||
class GColorDialog : public QDialog
|
|
||||||
{
|
|
||||||
GColorDialog(QWidget *parent);
|
|
||||||
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// return a color for a ride file
|
// return a color for a ride file
|
||||||
class GlobalContext;
|
class GlobalContext;
|
||||||
class ColorEngine : public QObject
|
class ColorEngine : public QObject
|
||||||
|
|||||||
Reference in New Issue
Block a user