summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-17 19:48:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-17 19:48:19 +0300
commite5ed738d09700004362bf1344d8f331279903d29 (patch)
tree538f4200585178b84eae0ab08f59605ccd21e699
parent04ac16fc83719870bdad57eff409dc5db9502fe0 (diff)
downloadplus-e5ed738d09700004362bf1344d8f331279903d29.tar.gz
plus-e5ed738d09700004362bf1344d8f331279903d29.tar.bz2
plus-e5ed738d09700004362bf1344d8f331279903d29.tar.xz
plus-e5ed738d09700004362bf1344d8f331279903d29.zip
add restrict into button.
-rw-r--r--src/gui/widgets/button.cpp19
-rw-r--r--src/gui/widgets/button.h17
2 files changed, 22 insertions, 14 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 69cc137ba..c8ac617c0 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -79,7 +79,8 @@ Button::Button(const Widget2 *const widget) :
}
Button::Button(const Widget2 *const widget,
- const std::string &caption, const std::string &actionEventId,
+ const std::string &restrict caption,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener) :
gcn::Button(caption),
Widget2(widget),
@@ -116,9 +117,10 @@ Button::Button(const Widget2 *const widget,
}
Button::Button(const Widget2 *const widget,
- const std::string &caption, const std::string &imageName,
+ const std::string &restrict caption,
+ const std::string &restrict imageName,
const int imageWidth, const int imageHeight,
- const std::string &actionEventId,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener) :
gcn::Button(caption),
Widget2(widget),
@@ -155,9 +157,10 @@ Button::Button(const Widget2 *const widget,
addActionListener(listener);
}
-Button::Button(const Widget2 *const widget, const std::string &imageName,
+Button::Button(const Widget2 *const widget,
+ const std::string &restrict imageName,
const int imageWidth, const int imageHeight,
- const std::string &actionEventId,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener) :
gcn::Button(),
Widget2(widget),
@@ -195,9 +198,9 @@ Button::Button(const Widget2 *const widget, const std::string &imageName,
}
Button::Button(const Widget2 *const widget,
- const std::string &caption,
- const std::string &imageName,
- const std::string &actionEventId,
+ const std::string &restrict caption,
+ const std::string &restrict imageName,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener) :
gcn::Button(caption),
Widget2(widget),
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 15567ea52..2e233cee5 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -57,7 +57,8 @@ class Button final : public gcn::Button,
* adds the given action listener.
*/
Button(const Widget2 *const widget,
- const std::string &caption, const std::string &actionEventId,
+ const std::string &restrict caption,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener);
/**
@@ -65,7 +66,8 @@ class Button final : public gcn::Button,
* adds the given action listener.
*/
Button(const Widget2 *const widget,
- const std::string &caption, const std::string &imageName,
+ const std::string &restrict caption,
+ const std::string &restrict imageName,
const int imageWidth, const int imageHeight,
const std::string &actionEventId,
gcn::ActionListener *const listener);
@@ -74,17 +76,20 @@ class Button final : public gcn::Button,
* Constructor, sets the caption of the button to the given string and
* adds the given action listener.
*/
- Button(const Widget2 *const widget, const std::string &imageName,
+ Button(const Widget2 *const widget,
+ const std::string &restrict imageName,
const int imageWidth, const int imageHeight,
- const std::string &actionEventId,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener);
/**
* Constructor, sets the caption of the button to the given string and
* adds the given action listener.
*/
- Button(const Widget2 *const widget, const std::string &imageName,
- const std::string &caption, const std::string &actionEventId,
+ Button(const Widget2 *const widget,
+ const std::string &restrict imageName,
+ const std::string &restrict caption,
+ const std::string &restrict actionEventId,
gcn::ActionListener *const listener);
A_DELETE_COPY(Button)