summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-01 16:43:25 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-02 15:12:01 +0000
commitab0164b7059f8221e8206252255441eda378a6b5 (patch)
treed95049da9a69a7233550793bdf24da2384040dd5
parent443c3f93f3cbad3427b2f96bce1e06f545a1af89 (diff)
downloadqt-creator-ab0164b7059f8221e8206252255441eda378a6b5.tar.gz
Doc: Describe C++ Options Getter and Setter tab
Add and update screenshots. Change-Id: Ie5cd6502d66217db488a5f16dbc6d2bd70906954 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--doc/images/qtcreator-code-style-getter-setter.pngbin0 -> 9045 bytes
-rw-r--r--doc/images/qtcreator-code-style-settings-edit-cpp.pngbin42961 -> 20161 bytes
-rw-r--r--doc/images/qtcreator-options-code-style-cpp.pngbin13019 -> 16615 bytes
-rw-r--r--doc/src/editors/creator-editors.qdoc10
4 files changed, 10 insertions, 0 deletions
diff --git a/doc/images/qtcreator-code-style-getter-setter.png b/doc/images/qtcreator-code-style-getter-setter.png
new file mode 100644
index 0000000000..7a89c2a1db
--- /dev/null
+++ b/doc/images/qtcreator-code-style-getter-setter.png
Binary files differ
diff --git a/doc/images/qtcreator-code-style-settings-edit-cpp.png b/doc/images/qtcreator-code-style-settings-edit-cpp.png
index ab4b48b5e5..3d15ac12e4 100644
--- a/doc/images/qtcreator-code-style-settings-edit-cpp.png
+++ b/doc/images/qtcreator-code-style-settings-edit-cpp.png
Binary files differ
diff --git a/doc/images/qtcreator-options-code-style-cpp.png b/doc/images/qtcreator-options-code-style-cpp.png
index ba54d09e49..0a0a7c334b 100644
--- a/doc/images/qtcreator-options-code-style-cpp.png
+++ b/doc/images/qtcreator-options-code-style-cpp.png
Binary files differ
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 475c992162..4cd1173e41 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -1248,6 +1248,8 @@
identifiers, type names, or left or right \c const or \c volatile
keywords.
+ \li Name getter functions.
+
\endlist
You can use the live preview to see how the options change the indentation.
@@ -1431,6 +1433,14 @@
\image qtcreator-pointers-references.png "Pointers and References options"
+ \section1 Naming Getters
+
+ To prefer getter names without the string \e get, select the
+ \uicontrol {Prefer getter names without "get"} check box in the
+ \uicontrol {Getter and Setter} tab.
+
+ \image qtcreator-code-style-getter-setter.png
+
*/