summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2007-12-28 12:22:13 +0000
committerMurray Cumming <murrayc@src.gnome.org>2007-12-28 12:22:13 +0000
commitd8aaa79cecd3c032e78ce189c05cfd1f3ed2e817 (patch)
tree67e393cb919b12c324b34e096b9491003b9a0e15
parent43e32c9387ebf330941a4e18e9c2e1a23bd14e8f (diff)
downloadglibmm-d8aaa79cecd3c032e78ce189c05cfd1f3ed2e817.tar.gz
Added @newin2p16 to compose() and format() documentation.
2007-12-28 Murray Cumming <murrayc@murrayc.com> * glib/glibmm/ustring.h: Added @newin2p16 to compose() and format() documentation. * glib/src/keyfile.ccg: * glib/src/keyfile.hg: set_double_list(): Make the ArrayHandle argument const. This could not have been used before. svn path=/trunk/; revision=481
-rw-r--r--ChangeLog8
-rw-r--r--glib/glibmm/ustring.h60
-rw-r--r--glib/src/keyfile.ccg2
-rw-r--r--glib/src/keyfile.hg6
4 files changed, 70 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 265bffd0..217cec1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-12-28 Murray Cumming <murrayc@murrayc.com>
+ * glib/glibmm/ustring.h: Added @newin2p16 to compose() and format()
+ documentation.
+ * glib/src/keyfile.ccg:
+ * glib/src/keyfile.hg: set_double_list(): Make the ArrayHandle argument const.
+ This could not have been used before.
+
+2007-12-28 Murray Cumming <murrayc@murrayc.com>
+
* glib/src/keyfile.hg: Add class documentation from the glibmm-2-14 branch.
2007-12-28 Murray Cumming <murrayc@murrayc.com>
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index 04a4a14b..9e61ee40 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -624,38 +624,58 @@ public:
* @param a1 The argument to substitute for <tt>"%1"</tt>.
* @return The substituted message string.
* @throw Glib::ConvertError
+ *
+ * @newin2p16
*/
template <class T1>
static inline
ustring compose(const ustring& fmt, const T1& a1);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2>
static inline
ustring compose(const ustring& fmt, const T1& a1, const T2& a2);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3>
static inline
ustring compose(const ustring& fmt,
const T1& a1, const T2& a2, const T3& a3);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4>
static inline
ustring compose(const ustring& fmt,
const T1& a1, const T2& a2, const T3& a3,
const T4& a4);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4, class T5>
static inline
ustring compose(const ustring& fmt,
const T1& a1, const T2& a2, const T3& a3,
const T4& a4, const T5& a5);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4, class T5, class T6>
static inline
ustring compose(const ustring& fmt,
const T1& a1, const T2& a2, const T3& a3,
const T4& a4, const T5& a5, const T6& a6);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
static inline
ustring compose(const ustring& fmt,
@@ -663,6 +683,9 @@ public:
const T4& a4, const T5& a5, const T6& a6,
const T7& a7);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4,
class T5, class T6, class T7, class T8>
static inline
@@ -671,6 +694,9 @@ public:
const T4& a4, const T5& a5, const T6& a6,
const T7& a7, const T8& a8);
+ /* See the documentation for compose(const ustring& fmt, const T1& a1).
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4, class T5,
class T6, class T7, class T8, class T9>
static inline
@@ -706,39 +732,69 @@ public:
* @param a1 A streamable value or an I/O manipulator.
* @return The string representation of the argument stream.
* @throw Glib::ConvertError
+ *
+ * @newin2p16
*/
template <class T1>
static inline
ustring format(const T1& a1);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2>
static inline
ustring format(const T1& a1, const T2& a2);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2, class T3>
static inline
ustring format(const T1& a1, const T2& a2, const T3& a3);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4>
static inline
ustring format(const T1& a1, const T2& a2, const T3& a3, const T4& a4);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4, class T5>
static inline
ustring format(const T1& a1, const T2& a2, const T3& a3,
const T4& a4, const T5& a5);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4, class T5, class T6>
static inline
ustring format(const T1& a1, const T2& a2, const T3& a3,
const T4& a4, const T5& a5, const T6& a6);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4,
class T5, class T6, class T7>
static inline
ustring format(const T1& a1, const T2& a2, const T3& a3, const T4& a4,
const T5& a5, const T6& a6, const T7& a7);
+ /* See the documentation for format(const T1& a1).
+ *
+ * @newin2p16
+ */
template <class T1, class T2, class T3, class T4,
class T5, class T6, class T7, class T8>
static inline
@@ -765,11 +821,11 @@ private:
template <class T> class Stringify;
class FormatStream;
+ static ustring compose_argv(const ustring& fmt, int argc, const ustring* const* argv);
+
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
std::string string_;
-
- static ustring compose_argv(const ustring& fmt, int argc, const ustring* const* argv);
};
diff --git a/glib/src/keyfile.ccg b/glib/src/keyfile.ccg
index ec1ad690..da3f8216 100644
--- a/glib/src/keyfile.ccg
+++ b/glib/src/keyfile.ccg
@@ -273,7 +273,7 @@ void KeyFile::set_integer_list(const Glib::ustring& group_name, const Glib::ustr
}
void KeyFile::set_double_list(const Glib::ustring& group_name, const Glib::ustring& key,
- Glib::ArrayHandle<double>& list)
+ const Glib::ArrayHandle<double>& list)
{
g_key_file_set_double_list(gobj(), group_name.c_str(), key.c_str(),
const_cast<double*>(list.data()), list.size());
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index 9fdd4918..0e147756 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -324,7 +324,7 @@ public:
* @param key The name of a key
* @param list A list holding object of type bool
*/
- void set_boolean_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle<bool>& list);
+ void set_boolean_list(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ArrayHandle<bool>& list);
_IGNORE(g_key_file_set_boolean_list)
/** Sets a list of integers for the @a key under @a group_name.
@@ -333,7 +333,7 @@ public:
* @param key The name of a key
* @param list A list holding object of type int
*/
- void set_integer_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle<int>& list);
+ void set_integer_list(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ArrayHandle<int>& list);
_IGNORE(g_key_file_set_integer_list)
/** Sets a list of doubles for the @a key under @a group_name.
@@ -344,7 +344,7 @@ public:
*
* @newin2p14
*/
- void set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle<double>& list);
+ void set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ArrayHandle<double>& list);
_IGNORE(g_key_file_set_double_list)