diff options
| author | Christopher Bergqvist <chris@digitalpoetry.se> | 2020-06-11 18:02:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 18:02:28 +0200 |
| commit | 0a2c565aa98fa7bc9623a753370e565fc5ed1e63 (patch) | |
| tree | f89c65090af0da4ef3c1915ba797b9a2cda75f9c /src/Main/Forms | |
| parent | 8250e83e6188dffd26d6310e36af3132d93412dd (diff) | |
| download | VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.tar.gz VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.zip | |
Switch from auto_ptr to unique_ptr (#638)
Diffstat (limited to 'src/Main/Forms')
| -rw-r--r-- | src/Main/Forms/MainFrame.cpp | 2 | ||||
| -rw-r--r-- | src/Main/Forms/MainFrame.h | 4 | ||||
| -rw-r--r-- | src/Main/Forms/PreferencesDialog.h | 2 | ||||
| -rw-r--r-- | src/Main/Forms/ProgressWizardPage.h | 2 | ||||
| -rw-r--r-- | src/Main/Forms/VolumeCreationProgressWizardPage.h | 2 | ||||
| -rw-r--r-- | src/Main/Forms/VolumeCreationWizard.h | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index 25853193..417c2a63 100644 --- a/src/Main/Forms/MainFrame.cpp +++ b/src/Main/Forms/MainFrame.cpp @@ -509,7 +509,7 @@ namespace VeraCrypt wxMenu *CreatePopupMenu () { - auto_ptr <wxMenu> popup (new wxMenu); + unique_ptr <wxMenu> popup (new wxMenu); Gui->AppendToMenu (*popup, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"], this, wxCommandEventHandler (TaskBarIcon::OnShowHideMenuItemSelected)); diff --git a/src/Main/Forms/MainFrame.h b/src/Main/Forms/MainFrame.h index 414ecca3..9089ce72 100644 --- a/src/Main/Forms/MainFrame.h +++ b/src/Main/Forms/MainFrame.h @@ -214,8 +214,8 @@ namespace VeraCrypt map <int, FavoriteVolume> FavoriteVolumesMenuMap; bool ListItemRightClickEventPending; VolumeInfoList MountedVolumes; - auto_ptr <wxTaskBarIcon> mTaskBarIcon; - auto_ptr <wxTimer> mTimer; + unique_ptr <wxTaskBarIcon> mTaskBarIcon; + unique_ptr <wxTimer> mTimer; long SelectedItemIndex; VolumeSlotNumber SelectedSlotNumber; int ShowRequestFifo; diff --git a/src/Main/Forms/PreferencesDialog.h b/src/Main/Forms/PreferencesDialog.h index 25a0f85f..0cd1482a 100644 --- a/src/Main/Forms/PreferencesDialog.h +++ b/src/Main/Forms/PreferencesDialog.h @@ -54,7 +54,7 @@ namespace VeraCrypt KeyfilesPanel *DefaultKeyfilesPanel; int LastVirtualKeyPressed; - auto_ptr <wxTimer> mTimer; + unique_ptr <wxTimer> mTimer; UserPreferences Preferences; bool RestoreValidatorBell; HotkeyList UnregisteredHotkeys; diff --git a/src/Main/Forms/ProgressWizardPage.h b/src/Main/Forms/ProgressWizardPage.h index cc50fa62..34f5cf4d 100644 --- a/src/Main/Forms/ProgressWizardPage.h +++ b/src/Main/Forms/ProgressWizardPage.h @@ -36,7 +36,7 @@ namespace VeraCrypt void OnAbortButtonClick (wxCommandEvent& event); void OnTimer (); - auto_ptr <wxTimer> mTimer; + unique_ptr <wxTimer> mTimer; int PreviousGaugeValue; uint64 ProgressBarRange; int RealProgressBarRange; diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.h b/src/Main/Forms/VolumeCreationProgressWizardPage.h index 345ee593..fad4ac93 100644 --- a/src/Main/Forms/VolumeCreationProgressWizardPage.h +++ b/src/Main/Forms/VolumeCreationProgressWizardPage.h @@ -48,7 +48,7 @@ namespace VeraCrypt int PreviousGaugeValue; uint64 ProgressBarRange; - auto_ptr <wxTimer> RandomPoolTimer; + unique_ptr <wxTimer> RandomPoolTimer; int RealProgressBarRange; wxLongLong StartTime; bool VolumeCreatorRunning; diff --git a/src/Main/Forms/VolumeCreationWizard.h b/src/Main/Forms/VolumeCreationWizard.h index c4087426..70abc9ef 100644 --- a/src/Main/Forms/VolumeCreationWizard.h +++ b/src/Main/Forms/VolumeCreationWizard.h @@ -67,8 +67,8 @@ namespace VeraCrypt bool CrossPlatformSupport; static bool DeviceWarningConfirmed; bool DisplayKeyInfo; - auto_ptr <wxTimer> ProgressTimer; - auto_ptr <wxTimer> RandomPoolUpdateTimer; + unique_ptr <wxTimer> ProgressTimer; + unique_ptr <wxTimer> RandomPoolUpdateTimer; shared_ptr <KeyfileList> Keyfiles; bool LargeFilesSupport; uint64 MaxHiddenVolumeSize; |