diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-14 03:09:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-14 03:09:18 +0300 |
commit | 11a02af132567b6ef709ce0b20113375dcad5db7 (patch) | |
tree | b0c1813df42858b8948c984202968eda7e3e4645 | |
parent | 3206e9b2b839c603a6857a80f73fc814647e2fbc (diff) | |
download | manaverse-11a02af132567b6ef709ce0b20113375dcad5db7.tar.gz manaverse-11a02af132567b6ef709ce0b20113375dcad5db7.tar.bz2 manaverse-11a02af132567b6ef709ce0b20113375dcad5db7.tar.xz manaverse-11a02af132567b6ef709ce0b20113375dcad5db7.zip |
Remove copy constructor from ClipRect class.
-rw-r--r-- | src/gui/cliprect.cpp | 9 | ||||
-rw-r--r-- | src/gui/cliprect.h | 9 | ||||
-rw-r--r-- | src/test/testlauncher.cpp | 2 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/gui/cliprect.cpp b/src/gui/cliprect.cpp index bb50b9986..4094a711a 100644 --- a/src/gui/cliprect.cpp +++ b/src/gui/cliprect.cpp @@ -84,12 +84,3 @@ ClipRect::ClipRect(const int x0, const int y0, yOffset(yOffset0) { } - -const ClipRect& ClipRect::operator=(const Rect& other) -{ - x = other.x; - y = other.y; - width = other.width; - height = other.height; - return *this; -} diff --git a/src/gui/cliprect.h b/src/gui/cliprect.h index 44ab6f01b..c4ef23600 100644 --- a/src/gui/cliprect.h +++ b/src/gui/cliprect.h @@ -103,14 +103,7 @@ class ClipRect final : public Rect const int xOffset0, const int yOffset0); - /** - * Copy constructor. Copies x, y, width and height - * field from a rectangle to a clip rectangle. - * - * @param other The rectangle to copy data from. - * @returns A clip rectangle with data copyied from a rectangle. - */ - const ClipRect& operator=(const Rect& other); + A_DELETE_COPY(ClipRect) /** * Holds the x offset of the x coordinate. diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index ffe16e8e7..4f844a7cc 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -504,6 +504,7 @@ int TestLauncher::testStackSpeed() #if defined __linux__ || defined __linux +/* for (int d = 0; d < 100; d ++) { for (int f = 0; f < sz; f ++) @@ -571,6 +572,7 @@ int TestLauncher::testStackSpeed() printf("debug: %d\n", stack2.top().xOffset); printf("my time: %ld\n", diff); +*/ #endif return 0; } |