dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 0 with nullptr

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-14 17:02:47 +02:00
parent ef34dce4dc
commit 2fbdb29ebc
19 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/application.cpp
View File

@@ -278,7 +278,7 @@ void Application::Exit() {
void Application::ExitReceived() {
QObject *obj = static_cast<QObject*>(sender());
disconnect(obj, 0, this, 0);
disconnect(obj, nullptr, this, nullptr);
qLog(Debug) << obj << "successfully exited.";

56
src/core/commandlineoptions.cpp
View File

@@ -118,34 +118,34 @@ void CommandlineOptions::RemoveArg(const QString &starts_with, int count) {
bool CommandlineOptions::Parse() {
static const struct option kOptions[] = {
{"help", no_argument, 0, 'h'},
{"play", no_argument, 0, 'p'},
{"play-pause", no_argument, 0, 't'},
{"pause", no_argument, 0, 'u'},
{"stop", no_argument, 0, 's'},
{"stop-after-current", no_argument, 0, 'q'},
{"previous", no_argument, 0, 'r'},
{"next", no_argument, 0, 'f'},
{"volume", required_argument, 0, 'v'},
{"volume-up", no_argument, 0, VolumeUp},
{"volume-down", no_argument, 0, VolumeDown},
{"volume-increase-by", required_argument, 0, VolumeIncreaseBy},
{"volume-decrease-by", required_argument, 0, VolumeDecreaseBy},
{"seek-to", required_argument, 0, SeekTo},
{"seek-by", required_argument, 0, SeekBy},
{"restart-or-previous", no_argument, 0, RestartOrPrevious},
{"create", required_argument, 0, 'c'},
{"append", no_argument, 0, 'a'},
{"load", no_argument, 0, 'l'},
{"play-track", required_argument, 0, 'k'},
{"show-osd", no_argument, 0, 'o'},
{"toggle-pretty-osd", no_argument, 0, 'y'},
{"language", required_argument, 0, 'g'},
{"quiet", no_argument, 0, Quiet},
{"verbose", no_argument, 0, Verbose},
{"log-levels", required_argument, 0, LogLevels},
{"version", no_argument, 0, Version},
{0, 0, 0, 0}};
{"help", no_argument, nullptr, 'h'},
{"play", no_argument, nullptr, 'p'},
{"play-pause", no_argument, nullptr, 't'},
{"pause", no_argument, nullptr, 'u'},
{"stop", no_argument, nullptr, 's'},
{"stop-after-current", no_argument, nullptr, 'q'},
{"previous", no_argument, nullptr, 'r'},
{"next", no_argument, nullptr, 'f'},
{"volume", required_argument, nullptr, 'v'},
{"volume-up", no_argument, nullptr, VolumeUp},
{"volume-down", no_argument, nullptr, VolumeDown},
{"volume-increase-by", required_argument, nullptr, VolumeIncreaseBy},
{"volume-decrease-by", required_argument, nullptr, VolumeDecreaseBy},
{"seek-to", required_argument, nullptr, SeekTo},
{"seek-by", required_argument, nullptr, SeekBy},
{"restart-or-previous", no_argument, nullptr, RestartOrPrevious},
{"create", required_argument, nullptr, 'c'},
{"append", no_argument, nullptr, 'a'},
{"load", no_argument, nullptr, 'l'},
{"play-track", required_argument, nullptr, 'k'},
{"show-osd", no_argument, nullptr, 'o'},
{"toggle-pretty-osd", no_argument, nullptr, 'y'},
{"language", required_argument, nullptr, 'g'},
{"quiet", no_argument, nullptr, Quiet},
{"verbose", no_argument, nullptr, Verbose},
{"log-levels", required_argument, nullptr, LogLevels},
{"version", no_argument, nullptr, Version},
{nullptr, 0, nullptr, 0}};
// Parse the arguments
bool ok = false;

2
src/core/screensaver.cpp
View File

@@ -42,7 +42,7 @@ const char *Screensaver::kKdeService = "org.kde.ScreenSaver";
const char *Screensaver::kKdePath = "/ScreenSaver/";
const char *Screensaver::kKdeInterface = "org.freedesktop.ScreenSaver";
Screensaver *Screensaver::screensaver_ = 0;
Screensaver *Screensaver::screensaver_ = nullptr;
Screensaver *Screensaver::GetScreensaver() {
if (!screensaver_) {

2
src/core/utilities.cpp
View File

@@ -657,7 +657,7 @@ const char *EnumToString(const QMetaObject &meta, const char *name, int value) {
if (index == -1) return "[UnknownEnum]";
QMetaEnum metaenum = meta.enumerator(index);
const char *result = metaenum.valueToKey(value);
if (result == 0) return "[UnknownEnumValue]";
if (!result) return "[UnknownEnumValue]";
return result;
}