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

Fix warnings about unqualified slot arguments

This commit is contained in:
Martchus 2023-01-09 15:34:51 +01:00
parent c14ae7b963
commit 9da5392c35
9 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
connector/syncthingconnection.h
View File

@ -192,15 +192,15 @@ public:
public Q_SLOTS:
bool loadSelfSignedCertificate();
bool applySettings(SyncthingConnectionSettings &connectionSettings);
bool applySettings(Data::SyncthingConnectionSettings &connectionSettings);
// methods to initiate/close connection
void connect();
void connect(SyncthingConnectionSettings &connectionSettings);
void connect(Data::SyncthingConnectionSettings &connectionSettings);
void connectLater(int milliSeconds);
void disconnect();
void reconnect();
void reconnect(SyncthingConnectionSettings &connectionSettings);
void reconnect(Data::SyncthingConnectionSettings &connectionSettings);
void reconnectLater(int milliSeconds);
void abortAllRequests();
@ -245,18 +245,19 @@ Q_SIGNALS:
void newDevices(const std::vector<SyncthingDev> &devs);
void newConfigApplied();
void newEvents(const QJsonArray &events);
void dirStatusChanged(const SyncthingDir &dir, int index);
void devStatusChanged(const SyncthingDev &dev, int index);
void fileChanged(const SyncthingDir &dir, int index, const SyncthingFileChange &fileChange);
void dirStatusChanged(const Data::SyncthingDir &dir, int index);
void devStatusChanged(const Data::SyncthingDev &dev, int index);
void fileChanged(const Data::SyncthingDir &dir, int index, const Data::SyncthingFileChange &fileChange);
void downloadProgressChanged();
void dirStatisticsChanged();
void dirCompleted(CppUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev = nullptr);
void dirCompleted(CppUtilities::DateTime when, const Data::SyncthingDir &dir, int index, const Data::SyncthingDev *remoteDev = nullptr);
void newNotification(CppUtilities::DateTime when, const QString &message);
void newDevAvailable(CppUtilities::DateTime when, const QString &devId, const QString &address);
void newDirAvailable(CppUtilities::DateTime when, const QString &devId, const SyncthingDev *dev, const QString &dirId, const QString &dirLabel);
void error(const QString &errorMessage, SyncthingErrorCategory category, int networkError, const QNetworkRequest &request = QNetworkRequest(),
const QByteArray &response = QByteArray());
void statusChanged(SyncthingStatus newStatus);
void newDirAvailable(
CppUtilities::DateTime when, const QString &devId, const Data::SyncthingDev *dev, const QString &dirId, const QString &dirLabel);
void error(const QString &errorMessage, Data::SyncthingErrorCategory category, int networkError,
const QNetworkRequest &request = QNetworkRequest(), const QByteArray &response = QByteArray());
void statusChanged(Data::SyncthingStatus newStatus);
void configDirChanged(const QString &newConfigDir);
void myIdChanged(const QString &myNewId);
void tildeChanged(const QString &tilde);
@ -294,16 +295,16 @@ private Q_SLOTS:
void readDeviceEvent(CppUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData);
void readItemStarted(CppUtilities::DateTime eventTime, const QJsonObject &eventData);
void readItemFinished(CppUtilities::DateTime eventTime, const QJsonObject &eventData);
void readFolderErrors(CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index);
void readFolderErrors(CppUtilities::DateTime eventTime, const QJsonObject &eventData, Data::SyncthingDir &dirInfo, int index);
void readFolderCompletion(
CppUtilities::DateTime eventTime, const QJsonObject &eventData, const QString &dirId, SyncthingDir *dirInfo, int dirIndex);
void readFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, const QString &devId, SyncthingDev *devInfo,
int devIndex, const QString &dirId, SyncthingDir *dirInfo, int dirIndex);
void readLocalFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index);
void readRemoteFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, const QString &devId, SyncthingDev *devInfo,
int devIndex, const QString &dirId, SyncthingDir *dirInfo, int dirIndex);
void readRemoteFolderCompletion(const SyncthingCompletion &completion, const QString &devId, SyncthingDev *devInfo, int devIndex,
const QString &dirId, SyncthingDir *dirInfo, int dirIndex);
CppUtilities::DateTime eventTime, const QJsonObject &eventData, const QString &dirId, Data::SyncthingDir *dirInfo, int dirIndex);
void readFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, const QString &devId, Data::SyncthingDev *devInfo,
int devIndex, const QString &dirId, Data::SyncthingDir *dirInfo, int dirIndex);
void readLocalFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, Data::SyncthingDir &dirInfo, int index);
void readRemoteFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, const QString &devId, Data::SyncthingDev *devInfo,
int devIndex, const QString &dirId, Data::SyncthingDir *dirInfo, int dirIndex);
void readRemoteFolderCompletion(const Data::SyncthingCompletion &completion, const QString &devId, Data::SyncthingDev *devInfo, int devIndex,
const QString &dirId, Data::SyncthingDir *dirInfo, int dirIndex);
void readRemoteIndexUpdated(CppUtilities::DateTime eventTime, const QJsonObject &eventData);
void readPostConfig();
void readRescan();
@ -313,7 +314,7 @@ private Q_SLOTS:
void readShutdown();
void readDirStatus();
void readDirPullErrors();
void readDirSummary(CppUtilities::DateTime eventTime, const QJsonObject &summary, SyncthingDir &dirInfo, int index);
void readDirSummary(CppUtilities::DateTime eventTime, const QJsonObject &summary, Data::SyncthingDir &dirInfo, int index);
void readDirRejected(CppUtilities::DateTime eventTime, const QString &dirId, const QJsonObject &eventData);
void readDevRejected(CppUtilities::DateTime eventTime, const QString &devId, const QJsonObject &eventData);
void readCompletion();
@ -327,10 +328,10 @@ private Q_SLOTS:
void continueConnecting();
void continueReconnecting();
void autoReconnect();
void setStatus(SyncthingStatus status);
void setStatus(Data::SyncthingStatus status);
void emitNotification(CppUtilities::DateTime when, const QString &message);
void emitError(const QString &message, const QJsonParseError &jsonError, QNetworkReply *reply, const QByteArray &response = QByteArray());
void emitError(const QString &message, SyncthingErrorCategory category, QNetworkReply *reply);
void emitError(const QString &message, Data::SyncthingErrorCategory category, QNetworkReply *reply);
void emitMyIdChanged(const QString &newId);
void emitTildeChanged(const QString &newTilde, const QString &newPathSeparator);
void emitDirStatisticsChanged();

17
connector/syncthingnotifier.h
View File

@ -74,17 +74,17 @@ public:
const SyncthingProcess *process() const;
public Q_SLOTS:
void setEnabledNotifications(SyncthingHighLevelNotification enabledNotifications);
void setConsideredIntegrations(SyncthingStartupIntegration consideredIntegrations);
void setEnabledNotifications(Data::SyncthingHighLevelNotification enabledNotifications);
void setConsideredIntegrations(Data::SyncthingStartupIntegration consideredIntegrations);
void setIgnoreInavailabilityAfterStart(unsigned int seconds);
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
void setService(const SyncthingService *service);
void setService(const Data::SyncthingService *service);
#endif
void setProcess(const SyncthingProcess *process);
void setProcess(const Data::SyncthingProcess *process);
Q_SIGNALS:
///! \brief Emitted when the connection status changes. Also provides the previous status.
void statusChanged(SyncthingStatus previousStatus, SyncthingStatus newStatus);
void statusChanged(Data::SyncthingStatus previousStatus, Data::SyncthingStatus newStatus);
///! \brief Emitted when the connection to Syncthing has been established.
void connected();
///! \brief Emitted when the connection to Syncthing has been interrupted.
@ -100,15 +100,16 @@ Q_SIGNALS:
void syncthingProcessError(const QString &message, const QString &additionalInfo);
private Q_SLOTS:
void handleStatusChangedEvent(SyncthingStatus newStatus);
void handleStatusChangedEvent(Data::SyncthingStatus newStatus);
void handleNewDevEvent(CppUtilities::DateTime when, const QString &devId, const QString &address);
void handleNewDirEvent(CppUtilities::DateTime when, const QString &devId, const SyncthingDev *dev, const QString &dirId, const QString &dirLabel);
void handleNewDirEvent(
CppUtilities::DateTime when, const QString &devId, const Data::SyncthingDev *dev, const QString &dirId, const QString &dirLabel);
void handleSyncthingProcessError(QProcess::ProcessError syncthingProcessError);
private:
bool isDisconnectRelevant() const;
void emitConnectedAndDisconnected(SyncthingStatus newStatus);
void emitSyncComplete(CppUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev);
void emitSyncComplete(CppUtilities::DateTime when, const SyncthingDir &dir, int index, const Data::SyncthingDev *remoteDev);
const SyncthingConnection &m_connection;
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD

4
connector/syncthingprocess.h
View File

@ -56,9 +56,9 @@ public:
#endif
public Q_SLOTS:
void restartSyncthing(const QString &program, const QStringList &arguments, SyncthingConnection *currentConnection = nullptr);
void restartSyncthing(const QString &program, const QStringList &arguments, Data::SyncthingConnection *currentConnection = nullptr);
void startSyncthing(const QString &program, const QStringList &arguments);
void stopSyncthing(SyncthingConnection *currentConnection = nullptr);
void stopSyncthing(Data::SyncthingConnection *currentConnection = nullptr);
void killSyncthing();
#ifdef LIB_SYNCTHING_CONNECTOR_BOOST_PROCESS
void terminate();

2
connector/syncthingservice.h
View File

@ -103,7 +103,7 @@ Q_SIGNALS:
void runningChanged(bool running);
void enabledChanged(bool enable);
void errorOccurred(const QString &context, const QString &name, const QString &message);
void scopeChanged(SystemdScope scope);
void scopeChanged(Data::SystemdScope scope);
private Q_SLOTS:
void handleUnitAdded(const QString &unitName, const QDBusObjectPath &unitPath);

2
model/syncthingdevicemodel.h
View File

@ -41,7 +41,7 @@ public Q_SLOTS:
const SyncthingDev *info(const QModelIndex &index) const;
private Q_SLOTS:
void devStatusChanged(const SyncthingDev &, int index);
void devStatusChanged(const Data::SyncthingDev &, int index);
void handleStatusIconsChanged() override;
void handleForkAwesomeIconsChanged() override;

2
model/syncthingdirectorymodel.h
View File

@ -42,7 +42,7 @@ public Q_SLOTS:
const SyncthingDir *info(const QModelIndex &index) const;
private Q_SLOTS:
void dirStatusChanged(const SyncthingDir &dir, int index);
void dirStatusChanged(const Data::SyncthingDir &dir, int index);
void handleConfigInvalidated() override;
void handleNewConfigAvailable() override;
void handleStatusIconsChanged() override;

4
model/syncthingrecentchangesmodel.h
View File

@ -49,10 +49,10 @@ public Q_SLOTS:
void setMaxRows(int maxRows);
private Q_SLOTS:
void fileChanged(const SyncthingDir &dir, int index, const SyncthingFileChange &change);
void fileChanged(const Data::SyncthingDir &dir, int index, const Data::SyncthingFileChange &change);
void handleConfigInvalidated() override;
void handleNewConfigAvailable() override;
void handleStatusChanged(SyncthingStatus status);
void handleStatusChanged(Data::SyncthingStatus status);
void handleForkAwesomeIconsChanged() override;
private:

2
widgets/misc/syncthinglauncher.h
View File

@ -68,7 +68,7 @@ Q_SIGNALS:
public Q_SLOTS:
void launch(const QString &program, const QStringList &arguments);
void launch(const Settings::Launcher &launcherSettings);
void terminate(SyncthingConnection *relevantConnection = nullptr);
void terminate(Data::SyncthingConnection *relevantConnection = nullptr);
void kill();
void tearDownLibSyncthing();

2
widgets/settings/wizard.h
View File

@ -68,7 +68,7 @@ Q_SIGNALS:
private Q_SLOTS:
void showDetailsFromSetupDetection();
void handleConfigurationSelected(MainConfiguration mainConfig, ExtraConfiguration extraConfig);
void handleConfigurationSelected(QtGui::MainConfiguration mainConfig, QtGui::ExtraConfiguration extraConfig);
void handleAutostartSelected(bool autostartEnabled);
void pollForSyncthingConfig();