C++11のauto, nullptrを導入。

[tpi/lychee.git] / src / lychee / dlg_process.cpp

diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp
index bc81267..1ee6204 100644 (file)
--- a/src/lychee/dlg_process.cpp
+++ b/src/lychee/dlg_process.cpp
@@ -25,7 +25,7 @@
 #include "frm_main.h"\r
 #include "functions.h"\r
 \r
-ProcessDialog * g_procDlg = NULL;\r
+ProcessDialog * g_procDlg = nullptr;\r
 \r
 //******************************************************************************\r
 // ProcessDialog\r
@@ -59,14 +59,14 @@ ProcessDialog::~ProcessDialog()
        }\r
 \r
 #ifdef __WINDOWS__\r
-       if (this->tlTaskbar != NULL)\r
+       if (this->tlTaskbar != nullptr)\r
        {\r
                this->tlTaskbar->SetProgressState(this->hTBWnd, TBPF_NOPROGRESS);\r
                this->tlTaskbar->Release();\r
        }\r
 #endif\r
        ((MainFrame *) this->hParent)->gFrame->Show(false);\r
-       g_procDlg = NULL;\r
+       g_procDlg = nullptr;\r
 }\r
 \r
 //******************************************************************************\r
@@ -126,8 +126,8 @@ void ProcessDialog::OnInit(wxInitDialogEvent &)
        // タスクバー。\r
        this->hTBWnd = frm_main->GetHandle();\r
 \r
-       ::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (void **) & this->tlTaskbar);\r
-       if (this->tlTaskbar != NULL)\r
+       ::CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (void **) & this->tlTaskbar);\r
+       if (this->tlTaskbar != nullptr)\r
        {\r
                this->tlTaskbar->HrInit();\r
        }\r
@@ -151,7 +151,7 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
        }\r
 \r
        TPI_PROCESSINFO * piInfo = (TPI_PROCESSINFO *) _pStructure;\r
-       if (piInfo == NULL)\r
+       if (piInfo == nullptr)\r
        {\r
                return TPI_CALLBACK_CONTINUE;\r
        }\r
@@ -199,7 +199,7 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
                                ((MainFrame *) this->hParent)->gFrame->SetValue(s_nProcess);\r
                        }\r
 #ifdef __WINDOWS__\r
-                       if (this->tlTaskbar != NULL)\r
+                       if (this->tlTaskbar != nullptr)\r
                        {\r
                                this->tlTaskbar->SetProgressValue(this->hTBWnd, s_nProcess, s_nFileCount);\r
                        }\r
@@ -242,7 +242,7 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
                        }\r
                        ((MainFrame *) this->hParent)->gFrame->SetValue(piInfo->nProcessedSize);\r
 #ifdef __WINDOWS__\r
-                       if (this->tlTaskbar != NULL)\r
+                       if (this->tlTaskbar != nullptr)\r
                        {\r
                                this->tlTaskbar->SetProgressValue(this->hTBWnd, piInfo->nProcessedSize, s_nFileCount);\r
                        }\r
@@ -254,7 +254,7 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
        case TPI_MESSAGE_ASK:\r
        {\r
 #ifdef __WINDOWS__\r
-               if (this->tlTaskbar != NULL)\r
+               if (this->tlTaskbar != nullptr)\r
                {\r
                        this->tlTaskbar->SetProgressState(this->hTBWnd, TBPF_PAUSED);\r
                }\r
@@ -343,7 +343,7 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
                        return TPI_CALLBACK_UNSUPPORTED;\r
                }\r
 #ifdef __WINDOWS__\r
-               if (this->tlTaskbar != NULL)\r
+               if (this->tlTaskbar != nullptr)\r
                {\r
                        this->tlTaskbar->SetProgressState(this->hTBWnd, TBPF_NORMAL);\r
                }\r
@@ -445,5 +445,5 @@ void OverwriteDialog::OnBtnBrowse(wxCommandEvent&)
 \r
 int __stdcall TPICallbackProc(unsigned int _uMsg, void * _pStructure)\r
 {\r
-       return g_procDlg == NULL ? TPI_CALLBACK_CONTINUE : g_procDlg->CallbackProc(_uMsg, _pStructure);\r
+       return g_procDlg == nullptr ? TPI_CALLBACK_CONTINUE : g_procDlg->CallbackProc(_uMsg, _pStructure);\r
 }\r