diff options
| author | 2015-09-11 23:04:19 -0400 | |
|---|---|---|
| committer | 2015-09-11 23:11:01 -0400 | |
| commit | 07bfe0abbb40d7131bbf12beb9eb829dbd8fb53b (patch) | |
| tree | 7a17a8078e8b65765d369b4cfa2c34120aec11d6 /src | |
| parent | Merge pull request #1151 from lioncash/return (diff) | |
| download | yuzu-07bfe0abbb40d7131bbf12beb9eb829dbd8fb53b.tar.gz yuzu-07bfe0abbb40d7131bbf12beb9eb829dbd8fb53b.tar.xz yuzu-07bfe0abbb40d7131bbf12beb9eb829dbd8fb53b.zip | |
general: Replace 0 literals with nullptr where applicable
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/debugger/profiler.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/profiler.h | 2 | ||||
| -rw-r--r-- | src/common/chunk_file.h | 4 | ||||
| -rw-r--r-- | src/common/memory_util.cpp | 8 | ||||
| -rw-r--r-- | src/core/core_timing.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index 043f20659..4f6ba0e1f 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp | |||
| @@ -150,7 +150,7 @@ void ProfilerWidget::setProfilingInfoUpdateEnabled(bool enable) | |||
| 150 | 150 | ||
| 151 | class MicroProfileWidget : public QWidget { | 151 | class MicroProfileWidget : public QWidget { |
| 152 | public: | 152 | public: |
| 153 | MicroProfileWidget(QWidget* parent = 0); | 153 | MicroProfileWidget(QWidget* parent = nullptr); |
| 154 | 154 | ||
| 155 | protected: | 155 | protected: |
| 156 | void paintEvent(QPaintEvent* ev) override; | 156 | void paintEvent(QPaintEvent* ev) override; |
diff --git a/src/citra_qt/debugger/profiler.h b/src/citra_qt/debugger/profiler.h index 85c27a43e..036054740 100644 --- a/src/citra_qt/debugger/profiler.h +++ b/src/citra_qt/debugger/profiler.h | |||
| @@ -53,7 +53,7 @@ class MicroProfileDialog : public QWidget { | |||
| 53 | Q_OBJECT | 53 | Q_OBJECT |
| 54 | 54 | ||
| 55 | public: | 55 | public: |
| 56 | MicroProfileDialog(QWidget* parent = 0); | 56 | MicroProfileDialog(QWidget* parent = nullptr); |
| 57 | 57 | ||
| 58 | /// Returns a QAction that can be used to toggle visibility of this dialog. | 58 | /// Returns a QAction that can be used to toggle visibility of this dialog. |
| 59 | QAction* toggleViewAction(); | 59 | QAction* toggleViewAction(); |
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 8be0b1109..1e1bcff31 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h | |||
| @@ -575,10 +575,10 @@ public: | |||
| 575 | } | 575 | } |
| 576 | 576 | ||
| 577 | template<class T, LinkedListItem<T>* (*TNew)(), void (*TFree)(LinkedListItem<T>*), void (*TDo)(PointerWrap&, T*)> | 577 | template<class T, LinkedListItem<T>* (*TNew)(), void (*TFree)(LinkedListItem<T>*), void (*TDo)(PointerWrap&, T*)> |
| 578 | void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end=0) | 578 | void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end = nullptr) |
| 579 | { | 579 | { |
| 580 | LinkedListItem<T>* list_cur = list_start; | 580 | LinkedListItem<T>* list_cur = list_start; |
| 581 | LinkedListItem<T>* prev = 0; | 581 | LinkedListItem<T>* prev = nullptr; |
| 582 | 582 | ||
| 583 | while (true) | 583 | while (true) |
| 584 | { | 584 | { |
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 5ef784224..b299b0f0f 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | void* AllocateExecutableMemory(size_t size, bool low) | 28 | void* AllocateExecutableMemory(size_t size, bool low) |
| 29 | { | 29 | { |
| 30 | #if defined(_WIN32) | 30 | #if defined(_WIN32) |
| 31 | void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); | 31 | void* ptr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); |
| 32 | #else | 32 | #else |
| 33 | static char *map_hint = 0; | 33 | static char* map_hint = nullptr; |
| 34 | #if defined(ARCHITECTURE_X64) && !defined(MAP_32BIT) | 34 | #if defined(ARCHITECTURE_X64) && !defined(MAP_32BIT) |
| 35 | // This OS has no flag to enforce allocation below the 4 GB boundary, | 35 | // This OS has no flag to enforce allocation below the 4 GB boundary, |
| 36 | // but if we hint that we want a low address it is very likely we will | 36 | // but if we hint that we want a low address it is very likely we will |
| @@ -85,9 +85,9 @@ void* AllocateExecutableMemory(size_t size, bool low) | |||
| 85 | void* AllocateMemoryPages(size_t size) | 85 | void* AllocateMemoryPages(size_t size) |
| 86 | { | 86 | { |
| 87 | #ifdef _WIN32 | 87 | #ifdef _WIN32 |
| 88 | void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE); | 88 | void* ptr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE); |
| 89 | #else | 89 | #else |
| 90 | void* ptr = mmap(0, size, PROT_READ | PROT_WRITE, | 90 | void* ptr = mmap(nullptr, size, PROT_READ | PROT_WRITE, |
| 91 | MAP_ANON | MAP_PRIVATE, -1, 0); | 91 | MAP_ANON | MAP_PRIVATE, -1, 0); |
| 92 | 92 | ||
| 93 | if (ptr == MAP_FAILED) | 93 | if (ptr == MAP_FAILED) |
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 20f2da0fe..56615502c 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -207,7 +207,7 @@ void ScheduleEvent_Threadsafe(s64 cycles_into_future, int event_type, u64 userda | |||
| 207 | Event* new_event = GetNewTsEvent(); | 207 | Event* new_event = GetNewTsEvent(); |
| 208 | new_event->time = GetTicks() + cycles_into_future; | 208 | new_event->time = GetTicks() + cycles_into_future; |
| 209 | new_event->type = event_type; | 209 | new_event->type = event_type; |
| 210 | new_event->next = 0; | 210 | new_event->next = nullptr; |
| 211 | new_event->userdata = userdata; | 211 | new_event->userdata = userdata; |
| 212 | if (!ts_first) | 212 | if (!ts_first) |
| 213 | ts_first = new_event; | 213 | ts_first = new_event; |