Replace NULL with nullptr
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
#include "imobiledeviceconnection.h"
|
||||
|
||||
AfcDevice::AfcDevice(const QUrl &url, DeviceLister* lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time)
|
||||
: GPodDevice(url, lister, unique_id, manager, app, database_id, first_time), transfer_(NULL)
|
||||
: GPodDevice(url, lister, unique_id, manager, app, database_id, first_time), transfer_(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ bool AfcDevice::Init() {
|
||||
void AfcDevice::CopyFinished(bool success) {
|
||||
|
||||
transfer_->deleteLater();
|
||||
transfer_ = NULL;
|
||||
transfer_ = nullptr;
|
||||
|
||||
if (!success) {
|
||||
app_->AddError(tr("An error occurred copying the iTunes database from the device"));
|
||||
@@ -147,7 +147,7 @@ bool AfcDevice::CopyToStorage(const CopyJob &job) {
|
||||
void AfcDevice::FinishCopy(bool success) {
|
||||
|
||||
// Temporarily unset the GUID so libgpod doesn't lock the device for syncing
|
||||
itdb_device_set_sysinfo(db_->device, "FirewireGuid", NULL);
|
||||
itdb_device_set_sysinfo(db_->device, "FirewireGuid", nullptr);
|
||||
|
||||
GPodDevice::FinishCopy(success);
|
||||
|
||||
@@ -163,7 +163,7 @@ void AfcDevice::FinaliseDatabase() {
|
||||
|
||||
// Copy the files back to the iPod
|
||||
// No need to start another thread since we're already in the organiser thread
|
||||
AfcTransfer transfer(url_.host(), local_path_, NULL, shared_from_this());
|
||||
AfcTransfer transfer(url_.host(), local_path_, nullptr, shared_from_this());
|
||||
|
||||
itdb_start_sync(db_);
|
||||
bool success = transfer.CopyToDevice(connection_.get());
|
||||
|
||||
@@ -84,7 +84,7 @@ void CddaSongLoader::LoadSongs() {
|
||||
g_object_set(cdda_, "device", g_strdup(url_.path().toLocal8Bit().constData()), nullptr);
|
||||
}
|
||||
if (g_object_class_find_property (G_OBJECT_GET_CLASS (cdda_), "paranoia-mode")) {
|
||||
g_object_set (cdda_, "paranoia-mode", 0, NULL);
|
||||
g_object_set (cdda_, "paranoia-mode", 0, nullptr);
|
||||
}
|
||||
|
||||
// Change the element's state to ready and paused, to be able to query it
|
||||
@@ -123,8 +123,8 @@ void CddaSongLoader::LoadSongs() {
|
||||
gst_tag_register_musicbrainz_tags();
|
||||
|
||||
GstElement *pipeline = gst_pipeline_new("pipeline");
|
||||
GstElement *sink = gst_element_factory_make ("fakesink", NULL);
|
||||
gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, NULL);
|
||||
GstElement *sink = gst_element_factory_make ("fakesink", nullptr);
|
||||
gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, nullptr);
|
||||
gst_element_link (cdda_, sink);
|
||||
gst_element_set_state(pipeline, GST_STATE_READY);
|
||||
gst_element_set_state(pipeline, GST_STATE_PAUSED);
|
||||
|
||||
@@ -104,10 +104,10 @@ QVariant iMobileDeviceConnection::GetProperty(const QString &property, const QSt
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
plist_t node = NULL;
|
||||
plist_t node = nullptr;
|
||||
QByteArray domain_ascii = domain.toUtf8();
|
||||
const char *d = domain_ascii.isEmpty() ? NULL : domain_ascii.constData();
|
||||
//const char *d = domain.isEmpty() ? NULL : "com.apple.disk_usage";
|
||||
const char *d = domain_ascii.isEmpty() ? nullptr : domain_ascii.constData();
|
||||
//const char *d = domain.isEmpty() ? nullptr : "com.apple.disk_usage";
|
||||
lockdownd_get_value(lockdown, d, property.toUtf8().constData(), &node);
|
||||
lockdownd_client_free(lockdown);
|
||||
|
||||
@@ -141,14 +141,14 @@ QStringList iMobileDeviceConnection::ReadDirectory(const QString &path, QDir::Fi
|
||||
|
||||
if (!afc_) return QStringList();
|
||||
|
||||
char **list = NULL;
|
||||
char **list = nullptr;
|
||||
afc_error_t err = afc_read_directory(afc_, path.toUtf8().constData(), &list);
|
||||
if (err != AFC_E_SUCCESS || !list) {
|
||||
return QStringList();
|
||||
}
|
||||
|
||||
QStringList ret;
|
||||
for (char **p = list ; *p != NULL ; ++p) {
|
||||
for (char **p = list ; *p != nullptr ; ++p) {
|
||||
QString filename = QString::fromUtf8(*p);
|
||||
free(*p);
|
||||
|
||||
@@ -184,14 +184,14 @@ QString iMobileDeviceConnection::GetFileInfo(const QString &path, const QString
|
||||
if (!afc_) return QString();
|
||||
|
||||
QString ret;
|
||||
char **infolist = NULL;
|
||||
char **infolist = nullptr;
|
||||
afc_error_t err = afc_get_file_info(afc_, path.toUtf8().constData(), &infolist);
|
||||
if (err != AFC_E_SUCCESS || !infolist) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
QString last_key;
|
||||
for (char **p = infolist ; *p != NULL ; ++p) {
|
||||
for (char **p = infolist ; *p != nullptr ; ++p) {
|
||||
if (last_key.isNull()) {
|
||||
last_key = QString::fromUtf8(*p);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user