Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use override

This commit is contained in:
Martchus 2018-10-10 21:26:46 +02:00
parent dda2c411fb
commit 533a5d0939
20 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connector/syncthingconnection.h
View File

@ -94,7 +94,7 @@ class LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingConnection : public QObject {
public: public:
explicit SyncthingConnection( explicit SyncthingConnection(
const QString &syncthingUrl = QStringLiteral("http://localhost:8080"), const QByteArray &apiKey = QByteArray(), QObject *parent = nullptr); const QString &syncthingUrl = QStringLiteral("http://localhost:8080"), const QByteArray &apiKey = QByteArray(), QObject *parent = nullptr);
~SyncthingConnection(); ~SyncthingConnection() override;
const QString &syncthingUrl() const; const QString &syncthingUrl() const;
void setSyncthingUrl(const QString &url); void setSyncthingUrl(const QString &url);

2
fileitemactionplugin/syncthingfileitemaction.h
View File

@ -33,7 +33,7 @@ public:
SyncthingInfoAction(QObject *parent = nullptr); SyncthingInfoAction(QObject *parent = nullptr);
protected: protected:
QWidget *createWidget(QWidget *parent); QWidget *createWidget(QWidget *parent) override;
}; };
class SyncthingDirActions : public QObject { class SyncthingDirActions : public QObject {

18
model/syncthingdevicemodel.h
View File

@ -27,15 +27,15 @@ public:
explicit SyncthingDeviceModel(SyncthingConnection &connection, QObject *parent = nullptr); explicit SyncthingDeviceModel(SyncthingConnection &connection, QObject *parent = nullptr);
public Q_SLOTS: public Q_SLOTS:
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const override;
const QVector<int> &colorRoles() const; const QVector<int> &colorRoles() const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role); bool setData(const QModelIndex &index, const QVariant &value, int role) override;
int rowCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const override;
const SyncthingDev *devInfo(const QModelIndex &index) const; const SyncthingDev *devInfo(const QModelIndex &index) const;
private Q_SLOTS: private Q_SLOTS:

18
model/syncthingdirectorymodel.h
View File

@ -27,15 +27,15 @@ public:
explicit SyncthingDirectoryModel(SyncthingConnection &connection, QObject *parent = nullptr); explicit SyncthingDirectoryModel(SyncthingConnection &connection, QObject *parent = nullptr);
public Q_SLOTS: public Q_SLOTS:
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const override;
const QVector<int> &colorRoles() const; const QVector<int> &colorRoles() const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role); bool setData(const QModelIndex &index, const QVariant &value, int role) override;
int rowCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const override;
const SyncthingDir *dirInfo(const QModelIndex &index) const; const SyncthingDir *dirInfo(const QModelIndex &index) const;
private Q_SLOTS: private Q_SLOTS:

16
model/syncthingdownloadmodel.h
View File

@ -23,14 +23,14 @@ public:
enum SyncthingDownloadModelRole { ItemPercentage = Qt::UserRole + 1, ItemProgressLabel, ItemPath }; enum SyncthingDownloadModelRole { ItemPercentage = Qt::UserRole + 1, ItemProgressLabel, ItemPath };
public Q_SLOTS: public Q_SLOTS:
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role); bool setData(const QModelIndex &index, const QVariant &value, int role) override;
int rowCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const override;
const SyncthingDir *dirInfo(const QModelIndex &index) const; const SyncthingDir *dirInfo(const QModelIndex &index) const;
const SyncthingItemDownloadProgress *progressInfo(const QModelIndex &index) const; const SyncthingItemDownloadProgress *progressInfo(const QModelIndex &index) const;
unsigned int pendingDownloads() const; unsigned int pendingDownloads() const;

2
plasmoid/lib/syncthingapplet.h
View File

@ -95,7 +95,7 @@ public:
void setPassiveStates(const QList<Models::ChecklistItem> &passiveStates); void setPassiveStates(const QList<Models::ChecklistItem> &passiveStates);
public Q_SLOTS: public Q_SLOTS:
void init() Q_DECL_OVERRIDE; void init() override;
void showSettingsDlg(); void showSettingsDlg();
void showWebUI(); void showWebUI();
void showLog(); void showLog();

2
tray/gui/devbuttonsitemdelegate.h
View File

@ -12,7 +12,7 @@ class DevButtonsItemDelegate : public QStyledItemDelegate {
public: public:
DevButtonsItemDelegate(QObject *parent); DevButtonsItemDelegate(QObject *parent);
void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const; void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
private: private:
const QPixmap m_pauseIcon; const QPixmap m_pauseIcon;

2
tray/gui/devview.h
View File

@ -18,7 +18,7 @@ Q_SIGNALS:
void pauseResumeDev(const Data::SyncthingDev &dev); void pauseResumeDev(const Data::SyncthingDev &dev);
protected: protected:
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event) override;
private Q_SLOTS: private Q_SLOTS:
void showContextMenu(); void showContextMenu();

2
tray/gui/dirbuttonsitemdelegate.h
View File

@ -11,7 +11,7 @@ class DirButtonsItemDelegate : public QStyledItemDelegate {
public: public:
DirButtonsItemDelegate(QObject *parent); DirButtonsItemDelegate(QObject *parent);
void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const; void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
private: private:
const QPixmap m_refreshIcon; const QPixmap m_refreshIcon;

2
tray/gui/dirview.h
View File

@ -20,7 +20,7 @@ Q_SIGNALS:
void pauseResumeDir(const Data::SyncthingDir &dir); void pauseResumeDir(const Data::SyncthingDir &dir);
protected: protected:
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event) override;
private Q_SLOTS: private Q_SLOTS:
void showContextMenu(); void showContextMenu();

4
tray/gui/downloaditemdelegate.h
View File

@ -11,8 +11,8 @@ class DownloadItemDelegate : public QStyledItemDelegate {
public: public:
DownloadItemDelegate(QObject *parent); DownloadItemDelegate(QObject *parent);
void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const; void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
const QPixmap m_folderIcon; const QPixmap m_folderIcon;

2
tray/gui/downloadview.h
View File

@ -20,7 +20,7 @@ Q_SIGNALS:
void openItemDir(const Data::SyncthingItemDownloadProgress &dir); void openItemDir(const Data::SyncthingItemDownloadProgress &dir);
protected: protected:
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event) override;
private Q_SLOTS: private Q_SLOTS:
void showContextMenu(); void showContextMenu();

2
tray/gui/traymenu.h
View File

@ -14,7 +14,7 @@ class TrayMenu : public QMenu {
public: public:
TrayMenu(TrayIcon *trayIcon = nullptr, QWidget *parent = nullptr); TrayMenu(TrayIcon *trayIcon = nullptr, QWidget *parent = nullptr);
QSize sizeHint() const; QSize sizeHint() const override;
TrayWidget &widget(); TrayWidget &widget();
const TrayWidget &widget() const; const TrayWidget &widget() const;
TrayIcon *icon(); TrayIcon *icon();

2
tray/gui/traywidget.h
View File

@ -43,7 +43,7 @@ class TrayWidget : public QWidget {
public: public:
TrayWidget(TrayMenu *parent = nullptr); TrayWidget(TrayMenu *parent = nullptr);
~TrayWidget(); ~TrayWidget() override;
Data::SyncthingConnection &connection(); Data::SyncthingConnection &connection();
const Data::SyncthingConnection &connection() const; const Data::SyncthingConnection &connection() const;

2
widgets/misc/errorviewdialog.h
View File

@ -13,7 +13,7 @@ namespace QtGui {
class SYNCTHINGWIDGETS_EXPORT ErrorViewDialog : public TextViewDialog { class SYNCTHINGWIDGETS_EXPORT ErrorViewDialog : public TextViewDialog {
Q_OBJECT Q_OBJECT
public: public:
~ErrorViewDialog(); ~ErrorViewDialog() override;
static ErrorViewDialog *instance(); static ErrorViewDialog *instance();
static void addError(InternalError &&newError); static void addError(InternalError &&newError);

2
widgets/misc/textviewdialog.h
View File

@ -30,7 +30,7 @@ Q_SIGNALS:
void reload(); void reload();
protected: protected:
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event) override;
private: private:
void showLogEntries(const std::vector<Data::SyncthingLogEntry> &logEntries); void showLogEntries(const std::vector<Data::SyncthingLogEntry> &logEntries);

2
widgets/settings/settingsdialog.h
View File

@ -115,7 +115,7 @@ public:
explicit SettingsDialog(Data::SyncthingConnection *connection, QWidget *parent = nullptr); explicit SettingsDialog(Data::SyncthingConnection *connection, QWidget *parent = nullptr);
explicit SettingsDialog(const QList<Dialogs::OptionCategory *> &categories, QWidget *parent = nullptr); explicit SettingsDialog(const QList<Dialogs::OptionCategory *> &categories, QWidget *parent = nullptr);
explicit SettingsDialog(QWidget *parent = nullptr); explicit SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog(); ~SettingsDialog() override;
private: private:
void init(); void init();

8
widgets/webview/webpage.h
View File

@ -28,12 +28,12 @@ public:
static bool isSamePage(const QUrl &url1, const QUrl &url2); static bool isSamePage(const QUrl &url1, const QUrl &url2);
protected: protected:
SYNCTHINGWIDGETS_WEB_PAGE *createWindow(WebWindowType type); SYNCTHINGWIDGETS_WEB_PAGE *createWindow(WebWindowType type) override;
#ifdef SYNCTHINGWIDGETS_USE_WEBENGINE #ifdef SYNCTHINGWIDGETS_USE_WEBENGINE
bool certificateError(const QWebEngineCertificateError &certificateError); bool certificateError(const QWebEngineCertificateError &certificateError) override;
bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame); bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) override;
void javaScriptConsoleMessage( void javaScriptConsoleMessage(
QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID); QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override;
#else #else
bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type); bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID); void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID);

8
widgets/webview/webviewdialog.h
View File

@ -21,7 +21,7 @@ class SYNCTHINGWIDGETS_EXPORT WebViewDialog : public QMainWindow {
Q_OBJECT Q_OBJECT
public: public:
WebViewDialog(QWidget *parent = nullptr); WebViewDialog(QWidget *parent = nullptr);
~WebViewDialog(); ~WebViewDialog() override;
public slots: public slots:
void applySettings(const Data::SyncthingConnectionSettings &connectionSettings); void applySettings(const Data::SyncthingConnectionSettings &connectionSettings);
@ -32,10 +32,10 @@ public slots:
void closeUnlessModalVisible(); void closeUnlessModalVisible();
protected: protected:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event) override;
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event) override;
#if defined(SYNCTHINGWIDGETS_USE_WEBENGINE) #if defined(SYNCTHINGWIDGETS_USE_WEBENGINE)
bool eventFilter(QObject *watched, QEvent *event); bool eventFilter(QObject *watched, QEvent *event) override;
#endif #endif
private: private:

2
widgets/webview/webviewinterceptor.h
View File

@ -16,7 +16,7 @@ class WebViewInterceptor : public QWebEngineUrlRequestInterceptor {
public: public:
explicit WebViewInterceptor(const Data::SyncthingConnectionSettings &settings, QObject *parent = nullptr); explicit WebViewInterceptor(const Data::SyncthingConnectionSettings &settings, QObject *parent = nullptr);
virtual void interceptRequest(QWebEngineUrlRequestInfo &info); virtual void interceptRequest(QWebEngineUrlRequestInfo &info) override;
private: private:
const Data::SyncthingConnectionSettings &m_settings; const Data::SyncthingConnectionSettings &m_settings;