Skip to content

Commit 3b486bb

Browse files
fizzyadefizzyade
committed
chore: removed [[maybe_unused]]
decided that maybe_unused results in noisy code that is hard to read, so reinstated Q_UNUSED macros.
1 parent 6419874 commit 3b486bb

8 files changed

+75
-23
lines changed

‎MainWindow.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ void Nedrysoft::MainWindow::on_actionExit_triggered()
9292
close();
9393
}
9494

95-
void Nedrysoft::MainWindow::handleOpenByUrl([[maybe_unused]] const QUrl &url)
95+
void Nedrysoft::MainWindow::handleOpenByUrl(const QUrl &url)
9696
{
97+
Q_UNUSED(url);
9798
}
9899

99100
bool Nedrysoft::MainWindow::eventFilter(QObject *obj, QEvent *event)

‎RegExAboutDialog.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ Nedrysoft::RegExAboutDialog::RegExAboutDialog(QWidget *parent) :
5353
setAttribute(Qt::WA_AlwaysStackOnTop);
5454
}
5555

56-
void Nedrysoft::RegExAboutDialog::focusOutEvent([[maybe_unused]] QFocusEvent *event)
56+
void Nedrysoft::RegExAboutDialog::focusOutEvent(QFocusEvent *event)
5757
{
58+
Q_UNUSED(event);
59+
5860
close();
5961
}
6062

‎RegExApiEndpoint.cpp

+41-12
Original file line numberDiff line numberDiff line change
@@ -247,17 +247,22 @@ QVariant Nedrysoft::RegExApiEndpoint::processPostRequest(const QVariant &pathPar
247247
return QVariantMap();
248248
}
249249

250-
QVariant Nedrysoft::RegExApiEndpoint::processDeleteRequest([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter) const
250+
QVariant Nedrysoft::RegExApiEndpoint::processDeleteRequest(const QVariant &pathParameter, const QVariant &requestParameter) const
251251
{
252+
Q_UNUSED(pathParameter);
253+
Q_UNUSED(requestParameter);
254+
252255
QJsonObject jsonResponse;
253256

254257
jsonResponse["message"] = "Your regex has been deleted.";
255258

256259
return QJsonDocument(jsonResponse).toJson();
257260
}
258261

259-
QVariant Nedrysoft::RegExApiEndpoint::processSaveRequest([[maybe_unused]] const QVariant &pathParameter, const QVariant &requestParameter) const
262+
QVariant Nedrysoft::RegExApiEndpoint::processSaveRequest(const QVariant &pathParameter, const QVariant &requestParameter) const
260263
{
264+
Q_UNUSED(pathParameter);
265+
261266
QJsonObject jsonResponse;
262267
QJsonObject bodyObject = QJsonDocument::fromJson(requestParameter.toMap()["body"].toByteArray()).object();
263268
QString permalinkFragment = createPermalinkFragment();
@@ -325,8 +330,10 @@ QVariant Nedrysoft::RegExApiEndpoint::processSaveRequest([[maybe_unused]] const
325330
return QJsonDocument(jsonResponse).toJson();
326331
}
327332

328-
QVariant Nedrysoft::RegExApiEndpoint::processForkRequest([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter) const
333+
QVariant Nedrysoft::RegExApiEndpoint::processForkRequest(const QVariant &pathParameter, const QVariant &requestParameter) const
329334
{
335+
Q_UNUSED(pathParameter);
336+
330337
QJsonObject jsonResponse;
331338
QJsonObject bodyObject = QJsonDocument::fromJson(requestParameter.toMap()["body"].toByteArray()).object();
332339
QString permalinkFragment = createPermalinkFragment();
@@ -368,8 +375,11 @@ QVariant Nedrysoft::RegExApiEndpoint::processForkRequest([[maybe_unused]] const
368375
return QJsonDocument(jsonResponse).toJson();
369376
}
370377

371-
QVariant Nedrysoft::RegExApiEndpoint::processGetLibraryItems([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, [[maybe_unused]] const QRegularExpressionMatch &match) const
378+
QVariant Nedrysoft::RegExApiEndpoint::processGetLibraryItems(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
372379
{
380+
Q_UNUSED(pathParameter);
381+
Q_UNUSED(requestParameter);
382+
373383
QJsonArray jsonResultArray;
374384
QJsonObject jsonResponse, jsonResult;
375385

@@ -408,8 +418,10 @@ QVariant Nedrysoft::RegExApiEndpoint::processGetLibraryItems([[maybe_unused]] co
408418
return QJsonDocument(jsonResponse).toJson();
409419
}
410420

411-
QVariant Nedrysoft::RegExApiEndpoint::processGetItemDetails([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, const QRegularExpressionMatch &match) const
421+
QVariant Nedrysoft::RegExApiEndpoint::processGetItemDetails(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
412422
{
423+
Q_UNUSED(requestParameter);
424+
413425
QJsonObject jsonResponse;
414426
QSqlQuery query;
415427
auto path = pathParameter.toString();
@@ -436,8 +448,11 @@ QVariant Nedrysoft::RegExApiEndpoint::processGetItemDetails([[maybe_unused]] con
436448
return QJsonDocument(jsonResponse).toJson();
437449
}
438450

439-
QVariant Nedrysoft::RegExApiEndpoint::processGetStatic([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, [[maybe_unused]] const QRegularExpressionMatch &match) const
451+
QVariant Nedrysoft::RegExApiEndpoint::processGetStatic(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
440452
{
453+
Q_UNUSED(requestParameter);
454+
Q_UNUSED(match);
455+
441456
auto path = pathParameter.toString();
442457

443458
QFile file(QDir::cleanPath(":/regex101/"+path));
@@ -480,8 +495,10 @@ QString Nedrysoft::RegExApiEndpoint::createDeleteCode() const
480495
return createRandomString(deleteCodeStringLength);
481496
}
482497

483-
QVariant Nedrysoft::RegExApiEndpoint::processPutHistoryRequest([[maybe_unused]] const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
498+
QVariant Nedrysoft::RegExApiEndpoint::processPutHistoryRequest(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
484499
{
500+
Q_UNUSED(pathParameter);
501+
485502
QSqlQuery query;
486503
auto bodyObject = QJsonDocument::fromJson(requestParameter.toMap()["body"].toByteArray()).object();
487504
auto permalinkFragment = match.captured("permalinkFragment");
@@ -521,12 +538,16 @@ QVariant Nedrysoft::RegExApiEndpoint::processPutHistoryRequest([[maybe_unused]]
521538
return QString();
522539
}
523540

524-
void Nedrysoft::RegExApiEndpoint::notifyApplication([[maybe_unused]] QVariant message) const
541+
void Nedrysoft::RegExApiEndpoint::notifyApplication(QVariant message) const
525542
{
543+
Q_UNUSED(message);
526544
}
527545

528-
QVariant Nedrysoft::RegExApiEndpoint::processGetRegEx([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, const QRegularExpressionMatch &match) const
546+
QVariant Nedrysoft::RegExApiEndpoint::processGetRegEx(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
529547
{
548+
Q_UNUSED(pathParameter);
549+
Q_UNUSED(requestParameter);
550+
530551
QSqlQuery query;
531552
QJsonObject jsonResponse;
532553

@@ -545,8 +566,10 @@ QVariant Nedrysoft::RegExApiEndpoint::processGetRegEx([[maybe_unused]] const QVa
545566
return QJsonDocument(jsonResponse).toJson();
546567
}
547568

548-
QVariant Nedrysoft::RegExApiEndpoint::processUploadToLibraryRequest([[maybe_unused]] const QVariant &pathParameter, const QVariant &requestParameter) const
569+
QVariant Nedrysoft::RegExApiEndpoint::processUploadToLibraryRequest(const QVariant &pathParameter, const QVariant &requestParameter) const
549570
{
571+
Q_UNUSED(pathParameter);
572+
550573
QJsonObject jsonResponse;
551574
QJsonObject bodyObject = QJsonDocument::fromJson(requestParameter.toMap()["body"].toByteArray()).object();
552575
QString permalinkFragment = createPermalinkFragment();
@@ -626,8 +649,10 @@ QVariant Nedrysoft::RegExApiEndpoint::processUploadToLibraryRequest([[maybe_unus
626649
return QJsonDocument(jsonResponse).toJson();
627650
}
628651

629-
QVariant Nedrysoft::RegExApiEndpoint::processSetFavorite([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, const QRegularExpressionMatch &match) const
652+
QVariant Nedrysoft::RegExApiEndpoint::processSetFavorite(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
630653
{
654+
Q_UNUSED(pathParameter);
655+
631656
QJsonObject jsonResponse;
632657
QJsonObject bodyObject = QJsonDocument::fromJson(requestParameter.toMap()["body"].toByteArray()).object();
633658
QSqlQuery query;
@@ -651,7 +676,11 @@ QVariant Nedrysoft::RegExApiEndpoint::processSetFavorite([[maybe_unused]] const
651676
return QJsonDocument(jsonResponse).toJson();
652677
}
653678

654-
QVariant Nedrysoft::RegExApiEndpoint::processGetHistory([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, [[maybe_unused]] const QRegularExpressionMatch &match) const
679+
QVariant Nedrysoft::RegExApiEndpoint::processGetHistory(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const
655680
{
681+
Q_UNUSED(pathParameter);
682+
Q_UNUSED(requestParameter);
683+
Q_UNUSED(match);
684+
656685
return QVariant();
657686
}

‎RegExApiEndpoint.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ namespace Nedrysoft {
338338
*
339339
* @returns a QVariant response to the request
340340
*/
341-
QVariant processSetFavorite([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, const QRegularExpressionMatch &match) const;
341+
QVariant processSetFavorite(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const;
342342

343343
/**
344344
* @brief Handles calls to the get history api endpoint
@@ -351,7 +351,7 @@ namespace Nedrysoft {
351351
*
352352
* @returns a QVariant response to the request
353353
*/
354-
QVariant processGetHistory([[maybe_unused]] const QVariant &pathParameter, [[maybe_unused]] const QVariant &requestParameter, const QRegularExpressionMatch &match) const;
354+
QVariant processGetHistory(const QVariant &pathParameter, const QVariant &requestParameter, const QRegularExpressionMatch &match) const;
355355

356356
private:
357357
QSettings *m_settings; //! settings object to store the web application local storage data

‎RegExNullWebEnginePage.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ Nedrysoft::RegExNullWebEnginePage::RegExNullWebEnginePage()
3232
{
3333
}
3434

35-
bool Nedrysoft::RegExNullWebEnginePage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, [[maybe_unused]] bool isMainFrame)
35+
bool Nedrysoft::RegExNullWebEnginePage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame)
3636
{
37+
Q_UNUSED(isMainFrame);
38+
3739
if (type==QWebEnginePage::NavigationTypeLinkClicked) {
3840
QDesktopServices::openUrl(url);
3941
}

‎RegExWebEnginePage.cpp

+17-4
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,35 @@ Nedrysoft::RegExWebEnginePage::~RegExWebEnginePage()
6262
m_urlInterceptor->deleteLater();
6363
}
6464

65-
void Nedrysoft::RegExWebEnginePage::javaScriptConsoleMessage([[maybe_unused]] JavaScriptConsoleMessageLevel level, [[maybe_unused]] const QString &message, [[maybe_unused]] int lineNumber, [[maybe_unused]] const QString &sourceID)
65+
void Nedrysoft::RegExWebEnginePage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID)
6666
{
67+
Q_UNUSED(level);
68+
Q_UNUSED(message);
69+
Q_UNUSED(lineNumber);
70+
Q_UNUSED(sourceID);
71+
6772
//qDebug() << message;
6873
}
6974

70-
void Nedrysoft::RegExWebEnginePage::javaScriptAlert([[maybe_unused]] const QUrl &securityOrigin, [[maybe_unused]] const QString &msg)
75+
void Nedrysoft::RegExWebEnginePage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg)
7176
{
77+
Q_UNUSED(securityOrigin);
78+
Q_UNUSED(msg);
7279
}
7380

74-
QWebEnginePage *Nedrysoft::RegExWebEnginePage::createWindow([[maybe_unused]] QWebEnginePage::WebWindowType type)
81+
QWebEnginePage *Nedrysoft::RegExWebEnginePage::createWindow(QWebEnginePage::WebWindowType type)
7582
{
83+
Q_UNUSED(type);
84+
7685
return new Nedrysoft::RegExNullWebEnginePage();
7786
}
7887

79-
bool Nedrysoft::RegExWebEnginePage::acceptNavigationRequest(const QUrl &url, [[maybe_unused]] QWebEnginePage::NavigationType type, [[maybe_unused]] bool isMainFrame)
88+
bool Nedrysoft::RegExWebEnginePage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame)
8089
{
90+
Q_UNUSED(url);
91+
Q_UNUSED(type);
92+
Q_UNUSED(isMainFrame);
93+
8194
if (url.scheme()!=Nedrysoft::RegExUrlSchemeHandler::name()) {
8295
return false;
8396
}

‎SettingsDialog.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,9 @@ Nedrysoft::SettingsPage *Nedrysoft::SettingsDialog::addPage(QString section, QSt
385385
settingsPage->m_icon = icon;
386386
settingsPage->m_description = description;
387387

388-
connect(m_treeWidget, &QTreeWidget::currentItemChanged, [=](QTreeWidgetItem *current, [[maybe_unused]] QTreeWidgetItem *previous) {
388+
connect(m_treeWidget, &QTreeWidget::currentItemChanged, [=](QTreeWidgetItem *current, QTreeWidgetItem *previous) {
389+
Q_UNUSED(previous);
390+
389391
auto widget = current->data(0, Qt::UserRole).value<QWidget *>();
390392

391393
if (widget) {

‎main.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@
4141
constexpr auto applicationName = APPLICATION_LONG_NAME; //! Provided by CMake to the preprocessor
4242
constexpr auto applicationFontsPrefix = ":/fonts"; //! Fonts are stored under :/fonts (recursive search is performed)
4343

44-
void regexMessageHandler([[maybe_unused]] QtMsgType type, [[maybe_unused]] const QMessageLogContext &context, const QString &msg)
44+
void regexMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
4545
{
46+
Q_UNUSED(type);
47+
Q_UNUSED(context);
48+
4649
fprintf(stdout, "%s\r\n", msg.toLatin1().data());
4750
}
4851

0 commit comments

Comments
 (0)