Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings on QPROPERTY-s #5286

Merged
merged 3 commits into from
Jan 2, 2023
Merged

Fix warnings on QPROPERTY-s #5286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0495c65
Fix interval QPROPERTY missing NOTIFY in slideshow class
claucambra Dec 19, 2022
403f43b
Fix currentPage QPROPERTY missing NOTIFY in settingsdialog class
claucambra Dec 19, 2022
733034a
Fix serverURL QPROPERTYes missing CONSTANT in theme class
claucambra Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/gui/settingsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
auto *networkSettings = new NetworkSettings;
_ui->stack->addWidget(networkSettings);

connect(_ui->stack, &QStackedWidget::currentChanged, this, &SettingsDialog::currentPageChanged);

_actionGroupWidgets.insert(generalAction, generalSettings);
_actionGroupWidgets.insert(networkAction, networkSettings);

Expand Down
3 changes: 2 additions & 1 deletion src/gui/settingsdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ownCloudGui;
class SettingsDialog : public QDialog
{
Q_OBJECT
Q_PROPERTY(QWidget* currentPage READ currentPage)
Q_PROPERTY(QWidget* currentPage READ currentPage NOTIFY currentPageChanged)

public:
explicit SettingsDialog(ownCloudGui *gui, QWidget *parent = nullptr);
Expand All @@ -63,6 +63,7 @@ public slots:
signals:
void styleChanged();
void onActivate();
void currentPageChanged();

protected:
void reject() override;
Expand Down
2 changes: 2 additions & 0 deletions src/gui/wizard/slideshow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ void SlideShow::setInterval(int interval)

_interval = interval;
maybeRestartTimer();

emit intervalChanged();
}

int SlideShow::currentSlide() const
Expand Down
3 changes: 2 additions & 1 deletion src/gui/wizard/slideshow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace OCC {
class SlideShow : public QWidget
{
Q_OBJECT
Q_PROPERTY(int interval READ interval WRITE setInterval)
Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
Q_PROPERTY(int currentSlide READ currentSlide WRITE setCurrentSlide NOTIFY currentSlideChanged)

public:
Expand Down Expand Up @@ -57,6 +57,7 @@ public slots:
signals:
void clicked();
void currentSlideChanged(int index);
void intervalChanged();

protected:
void mousePressEvent(QMouseEvent *event) override;
Expand Down
4 changes: 2 additions & 2 deletions src/libsync/theme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject
Q_PROPERTY(QString version READ version CONSTANT)
Q_PROPERTY(QString helpUrl READ helpUrl CONSTANT)
Q_PROPERTY(QString conflictHelpUrl READ conflictHelpUrl CONSTANT)
Q_PROPERTY(QString overrideServerUrl READ overrideServerUrl)
Q_PROPERTY(bool forceOverrideServerUrl READ forceOverrideServerUrl)
Q_PROPERTY(QString overrideServerUrl READ overrideServerUrl CONSTANT)
Q_PROPERTY(bool forceOverrideServerUrl READ forceOverrideServerUrl CONSTANT)
#ifndef TOKEN_AUTH_ONLY
Q_PROPERTY(QColor wizardHeaderTitleColor READ wizardHeaderTitleColor CONSTANT)
Q_PROPERTY(QColor wizardHeaderBackgroundColor READ wizardHeaderBackgroundColor CONSTANT)
Expand Down