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

Replace NULL with nullptr

Browse Source
This commit is contained in:
Jonas Kvinge
2019-02-20 21:26:14 +01:00
parent bc37d00a81
commit f600274592
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ext/libstrawberry-common/core/workerpool.h
View File

@@ -101,7 +101,7 @@ protected:
private: private:
struct Worker { struct Worker {
Worker() : local_server_(NULL), local_socket_(NULL), process_(NULL), handler_(NULL) {} Worker() : local_server_(nullptr), local_socket_(nullptr), process_(nullptr), handler_(nullptr) {}
QLocalServer *local_server_; QLocalServer *local_server_;
QLocalSocket *local_socket_; QLocalSocket *local_socket_;
@@ -120,14 +120,14 @@ private:
return &(*it); return &(*it);
} }
} }
return NULL; return nullptr;
} }
template <typename T> template <typename T>
void DeleteQObjectPointerLater(T **p) { void DeleteQObjectPointerLater(T **p) {
if (*p) { if (*p) {
(*p)->deleteLater(); (*p)->deleteLater();
*p = NULL; *p = nullptr;
} }
} }
@@ -135,7 +135,7 @@ private:
// and sets the request's ID to the ID of the reply. Can be called from any thread // and sets the request's ID to the ID of the reply. Can be called from any thread
ReplyType *NewReply(MessageType *message); ReplyType *NewReply(MessageType *message);
// Returns the next handler, or NULL if there isn't one. Must be called from my thread. // Returns the next handler, or nullptr if there isn't one. Must be called from my thread.
HandlerType *NextHandler() const; HandlerType *NextHandler() const;
private: private:
@@ -300,7 +300,7 @@ void WorkerPool<HandlerType>::NewConnection() {
// We only ever accept one connection per worker, so destroy the server now. // We only ever accept one connection per worker, so destroy the server now.
worker->local_socket_->setParent(this); worker->local_socket_->setParent(this);
worker->local_server_->deleteLater(); worker->local_server_->deleteLater();
worker->local_server_ = NULL; worker->local_server_ = nullptr;
// Create the handler. // Create the handler.
worker->handler_ = new HandlerType(worker->local_socket_, this); worker->handler_ = new HandlerType(worker->local_socket_, this);
@@ -329,7 +329,7 @@ void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
default: default:
// On any other error we just restart the process. // On any other error we just restart the process.
qLog(Debug) << "Worker" << worker << "failed with error" << error << "- restarting"; qLog(Debug) << "Worker" << worker << "failed with error" << error << "- restarting";
StartOneWorker(worker); StartOneWorker(worker);
break; break;
} }
@@ -386,14 +386,13 @@ HandlerType *WorkerPool<HandlerType>::NextHandler() const {
for (int i = 0; i < workers_.count(); ++i) { for (int i = 0; i < workers_.count(); ++i) {
const int worker_index = (next_worker_ + i) % workers_.count(); const int worker_index = (next_worker_ + i) % workers_.count();
if (workers_[worker_index].handler_ && if (workers_[worker_index].handler_ && !workers_[worker_index].handler_->is_device_closed()) {
!workers_[worker_index].handler_->is_device_closed()) {
next_worker_ = (worker_index + 1) % workers_.count(); next_worker_ = (worker_index + 1) % workers_.count();
return workers_[worker_index].handler_; return workers_[worker_index].handler_;
} }
} }
return NULL; return nullptr;
} }
#endif // WORKERPOOL_H #endif // WORKERPOOL_H

2
ext/strawberry-tagreader/tagreaderworker.h
View File

@@ -31,7 +31,7 @@
class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> { class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
public: public:
TagReaderWorker(QIODevice *socket, QObject *parent = NULL); TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
protected: protected:
void MessageArrived(const pb::tagreader::Message &message); void MessageArrived(const pb::tagreader::Message &message);