summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-10 00:38:27 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-10 00:38:27 +0300
commit75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0 (patch)
treed740ed67b01e5de543026784c9b8e646b64328dd
parente066ec2e038405621a7de50e4cd735e548eb488d (diff)
downloadmanaplus-75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0.tar.gz
manaplus-75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0.tar.bz2
manaplus-75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0.tar.xz
manaplus-75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0.zip
Delete copy constructor from guichan classes.
-rw-r--r--src/guichan/include/guichan/basiccontainer.hpp5
-rw-r--r--src/guichan/include/guichan/event.hpp5
-rw-r--r--src/guichan/include/guichan/focushandler.hpp2
-rw-r--r--src/guichan/include/guichan/graphics.hpp2
-rw-r--r--src/guichan/include/guichan/gui.hpp2
-rw-r--r--src/guichan/include/guichan/sdl/sdlgraphics.hpp2
-rw-r--r--src/guichan/include/guichan/widget.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/button.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/checkbox.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/dropdown.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/label.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/listbox.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/radiobutton.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/scrollarea.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/slider.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/tab.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/tabbedarea.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/textbox.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/textfield.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/window.hpp2
20 files changed, 45 insertions, 1 deletions
diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp
index 361947016..5df1fafd2 100644
--- a/src/guichan/include/guichan/basiccontainer.hpp
+++ b/src/guichan/include/guichan/basiccontainer.hpp
@@ -66,6 +66,11 @@ namespace gcn
public DeathListener
{
public:
+ BasicContainer()
+ { }
+
+ A_DELETE_COPY(BasicContainer);
+
/**
* Destructor
*/
diff --git a/src/guichan/include/guichan/event.hpp b/src/guichan/include/guichan/event.hpp
index 1b52df8ed..f6cfe55d1 100644
--- a/src/guichan/include/guichan/event.hpp
+++ b/src/guichan/include/guichan/event.hpp
@@ -47,6 +47,8 @@
#include "guichan/platform.hpp"
+#include "localconsts.h"
+
namespace gcn
{
class Widget;
@@ -61,7 +63,6 @@ namespace gcn
class GCN_CORE_DECLSPEC Event
{
public:
-
/**
* Constructor.
*
@@ -69,6 +70,8 @@ namespace gcn
*/
Event(Widget *const source);
+ A_DELETE_COPY(Event);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp
index 9fa7ddeb7..ef600c511 100644
--- a/src/guichan/include/guichan/focushandler.hpp
+++ b/src/guichan/include/guichan/focushandler.hpp
@@ -77,6 +77,8 @@ namespace gcn
*/
FocusHandler();
+ A_DELETE_COPY(FocusHandler);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp
index d10c63ae1..0a45d0cb8 100644
--- a/src/guichan/include/guichan/graphics.hpp
+++ b/src/guichan/include/guichan/graphics.hpp
@@ -110,6 +110,8 @@ namespace gcn
*/
Graphics();
+ A_DELETE_COPY(Graphics);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp
index b2be75141..092e5c0fa 100644
--- a/src/guichan/include/guichan/gui.hpp
+++ b/src/guichan/include/guichan/gui.hpp
@@ -103,6 +103,8 @@ namespace gcn
*/
Gui();
+ A_DELETE_COPY(Gui);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/sdl/sdlgraphics.hpp b/src/guichan/include/guichan/sdl/sdlgraphics.hpp
index 230b75441..08532939b 100644
--- a/src/guichan/include/guichan/sdl/sdlgraphics.hpp
+++ b/src/guichan/include/guichan/sdl/sdlgraphics.hpp
@@ -71,6 +71,8 @@ namespace gcn
*/
SDLGraphics();
+ A_DELETE_COPY(SDLGraphics);
+
/**
* Sets the target SDL_Surface to draw to. The target can be any
* SDL_Surface. This funtion also pushes a clip areas corresponding to
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index 69dfd1fc4..1b8b6ae54 100644
--- a/src/guichan/include/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
@@ -90,6 +90,8 @@ namespace gcn
*/
Widget();
+ A_DELETE_COPY(Widget);
+
/**
* Default destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp
index 290ff0258..5c1b94443 100644
--- a/src/guichan/include/guichan/widgets/button.hpp
+++ b/src/guichan/include/guichan/widgets/button.hpp
@@ -85,6 +85,8 @@ namespace gcn
*/
Button(const std::string& caption);
+ A_DELETE_COPY(Button);
+
/**
* Sets the caption of the button. It's advisable to call
* adjustSize after setting of the caption to adjust the
diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp
index 529b69ac1..68cf949d0 100644
--- a/src/guichan/include/guichan/widgets/checkbox.hpp
+++ b/src/guichan/include/guichan/widgets/checkbox.hpp
@@ -83,6 +83,8 @@ namespace gcn
*/
CheckBox(const std::string &caption, bool selected = false);
+ A_DELETE_COPY(CheckBox);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp
index a2649ca19..ed955dc2c 100644
--- a/src/guichan/include/guichan/widgets/dropdown.hpp
+++ b/src/guichan/include/guichan/widgets/dropdown.hpp
@@ -99,6 +99,8 @@ namespace gcn
ScrollArea *const scrollArea = nullptr,
ListBox *const listBox = nullptr);
+ A_DELETE_COPY(DropDown);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp
index 1f2e7c3c0..d5b2ed9f5 100644
--- a/src/guichan/include/guichan/widgets/label.hpp
+++ b/src/guichan/include/guichan/widgets/label.hpp
@@ -72,6 +72,8 @@ namespace gcn
*/
Label(const std::string& caption);
+ A_DELETE_COPY(Label);
+
/**
* Gets the caption of the label.
*
diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp
index 75c32067b..2e8e56d52 100644
--- a/src/guichan/include/guichan/widgets/listbox.hpp
+++ b/src/guichan/include/guichan/widgets/listbox.hpp
@@ -86,6 +86,8 @@ namespace gcn
*/
ListBox(ListModel *listModel);
+ A_DELETE_COPY(ListBox);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp
index 062040de9..44e1a5eab 100644
--- a/src/guichan/include/guichan/widgets/radiobutton.hpp
+++ b/src/guichan/include/guichan/widgets/radiobutton.hpp
@@ -89,6 +89,8 @@ namespace gcn
const std::string &group,
bool selected = false);
+ A_DELETE_COPY(RadioButton);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp
index 1abc24e41..1a116ce50 100644
--- a/src/guichan/include/guichan/widgets/scrollarea.hpp
+++ b/src/guichan/include/guichan/widgets/scrollarea.hpp
@@ -105,6 +105,8 @@ namespace gcn
ScrollPolicy hPolicy,
ScrollPolicy vPolicy);
+ A_DELETE_COPY(ScrollArea);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp
index e2d1f526f..57d517f99 100644
--- a/src/guichan/include/guichan/widgets/slider.hpp
+++ b/src/guichan/include/guichan/widgets/slider.hpp
@@ -91,6 +91,8 @@ namespace gcn
*/
Slider(const double scaleStart, const double scaleEnd);
+ A_DELETE_COPY(Slider);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/tab.hpp b/src/guichan/include/guichan/widgets/tab.hpp
index 1936d59b7..6568b9049 100644
--- a/src/guichan/include/guichan/widgets/tab.hpp
+++ b/src/guichan/include/guichan/widgets/tab.hpp
@@ -74,6 +74,8 @@ namespace gcn
*/
Tab();
+ A_DELETE_COPY(Tab);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/tabbedarea.hpp b/src/guichan/include/guichan/widgets/tabbedarea.hpp
index 087d15772..9c64172e8 100644
--- a/src/guichan/include/guichan/widgets/tabbedarea.hpp
+++ b/src/guichan/include/guichan/widgets/tabbedarea.hpp
@@ -80,6 +80,8 @@ namespace gcn
*/
TabbedArea();
+ A_DELETE_COPY(TabbedArea);
+
/**
* Destructor.
*/
diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp
index f440834c4..8a5f61fa7 100644
--- a/src/guichan/include/guichan/widgets/textbox.hpp
+++ b/src/guichan/include/guichan/widgets/textbox.hpp
@@ -77,6 +77,8 @@ namespace gcn
*/
TextBox(const std::string& text);
+ A_DELETE_COPY(TextBox);
+
/**
* Sets the text of the text box.
*
diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp
index d747aeac1..e301b6d1f 100644
--- a/src/guichan/include/guichan/widgets/textfield.hpp
+++ b/src/guichan/include/guichan/widgets/textfield.hpp
@@ -76,6 +76,8 @@ namespace gcn
*/
TextField(const std::string& text);
+ A_DELETE_COPY(TextField);
+
/**
* Sets the text of the text field.
*
diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
index 3949d9f59..68438b421 100644
--- a/src/guichan/include/guichan/widgets/window.hpp
+++ b/src/guichan/include/guichan/widgets/window.hpp
@@ -73,6 +73,8 @@ namespace gcn
*/
Window(const std::string& caption);
+ A_DELETE_COPY(Window);
+
/**
* Destructor.
*/