Fix minor issues with AutoSurface, AutoLineLayout and SelectionText.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/EditView.h b/src/EditView.h
index ac42f072b..f649f7c87 100644
--- a/src/EditView.h
+++ b/src/EditView.h
@@ -160,19 +160,19 @@ class AutoLineLayout {
 	LineLayoutCache &llc;
 	LineLayout *ll;
 public:
-	AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) : llc(llc_), ll(ll_) {}
+	AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) noexcept : llc(llc_), ll(ll_) {}
 	AutoLineLayout(const AutoLineLayout &) = delete;
 	AutoLineLayout(AutoLineLayout &&) = delete;
 	AutoLineLayout &operator=(const AutoLineLayout &) = delete;
 	AutoLineLayout &operator=(AutoLineLayout &&) = delete;
 	~AutoLineLayout() {
 		llc.Dispose(ll);
-		ll = 0;
+		ll = nullptr;
 	}
-	LineLayout *operator->() const {
+	LineLayout *operator->() const noexcept {
 		return ll;
 	}
-	operator LineLayout *() const {
+	operator LineLayout *() const noexcept {
 		return ll;
 	}
 	void Set(LineLayout *ll_) {
diff --git a/src/Editor.h b/src/Editor.h
index 33dae2f67..260139b94 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -70,8 +70,6 @@ public:
 	int codePage;
 	int characterSet;
 	SelectionText() : rectangular(false), lineCopy(false), codePage(0), characterSet(0) {}
-	~SelectionText() {
-	}
 	void Clear() {
 		s.clear();
 		rectangular = false;
@@ -633,13 +631,15 @@ public:
 	}
 	// Deleted so AutoSurface objects can not be copied.
 	AutoSurface(const AutoSurface &) = delete;
+	AutoSurface(AutoSurface &&) = delete;
 	void operator=(const AutoSurface &) = delete;
+	void operator=(AutoSurface &&) = delete;
 	~AutoSurface() {
 	}
-	Surface *operator->() const {
+	Surface *operator->() const noexcept {
 		return surf.get();
 	}
-	operator Surface *() const {
+	operator Surface *() const noexcept {
 		return surf.get();
 	}
 };