Postfix magic and vars

shell_integration/windows/OCContextMenu/OCClientInterface.cpp

@@ -72,7 +72,8 @@ std::shared_ptr<HBITMAP> saveImage(const string &data)
     Gdiplus::GdiplusStartupInput gdiplusStartupInput;
     Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, nullptr);
 
-    DWORD size = 2 * 1024;
+    const int bytesPerKibibyte = 1024;
+    DWORD size = 2 * bytesPerKibibyte;
     std::vector<BYTE> buf(size, 0);
     DWORD skipped;
     if (!CryptStringToBinaryA(data.data(), 0, CRYPT_STRING_BASE64, buf.data(), &size, &skipped, nullptr)) {

src/cmd/cmd.cpp

@@ -73,8 +73,8 @@ struct CmdOptions
     QString exclude;
     QString unsyncedfolders;
     int restartTimes = 3;
-    int downlimit = 0;
-    int uplimit = 0;
+    int downlimitKbPerSec = 0;
+    int uplimitKbPerSec = 0;
     bool deltasync;
     qint64 deltasyncminfilesize;
 };
@@ -201,7 +201,7 @@ void sync(const SyncCTX &ctx)
     QObject::connect(engine, &SyncEngine::syncError, engine,
         [](const QString &error) { qWarning() << "Sync error:" << error; });
     engine->setIgnoreHiddenFiles(ctx.options.ignoreHiddenFiles);
-    engine->setNetworkLimits(ctx.options.uplimit, ctx.options.downlimit);
+    engine->setNetworkLimits(ctx.options.uplimitKbPerSec, ctx.options.downlimitKbPerSec);
 
 
     // Exclude lists
@@ -312,8 +312,8 @@ class HttpCredentialsText : public HttpCredentials
     std::cout << "  -n                     Use netrc (5) for login" << std::endl;
     std::cout << "  --non-interactive      Do not block execution with interaction" << std::endl;
     std::cout << "  --max-sync-retries [n] Retries maximum n times (default to 3)" << std::endl;
-    std::cout << "  --uplimit [n]          Limit the upload speed of files to n KB/s" << std::endl;
-    std::cout << "  --downlimit [n]        Limit the download speed of files to n KB/s" << std::endl;
+    std::cout << "  --uplimitKbPerSec [n]  Limit the upload speed of files to n KB/s" << std::endl;
+    std::cout << "  --downlimitKbPerSec [n]     Limit the download speed of files to n KB/s" << std::endl;
     std::cout << "  -h                     Sync hidden files,do not ignore them" << std::endl;
     std::cout << "  --version, -v          Display version and exit" << std::endl;
     std::cout << "  --logdebug             More verbose logging" << std::endl;
@@ -391,10 +391,10 @@ CmdOptions parseOptions(const QStringList &app_args)
             options.unsyncedfolders = it.next();
         } else if (option == QLatin1String("--max-sync-retries") && !it.peekNext().startsWith(QLatin1String("-"))) {
             options.restartTimes = it.next().toInt();
-        } else if (option == QLatin1String("--uplimit") && !it.peekNext().startsWith(QLatin1String("-"))) {
-            options.uplimit = it.next().toInt() * 1000;
-        } else if (option == QLatin1String("--downlimit") && !it.peekNext().startsWith(QLatin1String("-"))) {
-            options.downlimit = it.next().toInt() * 1000;
+        } else if (option == QLatin1String("--uplimitKbPerSec") && !it.peekNext().startsWith(QLatin1String("-"))) {
+            options.uplimitKbPerSec = it.next().toInt() * 1000;
+        } else if (option == QLatin1String("--downlimitKbPerSec") && !it.peekNext().startsWith(QLatin1String("-"))) {
+            options.downlimitKbPerSec = it.next().toInt() * 1000;
         } else if (option == QLatin1String("--logdebug")) {
             Logger::instance()->setLogFile(QStringLiteral("-"));
             Logger::instance()->setLogDebug(true);

src/common/checksums.cpp

@@ -88,7 +88,8 @@ namespace {
 
 QByteArray calcAdler32(QIODevice *device)
 {
-    const qint64 BUFSIZE(500 * 1024); // 500 KiB
+    const int bytesPerKibibyte = 1024;
+    const qint64 BUFSIZE(500 * bytesPerKibibyte); // 500 KiB
     if (device->size() == 0) {
         return QByteArray();
     }

src/gui/folderwatcher_win.cpp

@@ -181,7 +181,8 @@ void WatcherThread::run()
     // If this buffer fills up before we've extracted its data we will lose
     // change information. Therefore start big.
     size_t bufferSize = 4096 * 10;
-    const size_t maxBuffer = 64 * 1024;
+    const int bytesPerKibiByte = 1024;
+    const size_t maxBuffer = 64 * bytesPerKibiByte;
 
     while (true) {
         switch (watchChanges(bufferSize)) {

src/gui/socketapi/socketapi_p.h

@@ -34,7 +34,7 @@ class BloomFilter
     // Initialize with m=1024 bits and k=2 (high and low 16 bits of a qHash).
     // For a client navigating in less than 100 directories, this gives us a probability less than
     // (1-e^(-2*100/1024))^2 = 0.03147872136 false positives.
-    const static int NumBits = 1024;
+    const static int NumBytesPerKibibyte = 1024;
 
 public:
     BloomFilter()

src/gui/updater/updater.cpp

@@ -122,7 +122,8 @@ QString Updater::getSystemInfo()
     process.waitForFinished();
     QByteArray output = process.readAllStandardOutput();
     qCDebug(lcUpdater) << "Sys Info size: " << output.length();
-    if (output.length() > 1024)
+    const int bytesPerKibiByte = 1024;
+    if (output.length() > bytesPerKibiByte)
         output.clear(); // don't send too much.
 
     return QString::fromLocal8Bit(output.toBase64());

test/testutility.cpp

@@ -72,7 +72,8 @@ private slots:
         //NOTE: in order for the plural to work we would need to load the english translation
 
         quint64 sec = 1000;
-        quint64 hour = 3600 * sec;
+        const int secondsPerHour = 3600;
+        quint64 hour = secondsPerHour * sec;
 
         QDateTime current = QDateTime::currentDateTimeUtc();