From d2ac36f3ed7ffbbd9756dca3ee91baa6ef70c4f4 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 23 May 2025 16:00:57 -0400 Subject: [PATCH] chore: make more const methods --- src/lib/arch/unix/ArchNetworkBSD.cpp | 2 +- src/lib/arch/unix/ArchNetworkBSD.h | 2 +- src/lib/deskflow/ArgParser.cpp | 6 +++--- src/lib/deskflow/ArgParser.h | 8 +++++--- src/lib/deskflow/ClientApp.cpp | 2 +- src/lib/deskflow/ClientApp.h | 2 +- src/lib/deskflow/ServerApp.cpp | 2 +- src/lib/deskflow/ServerApp.h | 2 +- src/lib/gui/dialogs/ActionDialog.cpp | 4 ++-- src/lib/gui/dialogs/ActionDialog.h | 4 ++-- src/lib/gui/tls/TlsCertificate.cpp | 2 +- src/lib/gui/tls/TlsCertificate.h | 2 +- 12 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp index e669fd29b..43a9f5e10 100644 --- a/src/lib/arch/unix/ArchNetworkBSD.cpp +++ b/src/lib/arch/unix/ArchNetworkBSD.cpp @@ -410,7 +410,7 @@ void ArchNetworkBSD::throwErrorOnSocket(ArchSocket s) } } -void ArchNetworkBSD::setBlockingOnSocket(int fd, bool blocking) +void ArchNetworkBSD::setBlockingOnSocket(int fd, bool blocking) const { assert(fd != -1); diff --git a/src/lib/arch/unix/ArchNetworkBSD.h b/src/lib/arch/unix/ArchNetworkBSD.h index 8ffde0923..d3378fdef 100644 --- a/src/lib/arch/unix/ArchNetworkBSD.h +++ b/src/lib/arch/unix/ArchNetworkBSD.h @@ -123,7 +123,7 @@ public: private: const int *getUnblockPipe(); const int *getUnblockPipeForThread(ArchThread); - void setBlockingOnSocket(int fd, bool blocking); + void setBlockingOnSocket(int fd, bool blocking) const; void throwError(int) const; void throwNameError(int) const; diff --git a/src/lib/deskflow/ArgParser.cpp b/src/lib/deskflow/ArgParser.cpp index d903fe2b7..8235414f9 100644 --- a/src/lib/deskflow/ArgParser.cpp +++ b/src/lib/deskflow/ArgParser.cpp @@ -24,7 +24,7 @@ ArgParser::ArgParser(App *app) : m_app(app) { } -bool ArgParser::parseServerArgs(deskflow::ServerArgs &args, int argc, const char *const *argv) +bool ArgParser::parseServerArgs(deskflow::ServerArgs &args, int argc, const char *const *argv) const { setArgsBase(args); updateCommonArgs(argv); @@ -61,7 +61,7 @@ bool ArgParser::parseServerArgs(deskflow::ServerArgs &args, int argc, const char return true; } -bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char *const *argv) +bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char *const *argv) const { setArgsBase(args); updateCommonArgs(argv); @@ -118,7 +118,7 @@ bool ArgParser::parseClientArgs(deskflow::ClientArgs &args, int argc, const char bool ArgParser::parsePlatformArgs( deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer -) +) const { #if !WINAPI_XWINDOWS // no options for carbon or windows diff --git a/src/lib/deskflow/ArgParser.h b/src/lib/deskflow/ArgParser.h index 4683ae7c4..2776b1c77 100644 --- a/src/lib/deskflow/ArgParser.h +++ b/src/lib/deskflow/ArgParser.h @@ -23,9 +23,11 @@ class ArgParser public: explicit ArgParser(App *app); - bool parseServerArgs(deskflow::ServerArgs &args, int argc, const char *const *argv); - bool parseClientArgs(deskflow::ClientArgs &args, int argc, const char *const *argv); - bool parsePlatformArgs(deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer); + bool parseServerArgs(deskflow::ServerArgs &args, int argc, const char *const *argv) const; + bool parseClientArgs(deskflow::ClientArgs &args, int argc, const char *const *argv) const; + bool parsePlatformArgs( + deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer + ) const; bool parseGenericArgs(int argc, const char *const *argv, int &i) const; bool parseDeprecatedArgs(int argc, const char *const *argv, int &i) const; void setArgsBase(deskflow::ArgsBase &argsBase) const diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index d4d1bd9a9..20f4d84ee 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -196,7 +196,7 @@ deskflow::Screen *ClientApp::createScreen() #endif } -void ClientApp::updateStatus() +void ClientApp::updateStatus() const { updateStatus(""); } diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h index e96633c9a..3f8424be8 100644 --- a/src/lib/deskflow/ClientApp.h +++ b/src/lib/deskflow/ClientApp.h @@ -62,7 +62,7 @@ public: // Regular functions // - void updateStatus(); + void updateStatus() const; void updateStatus(const std::string &msg) const; void handleScreenError(const Event &, void *); deskflow::Screen *openClientScreen(); diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index 79c011811..cd3880ab8 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -257,7 +257,7 @@ void ServerApp::stopRetryTimer() } } -void ServerApp::updateStatus() +void ServerApp::updateStatus() const { updateStatus(""); } diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h index 565bf533f..79dd79057 100644 --- a/src/lib/deskflow/ServerApp.h +++ b/src/lib/deskflow/ServerApp.h @@ -85,7 +85,7 @@ public: void handleClientsDisconnected(const Event &, void *); void closeServer(Server *server); void stopRetryTimer(); - void updateStatus(); + void updateStatus() const; void updateStatus(const std::string_view &msg) const; void closeClientListener(ClientListener *listen); void stopServer(); diff --git a/src/lib/gui/dialogs/ActionDialog.cpp b/src/lib/gui/dialogs/ActionDialog.cpp index 129790bd2..9649681ff 100644 --- a/src/lib/gui/dialogs/ActionDialog.cpp +++ b/src/lib/gui/dialogs/ActionDialog.cpp @@ -129,12 +129,12 @@ void ActionDialog::actionTypeChanged(int index) QTimer::singleShot(1, this, &ActionDialog::updateSize); } -bool ActionDialog::isKeyAction(int index) +bool ActionDialog::isKeyAction(int index) const { return ((index == ActionTypes::PressKey) || (index == ActionTypes::ReleaseKey) || (index == ActionTypes::ToggleKey)); } -bool ActionDialog::canSave() +bool ActionDialog::canSave() const { if (isKeyAction(ui->comboActionType->currentIndex())) { const QList items = ui->listScreens->findItems("*", Qt::MatchWildcard); diff --git a/src/lib/gui/dialogs/ActionDialog.h b/src/lib/gui/dialogs/ActionDialog.h index f59aa38ec..07bb80e9b 100644 --- a/src/lib/gui/dialogs/ActionDialog.h +++ b/src/lib/gui/dialogs/ActionDialog.h @@ -45,8 +45,8 @@ private: void updateSize(); void keySequenceChanged(); void actionTypeChanged(int index); - bool isKeyAction(int index); - bool canSave(); + bool isKeyAction(int index) const; + bool canSave() const; std::unique_ptr ui; Hotkey &m_hotkey; diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp index fa0f1b8f9..6ffb619eb 100644 --- a/src/lib/gui/tls/TlsCertificate.cpp +++ b/src/lib/gui/tls/TlsCertificate.cpp @@ -28,7 +28,7 @@ TlsCertificate::TlsCertificate(QObject *parent) : QObject(parent) // do nothing } -bool TlsCertificate::generateCertificate(const QString &path, int keyLength) +bool TlsCertificate::generateCertificate(const QString &path, int keyLength) const { qDebug("generating tls certificate: %s", qUtf8Printable(path)); diff --git a/src/lib/gui/tls/TlsCertificate.h b/src/lib/gui/tls/TlsCertificate.h index 4c82bd3cc..aa0a6330c 100644 --- a/src/lib/gui/tls/TlsCertificate.h +++ b/src/lib/gui/tls/TlsCertificate.h @@ -17,7 +17,7 @@ public: explicit TlsCertificate(QObject *parent = nullptr); bool isCertificateValid(const QString &path) const; - bool generateCertificate(const QString &path, int keyLength); + bool generateCertificate(const QString &path, int keyLength) const; bool generateFingerprint(const QString &certificateFilename) const; int getCertKeyLength(const QString &path) const; };