Merge branch 'master' of github.com:gunnarbeutner/strawberry

Conflicts:
	base/dictionary.cpp

base/application.h

@@ -22,6 +22,11 @@
 
 namespace icinga {
 
+/**
+ * Log severity.
+ *
+ * @ingroup base
+ */
 enum LogSeverity
 {
 	LogDebug,

base/configobject.cpp

@@ -75,7 +75,6 @@ bool ConfigObject::IsLocal(void) const
 	return value;
 }
 
-
 void ConfigObject::SetTemporary(bool value)
 {
 	GetProperties()->SetProperty("__temporary", value ? 1 : 0);

base/configobject.h

@@ -23,6 +23,11 @@
 namespace icinga
 {
 
+/**
+ * A configuration object.
+ *
+ * @ingroup base
+ */
 class I2_BASE_API ConfigObject : public Object
 {
 public:

base/dictionary.cpp

@@ -26,7 +26,7 @@ using namespace icinga;
  *
  * @returns An iterator.
  */
-Iterator Dictionary::Begin(void)
+Dictionary::Iterator Dictionary::Begin(void)
 {
 	return m_Data.begin();
 }
@@ -36,7 +36,7 @@ Iterator Dictionary::Begin(void)
  *
  * @returns An iterator.
  */
-Iterator Dictionary::End(void)
+Dictionary::Iterator Dictionary::End(void)
 {
 	return m_Data.end();
 }