summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2015-09-11 14:50:10 -0400
committerGravatar Lioncash2015-09-11 14:59:49 -0400
commit60b3fc01a2377e51d5d8acb497c75f41daf14030 (patch)
treee6f64223500d6f579a924b1c53b6a20813abf1ee /src
parentMerge pull request #1141 from lioncash/hdr (diff)
downloadyuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.gz
yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.xz
yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.zip
General: Replace NULL and '0' usages with nullptr where applicable
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/debugger/callstack.h2
-rw-r--r--src/citra_qt/debugger/graphics.h2
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.h2
-rw-r--r--src/citra_qt/debugger/profiler.h2
-rw-r--r--src/citra_qt/debugger/ramview.h2
-rw-r--r--src/citra_qt/debugger/registers.h2
-rw-r--r--src/citra_qt/hotkeys.h2
-rw-r--r--src/core/arm/disassembler/arm_disasm.cpp4
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpdouble.cpp28
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpsingle.cpp28
-rw-r--r--src/core/hle/service/soc_u.cpp2
11 files changed, 38 insertions, 38 deletions
diff --git a/src/citra_qt/debugger/callstack.h b/src/citra_qt/debugger/callstack.h
index 1a9b6dc81..7aa83db1e 100644
--- a/src/citra_qt/debugger/callstack.h
+++ b/src/citra_qt/debugger/callstack.h
@@ -12,7 +12,7 @@ class CallstackWidget : public QDockWidget
12 Q_OBJECT 12 Q_OBJECT
13 13
14public: 14public:
15 CallstackWidget(QWidget* parent = 0); 15 CallstackWidget(QWidget* parent = nullptr);
16 16
17public slots: 17public slots:
18 void OnDebugModeEntered(); 18 void OnDebugModeEntered();
diff --git a/src/citra_qt/debugger/graphics.h b/src/citra_qt/debugger/graphics.h
index 8119b4c87..36b25b81d 100644
--- a/src/citra_qt/debugger/graphics.h
+++ b/src/citra_qt/debugger/graphics.h
@@ -37,7 +37,7 @@ class GPUCommandStreamWidget : public QDockWidget
37 Q_OBJECT 37 Q_OBJECT
38 38
39public: 39public:
40 GPUCommandStreamWidget(QWidget* parent = 0); 40 GPUCommandStreamWidget(QWidget* parent = nullptr);
41 41
42private: 42private:
43}; 43};
diff --git a/src/citra_qt/debugger/graphics_cmdlists.h b/src/citra_qt/debugger/graphics_cmdlists.h
index 4859b6ec8..586cc7239 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.h
+++ b/src/citra_qt/debugger/graphics_cmdlists.h
@@ -41,7 +41,7 @@ class GPUCommandListWidget : public QDockWidget
41 Q_OBJECT 41 Q_OBJECT
42 42
43public: 43public:
44 GPUCommandListWidget(QWidget* parent = 0); 44 GPUCommandListWidget(QWidget* parent = nullptr);
45 45
46public slots: 46public slots:
47 void OnToggleTracing(); 47 void OnToggleTracing();
diff --git a/src/citra_qt/debugger/profiler.h b/src/citra_qt/debugger/profiler.h
index 2199eaef1..85c27a43e 100644
--- a/src/citra_qt/debugger/profiler.h
+++ b/src/citra_qt/debugger/profiler.h
@@ -37,7 +37,7 @@ class ProfilerWidget : public QDockWidget
37 Q_OBJECT 37 Q_OBJECT
38 38
39public: 39public:
40 ProfilerWidget(QWidget* parent = 0); 40 ProfilerWidget(QWidget* parent = nullptr);
41 41
42private slots: 42private slots:
43 void setProfilingInfoUpdateEnabled(bool enable); 43 void setProfilingInfoUpdateEnabled(bool enable);
diff --git a/src/citra_qt/debugger/ramview.h b/src/citra_qt/debugger/ramview.h
index 18423036f..0ef74586b 100644
--- a/src/citra_qt/debugger/ramview.h
+++ b/src/citra_qt/debugger/ramview.h
@@ -9,7 +9,7 @@ class GRamView : public QHexEdit
9 Q_OBJECT 9 Q_OBJECT
10 10
11public: 11public:
12 GRamView(QWidget* parent = NULL); 12 GRamView(QWidget* parent = nullptr);
13 13
14public slots: 14public slots:
15 void OnCPUStepped(); 15 void OnCPUStepped();
diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h
index 09b830e80..927fde188 100644
--- a/src/citra_qt/debugger/registers.h
+++ b/src/citra_qt/debugger/registers.h
@@ -15,7 +15,7 @@ class RegistersWidget : public QDockWidget
15 Q_OBJECT 15 Q_OBJECT
16 16
17public: 17public:
18 RegistersWidget(QWidget* parent = NULL); 18 RegistersWidget(QWidget* parent = nullptr);
19 19
20public slots: 20public slots:
21 void OnDebugModeEntered(); 21 void OnDebugModeEntered();
diff --git a/src/citra_qt/hotkeys.h b/src/citra_qt/hotkeys.h
index 2317f8188..2fe635882 100644
--- a/src/citra_qt/hotkeys.h
+++ b/src/citra_qt/hotkeys.h
@@ -47,7 +47,7 @@ class GHotkeysDialog : public QDialog
47 Q_OBJECT 47 Q_OBJECT
48 48
49public: 49public:
50 GHotkeysDialog(QWidget* parent = NULL); 50 GHotkeysDialog(QWidget* parent = nullptr);
51 51
52private: 52private:
53 Ui::hotkeys ui; 53 Ui::hotkeys ui;
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
index 77af10b54..76408e9fa 100644
--- a/src/core/arm/disassembler/arm_disasm.cpp
+++ b/src/core/arm/disassembler/arm_disasm.cpp
@@ -206,7 +206,7 @@ static const char *opcode_names[] = {
206 "swi", 206 "swi",
207 "tst", 207 "tst",
208 208
209 NULL 209 nullptr
210}; 210};
211 211
212// Indexed by the shift type (bits 6-5) 212// Indexed by the shift type (bits 6-5)
@@ -399,7 +399,7 @@ std::string ARM_Disasm::Disassemble(u32 addr, u32 insn)
399 default: 399 default:
400 return "Error"; 400 return "Error";
401 } 401 }
402 return NULL; 402 return nullptr;
403} 403}
404 404
405std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn) 405std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn)
diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
index 47a9fe804..857e6ce45 100644
--- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
@@ -299,7 +299,7 @@ static u32 vfp_double_fsqrt(ARMul_State* state, int dd, int unused, int dm, u32
299 vdp = &vdd; 299 vdp = &vdd;
300 300
301 if (tm & VFP_NAN) 301 if (tm & VFP_NAN)
302 ret = vfp_propagate_nan(vdp, &vdm, NULL, fpscr); 302 ret = vfp_propagate_nan(vdp, &vdm, nullptr, fpscr);
303 else if (vdm.sign == 0) { 303 else if (vdm.sign == 0) {
304sqrt_copy: 304sqrt_copy:
305 vdp = &vdm; 305 vdp = &vdm;
@@ -700,26 +700,26 @@ static struct op fops_ext[] = {
700 { vfp_double_fabs, 0 }, //0x00000001 - FEXT_FABS 700 { vfp_double_fabs, 0 }, //0x00000001 - FEXT_FABS
701 { vfp_double_fneg, 0 }, //0x00000002 - FEXT_FNEG 701 { vfp_double_fneg, 0 }, //0x00000002 - FEXT_FNEG
702 { vfp_double_fsqrt, 0 }, //0x00000003 - FEXT_FSQRT 702 { vfp_double_fsqrt, 0 }, //0x00000003 - FEXT_FSQRT
703 { NULL, 0 }, 703 { nullptr, 0 },
704 { NULL, 0 }, 704 { nullptr, 0 },
705 { NULL, 0 }, 705 { nullptr, 0 },
706 { NULL, 0 }, 706 { nullptr, 0 },
707 { vfp_double_fcmp, OP_SCALAR }, //0x00000008 - FEXT_FCMP 707 { vfp_double_fcmp, OP_SCALAR }, //0x00000008 - FEXT_FCMP
708 { vfp_double_fcmpe, OP_SCALAR }, //0x00000009 - FEXT_FCMPE 708 { vfp_double_fcmpe, OP_SCALAR }, //0x00000009 - FEXT_FCMPE
709 { vfp_double_fcmpz, OP_SCALAR }, //0x0000000A - FEXT_FCMPZ 709 { vfp_double_fcmpz, OP_SCALAR }, //0x0000000A - FEXT_FCMPZ
710 { vfp_double_fcmpez, OP_SCALAR }, //0x0000000B - FEXT_FCMPEZ 710 { vfp_double_fcmpez, OP_SCALAR }, //0x0000000B - FEXT_FCMPEZ
711 { NULL, 0 }, 711 { nullptr, 0 },
712 { NULL, 0 }, 712 { nullptr, 0 },
713 { NULL, 0 }, 713 { nullptr, 0 },
714 { vfp_double_fcvts, OP_SCALAR|OP_DD }, //0x0000000F - FEXT_FCVT 714 { vfp_double_fcvts, OP_SCALAR|OP_DD }, //0x0000000F - FEXT_FCVT
715 { vfp_double_fuito, OP_SCALAR|OP_SM }, //0x00000010 - FEXT_FUITO 715 { vfp_double_fuito, OP_SCALAR|OP_SM }, //0x00000010 - FEXT_FUITO
716 { vfp_double_fsito, OP_SCALAR|OP_SM }, //0x00000011 - FEXT_FSITO 716 { vfp_double_fsito, OP_SCALAR|OP_SM }, //0x00000011 - FEXT_FSITO
717 { NULL, 0 }, 717 { nullptr, 0 },
718 { NULL, 0 }, 718 { nullptr, 0 },
719 { NULL, 0 }, 719 { nullptr, 0 },
720 { NULL, 0 }, 720 { nullptr, 0 },
721 { NULL, 0 }, 721 { nullptr, 0 },
722 { NULL, 0 }, 722 { nullptr, 0 },
723 { vfp_double_ftoui, OP_SCALAR|OP_SD }, //0x00000018 - FEXT_FTOUI 723 { vfp_double_ftoui, OP_SCALAR|OP_SD }, //0x00000018 - FEXT_FTOUI
724 { vfp_double_ftouiz, OP_SCALAR|OP_SD }, //0x00000019 - FEXT_FTOUIZ 724 { vfp_double_ftouiz, OP_SCALAR|OP_SD }, //0x00000019 - FEXT_FTOUIZ
725 { vfp_double_ftosi, OP_SCALAR|OP_SD }, //0x0000001A - FEXT_FTOSI 725 { vfp_double_ftosi, OP_SCALAR|OP_SD }, //0x0000001A - FEXT_FTOSI
diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
index 0fb3c3bf1..e47ad2760 100644
--- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
@@ -341,7 +341,7 @@ static u32 vfp_single_fsqrt(ARMul_State* state, int sd, int unused, s32 m, u32 f
341 vsp = &vsd; 341 vsp = &vsd;
342 342
343 if (tm & VFP_NAN) 343 if (tm & VFP_NAN)
344 ret = vfp_propagate_nan(vsp, &vsm, NULL, fpscr); 344 ret = vfp_propagate_nan(vsp, &vsm, nullptr, fpscr);
345 else if (vsm.sign == 0) { 345 else if (vsm.sign == 0) {
346sqrt_copy: 346sqrt_copy:
347 vsp = &vsm; 347 vsp = &vsm;
@@ -725,26 +725,26 @@ static struct op fops_ext[] = {
725 { vfp_single_fabs, 0 }, //0x00000001 - FEXT_FABS 725 { vfp_single_fabs, 0 }, //0x00000001 - FEXT_FABS
726 { vfp_single_fneg, 0 }, //0x00000002 - FEXT_FNEG 726 { vfp_single_fneg, 0 }, //0x00000002 - FEXT_FNEG
727 { vfp_single_fsqrt, 0 }, //0x00000003 - FEXT_FSQRT 727 { vfp_single_fsqrt, 0 }, //0x00000003 - FEXT_FSQRT
728 { NULL, 0 }, 728 { nullptr, 0 },
729 { NULL, 0 }, 729 { nullptr, 0 },
730 { NULL, 0 }, 730 { nullptr, 0 },
731 { NULL, 0 }, 731 { nullptr, 0 },
732 { vfp_single_fcmp, OP_SCALAR }, //0x00000008 - FEXT_FCMP 732 { vfp_single_fcmp, OP_SCALAR }, //0x00000008 - FEXT_FCMP
733 { vfp_single_fcmpe, OP_SCALAR }, //0x00000009 - FEXT_FCMPE 733 { vfp_single_fcmpe, OP_SCALAR }, //0x00000009 - FEXT_FCMPE
734 { vfp_single_fcmpz, OP_SCALAR }, //0x0000000A - FEXT_FCMPZ 734 { vfp_single_fcmpz, OP_SCALAR }, //0x0000000A - FEXT_FCMPZ
735 { vfp_single_fcmpez, OP_SCALAR }, //0x0000000B - FEXT_FCMPEZ 735 { vfp_single_fcmpez, OP_SCALAR }, //0x0000000B - FEXT_FCMPEZ
736 { NULL, 0 }, 736 { nullptr, 0 },
737 { NULL, 0 }, 737 { nullptr, 0 },
738 { NULL, 0 }, 738 { nullptr, 0 },
739 { vfp_single_fcvtd, OP_SCALAR|OP_DD }, //0x0000000F - FEXT_FCVT 739 { vfp_single_fcvtd, OP_SCALAR|OP_DD }, //0x0000000F - FEXT_FCVT
740 { vfp_single_fuito, OP_SCALAR }, //0x00000010 - FEXT_FUITO 740 { vfp_single_fuito, OP_SCALAR }, //0x00000010 - FEXT_FUITO
741 { vfp_single_fsito, OP_SCALAR }, //0x00000011 - FEXT_FSITO 741 { vfp_single_fsito, OP_SCALAR }, //0x00000011 - FEXT_FSITO
742 { NULL, 0 }, 742 { nullptr, 0 },
743 { NULL, 0 }, 743 { nullptr, 0 },
744 { NULL, 0 }, 744 { nullptr, 0 },
745 { NULL, 0 }, 745 { nullptr, 0 },
746 { NULL, 0 }, 746 { nullptr, 0 },
747 { NULL, 0 }, 747 { nullptr, 0 },
748 { vfp_single_ftoui, OP_SCALAR }, //0x00000018 - FEXT_FTOUI 748 { vfp_single_ftoui, OP_SCALAR }, //0x00000018 - FEXT_FTOUI
749 { vfp_single_ftouiz, OP_SCALAR }, //0x00000019 - FEXT_FTOUIZ 749 { vfp_single_ftouiz, OP_SCALAR }, //0x00000019 - FEXT_FTOUIZ
750 { vfp_single_ftosi, OP_SCALAR }, //0x0000001A - FEXT_FTOSI 750 { vfp_single_ftosi, OP_SCALAR }, //0x0000001A - FEXT_FTOSI
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp
index d768a3fc7..633b66fe2 100644
--- a/src/core/hle/service/soc_u.cpp
+++ b/src/core/hle/service/soc_u.cpp
@@ -485,7 +485,7 @@ static void GetHostId(Service::Interface* self) {
485 addrinfo* res; 485 addrinfo* res;
486 486
487 hints.ai_family = AF_INET; 487 hints.ai_family = AF_INET;
488 getaddrinfo(name, NULL, &hints, &res); 488 getaddrinfo(name, nullptr, &hints, &res);
489 sockaddr_in* sock_addr = reinterpret_cast<sockaddr_in*>(res->ai_addr); 489 sockaddr_in* sock_addr = reinterpret_cast<sockaddr_in*>(res->ai_addr);
490 in_addr* addr = &sock_addr->sin_addr; 490 in_addr* addr = &sock_addr->sin_addr;
491 491