[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 809aa1e 2/4: Make boost::scoped_ptr const whe
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 809aa1e 2/4: Make boost::scoped_ptr const wherever possible |
Date: |
Mon, 23 Jan 2017 12:42:14 +0000 (UTC) |
branch: master
commit 809aa1ebc87233716b3cd9ed6336045318d8175a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Make boost::scoped_ptr const wherever possible
Even scoped_ptr data members are now const iff they're set in the
ctor-initializer and never reset.
---
docmanager_ex.hpp | 4 ++--
file_command_wx.cpp | 2 +-
xml_lmi.hpp | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docmanager_ex.hpp b/docmanager_ex.hpp
index ce4bf45..a8e47ef 100644
--- a/docmanager_ex.hpp
+++ b/docmanager_ex.hpp
@@ -70,8 +70,8 @@ class DocManagerEx
,bool sort
) override;
- boost::scoped_ptr<wxPrintData> print_data_;
- boost::scoped_ptr<wxPageSetupDialogData> page_setup_data_;
+ boost::scoped_ptr<wxPrintData> const print_data_;
+ boost::scoped_ptr<wxPageSetupDialogData> const page_setup_data_;
DECLARE_DYNAMIC_CLASS(DocManagerEx)
DECLARE_EVENT_TABLE()
diff --git a/file_command_wx.cpp b/file_command_wx.cpp
index 5592063..d7398b8 100644
--- a/file_command_wx.cpp
+++ b/file_command_wx.cpp
@@ -48,7 +48,7 @@ void concrete_file_command
fs::path path(file);
std::string extension = fs::extension(path);
- boost::scoped_ptr<wxFileType> ft
+ boost::scoped_ptr<wxFileType> const ft
(wxTheMimeTypesManager->GetFileTypeFromExtension(extension)
);
diff --git a/xml_lmi.hpp b/xml_lmi.hpp
index 36b2c77..c010321 100644
--- a/xml_lmi.hpp
+++ b/xml_lmi.hpp
@@ -54,8 +54,8 @@ namespace xml_lmi
xml::element const& root_node(std::string const& expected_name) const;
private:
- std::string error_context_;
- boost::scoped_ptr<DomParser> parser_;
+ std::string error_context_;
+ boost::scoped_ptr<DomParser> parser_;
};
class xml_document
@@ -74,8 +74,8 @@ namespace xml_lmi
void add_comment(std::string const&);
private:
- std::string error_context_;
- boost::scoped_ptr<Document> document_;
+ std::string error_context_;
+ boost::scoped_ptr<Document> const document_;
};
xml::node::const_iterator retrieve_element