Skip to content

Commit 35f304b

Browse files
committed
Use "::" to access global functions.
1 parent 35c29d8 commit 35f304b

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

src/Export/ExportImage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void exportTwinImage(const QList<PlotBase*>& plotsList,
3636
const QSize rightSize{rightPlot->size()};
3737

3838
const QSize imageSize(leftSize.width() + rightSize.width(),
39-
qMax(leftSize.height(), rightSize.height()));
39+
::qMax(leftSize.height(), rightSize.height()));
4040
QImage image(createImage(imageSize));
4141
QPainter painter(&image);
4242

src/ModelsAndViews/PlotDataProvider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void PlotDataProvider::recompute(QVector<TransactionData> newCalcData,
1515

1616
QVector<double> yAxisValues;
1717
yAxisValues.reserve(points.size());
18-
for (const auto& point : qAsConst(points))
18+
for (const auto& point : ::qAsConst(points))
1919
yAxisValues.append(point.y());
2020

2121
Q_EMIT basicPlotDataChanged(std::move(points), quantiles_,

src/Update/Update.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void Update::finalizeUpdate()
259259
insertNewSectionIntoDetails(tr("Renaming temporary filenames") +
260260
QLatin1Char(':'));
261261

262-
for (const QString& tempFileName : qAsConst(tempFiles_))
262+
for (const QString& tempFileName : ::qAsConst(tempFiles_))
263263
renameTempFile(tempFileName);
264264

265265
insertNewLineIntoDetails();

src/Update/main.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88

99
#include "Update.h"
1010

11-
static void showDifferentInstanceRunnningError()
11+
namespace
12+
{
13+
void showDifferentInstanceRunnningError()
1214
{
1315
QMessageBox::critical(nullptr, QObject::tr("Error"),
1416
QObject::tr("Different instance of ") +
1517
QApplication::applicationName() +
1618
QObject::tr(" already running, exiting."));
1719
}
1820

19-
static bool isUniqueInstance()
21+
bool isUniqueInstance()
2022
{
2123
// Only one instance can run. Intentionally leak.
2224
auto* sharedMemory{new QSharedMemory(QStringLiteral(VER_PRODUCTNAME_STR))};
@@ -49,6 +51,7 @@ static bool isUniqueInstance()
4951

5052
return true;
5153
}
54+
} // namespace
5255

5356
int main(int argc, char* argv[])
5457
{

src/Volbx/main.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
#include "VolbxProperties.h"
1111

12-
static void overwriteUpdaterfIfNeeded()
12+
namespace
13+
{
14+
void overwriteUpdaterfIfNeeded()
1315
{
1416
const QString updaterFile{QCoreApplication::applicationDirPath() + "/" +
1517
constants::getUpdaterName() +
@@ -26,6 +28,7 @@ static void overwriteUpdaterfIfNeeded()
2628
updaterFile);
2729
}
2830
}
31+
} // namespace
2932

3033
int main(int argc, char* argv[])
3134
{

0 commit comments

Comments
 (0)