Browse Source

Sort include headers

Also add anonymous namespace.
adaptive-webui-19844
Chocobo1 7 years ago
parent
commit
643a209812
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 69
      src/base/utils/misc.cpp
  2. 12
      src/base/utils/misc.h

69
src/base/utils/misc.cpp

@ -28,34 +28,18 @@ @@ -28,34 +28,18 @@
* Contact : chris@qbittorrent.org
*/
#include <QUrl>
#include <QDir>
#include <QFileInfo>
#include <QDateTime>
#include <QByteArray>
#include <QDebug>
#include <QProcess>
#include <QRegularExpression>
#include <QSysInfo>
#include "misc.h"
#include <boost/version.hpp>
#include <libtorrent/version.hpp>
#ifdef DISABLE_GUI
#include <QCoreApplication>
#else
#include <QApplication>
#include <QDesktopWidget>
#include <QStyle>
#endif
#ifdef Q_OS_WIN
#include <windows.h>
#include <powrprof.h>
#include <Shlobj.h>
const int UNLEN = 256;
#else
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
#endif
#ifdef Q_OS_MAC
@ -63,33 +47,47 @@ const int UNLEN = 256; @@ -63,33 +47,47 @@ const int UNLEN = 256;
#include <Carbon/Carbon.h>
#endif
#ifndef DISABLE_GUI
#include <QByteArray>
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QFileInfo>
#include <QProcess>
#include <QRegularExpression>
#include <QSysInfo>
#include <QUrl>
#ifdef DISABLE_GUI
#include <QCoreApplication>
#else
#include <QApplication>
#include <QDesktopServices>
#include <QDesktopWidget>
#include <QProcess>
#include <QStyle>
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) && defined(QT_DBUS_LIB)
#include <QDBusInterface>
#include <QDBusMessage>
#endif
#endif // DISABLE_GUI
#ifndef DISABLE_GUI
#include <QDesktopServices>
#include <QProcess>
#endif
#include "base/utils/string.h"
#include "base/unicodestrings.h"
#include "base/logger.h"
#include "misc.h"
#include "fs.h"
static struct { const char *source; const char *comment; } units[] = {
QT_TRANSLATE_NOOP3("misc", "B", "bytes"),
QT_TRANSLATE_NOOP3("misc", "KiB", "kibibytes (1024 bytes)"),
QT_TRANSLATE_NOOP3("misc", "MiB", "mebibytes (1024 kibibytes)"),
QT_TRANSLATE_NOOP3("misc", "GiB", "gibibytes (1024 mibibytes)"),
QT_TRANSLATE_NOOP3("misc", "TiB", "tebibytes (1024 gibibytes)"),
QT_TRANSLATE_NOOP3("misc", "PiB", "pebibytes (1024 tebibytes)"),
QT_TRANSLATE_NOOP3("misc", "EiB", "exbibytes (1024 pebibytes)")
};
namespace
{
const struct { const char *source; const char *comment; } units[] = {
QT_TRANSLATE_NOOP3("misc", "B", "bytes"),
QT_TRANSLATE_NOOP3("misc", "KiB", "kibibytes (1024 bytes)"),
QT_TRANSLATE_NOOP3("misc", "MiB", "mebibytes (1024 kibibytes)"),
QT_TRANSLATE_NOOP3("misc", "GiB", "gibibytes (1024 mibibytes)"),
QT_TRANSLATE_NOOP3("misc", "TiB", "tebibytes (1024 gibibytes)"),
QT_TRANSLATE_NOOP3("misc", "PiB", "pebibytes (1024 tebibytes)"),
QT_TRANSLATE_NOOP3("misc", "EiB", "exbibytes (1024 pebibytes)")
};
}
void Utils::Misc::shutdownComputer(const ShutdownDialogAction &action)
{
@ -474,6 +472,7 @@ QString Utils::Misc::getUserIDString() @@ -474,6 +472,7 @@ QString Utils::Misc::getUserIDString()
{
QString uid = "0";
#ifdef Q_OS_WIN
const int UNLEN = 256;
WCHAR buffer[UNLEN + 1] = {0};
DWORD buffer_len = sizeof(buffer) / sizeof(*buffer);
if (GetUserNameW(buffer, &buffer_len))

12
src/base/utils/misc.h

@ -31,15 +31,17 @@ @@ -31,15 +31,17 @@
#ifndef UTILS_MISC_H
#define UTILS_MISC_H
#include <ctime>
#include <vector>
#include <QDir>
#include <QFile>
#include <QPoint>
#include <QSize>
#include <QString>
#include <QStringList>
#include <ctime>
#include <QPoint>
#include <QFile>
#include <QDir>
#include <QUrl>
#include <QSize>
#include "base/types.h"
/* Miscellaneous functions that can be useful */

Loading…
Cancel
Save