diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-05-08 11:46:40 +0200 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-05-08 11:46:40 +0200 |
commit | ce1468a7e3893d185e44c2c9612c3afad952bf7a (patch) | |
tree | bf5980d65e7156ea1c068b6011057b21dafc7a24 | |
parent | 89985b02440d2ff661b636d57bfdb25a352db4fd (diff) | |
download | glibmm-ce1468a7e3893d185e44c2c9612c3afad952bf7a.tar.gz |
Glib, Gio: Update documentation of in-class enums
* glib/src/glib_docs_override.xml:
* gio/src/gio_docs_override.xml: Add and modifiy substitute_type_name and
substitute_enumerator_name xml elements to make gmmproc correctly convert
C names to C++ names of enums defined in a class.
-rw-r--r-- | gio/src/gio_docs_override.xml | 59 | ||||
-rw-r--r-- | glib/src/glib_docs_override.xml | 12 |
2 files changed, 55 insertions, 16 deletions
diff --git a/gio/src/gio_docs_override.xml b/gio/src/gio_docs_override.xml index 5e790601..ff8873e9 100644 --- a/gio/src/gio_docs_override.xml +++ b/gio/src/gio_docs_override.xml @@ -1,22 +1,52 @@ <root> +<substitute_type_name from="GAppInfoCreateFlags" to="Gio::AppInfo::CreateFlags" /> +<substitute_type_name from="GApplicationFlags" to="Gio::Application::Flags" /> +<substitute_type_name from="GConverterFlags" to="Gio::Converter::Flags" /> +<substitute_type_name from="GConverterResult" to="Gio::Converter::Result" /> +<substitute_type_name from="GCredentialsType" to="Gio::Credentials::Type" /> <substitute_type_name from="GDBusActionGroup" to="Gio::DBus::ActionGroup" /> <substitute_type_name from="GDBusConnection" to="Gio::DBus::Connection" /> <substitute_type_name from="GDBusAuthObserver" to="Gio::DBus::AuthObserver" /> <substitute_type_name from="GDBusMessage" to="Gio::DBus::Message" /> <substitute_type_name from="GDBusCallFlags" to="Gio::DBus::CallFlags" /> +<substitute_type_name from="GDBusInterfaceSkeletonFlags" to="Gio::DBus::InterfaceSkeleton::Flags" /> <substitute_type_name from="GDBusProxyFlags" to="Gio::DBus::ProxyFlags" /> <substitute_type_name from="GDBusProxy" to="Gio::DBus::Proxy" /> <substitute_type_name from="GDBusInterfaceInfo" to="Gio::DBus::InterfaceInfo" /> <substitute_type_name from="GDBusServer" to="Gio::DBus::Server" /> -<substitute_type_name from="GDBusServerFlags" to="Gio::DBus::ServerFlags" /> +<substitute_type_name from="GDBusServerFlags" to="Gio::DBus::Server::Flags" /> +<substitute_type_name from="GDriveStartFlags" to="Gio::Drive::StartFlags" /> +<substitute_type_name from="GDriveStartStopType" to="Gio::Drive::StartStopType" /> +<substitute_type_name from="GEmblemOrigin" to="Gio::Emblem::Origin" /> <substitute_type_name from="GIOErrorEnum" to="Gio::Error" /> - -<substitute_enumerator_name from_prefix="G_APPLICATION_" to_prefix="Gio::ApplicationFlags::" /> +<substitute_type_name from="GFileAttributeInfoFlags" to="Gio::FileAttributeInfo::Flags" /> +<substitute_type_name from="GFileCopyFlags" to="Gio::File::CopyFlags" /> +<substitute_type_name from="GFileCreateFlags" to="Gio::File::CreateFlags" /> +<substitute_type_name from="GFileMeasureFlags" to="Gio::File::MeasureFlags" /> +<substitute_type_name from="GFileMonitorEvent" to="Gio::FileMonitor::Event" /> +<substitute_type_name from="GIOStreamSpliceFlags" to="Gio::IOStream::SpliceFlags" /> +<substitute_type_name from="GMountMountFlags" to="Gio::Mount::MountFlags" /> +<substitute_type_name from="GMountUnmountFlags" to="Gio::Unmount::MountFlags" /> +<substitute_type_name from="GNotificationPriority" to="Gio::Notification::Priority" /> +<substitute_type_name from="GOutputStreamSpliceFlags" to="Gio::OutputStream::SpliceFlags" /> +<substitute_type_name from="GResolverRecordType" to="Gio::Resolver::RecordType" /> +<substitute_type_name from="GResourceFlags" to="Gio::Resource::Flags" /> +<substitute_type_name from="GResourceLookupFlags" to="Gio::Resource::LookupFlags" /> +<substitute_type_name from="GSettingsBindFlags" to="Gio::Settings::BindFlags" /> +<substitute_type_name from="GSocketMsgFlags" to="Gio::Socket::MsgFlags" /> +<substitute_type_name from="GSocketProtocol" to="Gio::Socket::Protocol" /> +<substitute_type_name from="GSocketType" to="Gio::Socket::Type" /> +<substitute_type_name from="GTlsDatabaseLookupFlags" to="Gio::TlsDatabase::LookupFlags" /> +<substitute_type_name from="GTlsDatabaseVerifyFlags" to="Gio::TlsDatabase::VerifyFlags" /> +<substitute_type_name from="GTlsPasswordFlags" to="Gio::TlsPassword::Flags" /> +<substitute_type_name from="GUnixSocketAddressType" to="Gio::UnixSocketAddress::Type" /> + +<substitute_enumerator_name from_prefix="G_APPLICATION_" to_prefix="Gio::Application::Flags::" /> <!-- GConverterFlags and GConverterResult both have prefix G_CONVERTER_. --> -<substitute_enumerator_name from_prefix="G_CONVERTER_NO_FLAGS" to_prefix="Gio::ConverterFlags::NO_FLAGS" /> -<substitute_enumerator_name from_prefix="G_CONVERTER_INPUT_AT_END" to_prefix="Gio::ConverterFlags::INPUT_AT_END" /> -<substitute_enumerator_name from_prefix="G_CONVERTER_FLUSH" to_prefix="Gio::ConverterFlags::FLUSH" /> -<substitute_enumerator_name from_prefix="G_CONVERTER_" to_prefix="Gio::ConverterResult::" /> +<substitute_enumerator_name from_prefix="G_CONVERTER_NO_FLAGS" to_prefix="Gio::Converter::Flags::NO_FLAGS" /> +<substitute_enumerator_name from_prefix="G_CONVERTER_INPUT_AT_END" to_prefix="Gio::Converter::Flags::INPUT_AT_END" /> +<substitute_enumerator_name from_prefix="G_CONVERTER_FLUSH" to_prefix="Gio::Converter::Flags::FLUSH" /> +<substitute_enumerator_name from_prefix="G_CONVERTER_" to_prefix="Gio::Converter::Result::" /> <substitute_enumerator_name from_prefix="G_IO_ERROR_" to_prefix="Gio::Error::" /> <substitute_enumerator_name from_prefix="G_DBUS_CONNECTION_FLAGS_" to_prefix="Gio::DBus::ConnectionFlags::" /> @@ -26,17 +56,18 @@ <substitute_enumerator_name from_prefix="G_DBUS_MESSAGE_HEADER_FIELD_" to_prefix="Gio::DBus::MessageHeaderField::" /> <substitute_enumerator_name from_prefix="G_DBUS_MESSAGE_FLAGS_" to_prefix="Gio::DBus::MessageFlags::" /> <substitute_enumerator_name from_prefix="G_DBUS_PROXY_FLAGS_" to_prefix="Gio::DBus::ProxyFlags::" /> -<substitute_enumerator_name from_prefix="G_DBUS_INTERFACE_SKELETON_FLAGS_" to_prefix="Gio::DBus::InterfaceSkeletonFlags::" /> +<substitute_enumerator_name from_prefix="G_DBUS_INTERFACE_SKELETON_FLAGS_" to_prefix="Gio::DBus::InterfaceSkeleton::Flags::" /> <substitute_enumerator_name from_prefix="G_BUS_NAME_OWNER_FLAGS_" to_prefix="Gio::DBus::BusNameOwnerFlags::" /> -<substitute_enumerator_name from_prefix="G_DBUS_SERVER_FLAGS_" to_prefix="Gio::DBus::ServerFlags::" /> +<substitute_enumerator_name from_prefix="G_DBUS_SERVER_FLAGS_" to_prefix="Gio::DBus::Server::Flags::" /> +<substitute_enumerator_name from_prefix="G_FILE_MONITOR_EVENT_" to_prefix="Gio::FileMonitor::Event::" /> <substitute_enumerator_name from_prefix="G_FILE_MONITOR_" to_prefix="Gio::FileMonitorFlags::" /> <substitute_enumerator_name from_prefix="G_FILE_TYPE_" to_prefix="Gio::FileType::" /> <substitute_enumerator_name from_prefix="G_NETWORK_CONNECTIVITY_" to_prefix="Gio::NetworkConnectivity::" /> -<substitute_enumerator_name from_prefix="G_RESOLVER_RECORD_" to_prefix="Gio::ResolverRecordType::" /> +<substitute_enumerator_name from_prefix="G_RESOLVER_RECORD_" to_prefix="Gio::Resolver::RecordType::" /> <substitute_enumerator_name from_prefix="G_RESOURCE_ERROR_" to_prefix="Gio::ResourceError::" /> -<substitute_enumerator_name from_prefix="G_SETTINGS_BIND_" to_prefix="Gio::SettingsBindFlags::" /> -<substitute_enumerator_name from_prefix="G_SOCKET_PROTOCOL_" to_prefix="Gio::SocketProtocol::" /> -<substitute_enumerator_name from_prefix="G_SOCKET_TYPE_" to_prefix="Gio::SocketType::" /> +<substitute_enumerator_name from_prefix="G_SETTINGS_BIND_" to_prefix="Gio::Settings::BindFlags::" /> +<substitute_enumerator_name from_prefix="G_SOCKET_PROTOCOL_" to_prefix="Gio::Socket::Protocol::" /> +<substitute_enumerator_name from_prefix="G_SOCKET_TYPE_" to_prefix="Gio::Socket::Type::" /> <substitute_enumerator_name from_prefix="G_SOCKET_FAMILY_" to_prefix="Gio::SocketFamily::" /> <substitute_enumerator_name from_prefix="G_IO_" to_prefix="Glib::IOCondition::" /> <substitute_enumerator_name from_prefix="G_SOCKET_CLIENT_" to_prefix="Gio::SocketClientEvent::" /> @@ -46,7 +77,7 @@ <substitute_enumerator_name from_prefix="G_TLS_INTERACTION_" to_prefix="Gio::TlsInteractionResult::" /> <substitute_enumerator_name from_prefix="G_TLS_ERROR_" to_prefix="Gio::TlsError::" /> <substitute_enumerator_name from_prefix="G_ZLIB_COMPRESSOR_FORMAT_" to_prefix="Gio::ZlibCompressorFormat::" /> -<substitute_enumerator_name from_prefix="G_UNIX_SOCKET_ADDRESS_" to_prefix="Gio::UnixSocketAddressType::" /> +<substitute_enumerator_name from_prefix="G_UNIX_SOCKET_ADDRESS_" to_prefix="Gio::UnixSocketAddress::Type::" /> <!-- These are preprocessor defines. Don't substitute. --> <substitute_enumerator_name from="G_MAXSSIZE" to="G_MAXSSIZE" /> <substitute_enumerator_name from="G_MAXINT" to="G_MAXINT" /> diff --git a/glib/src/glib_docs_override.xml b/glib/src/glib_docs_override.xml index 4a32ecd1..6a038971 100644 --- a/glib/src/glib_docs_override.xml +++ b/glib/src/glib_docs_override.xml @@ -1,11 +1,19 @@ <root> + <substitute_type_name from="GBindingFlags" to="Glib::Binding::Flags" /> + <substitute_type_name from="GChecksumType" to="Glib::Checksum::Type" /> <substitute_type_name from="GDateMonth" to="Glib::Date::Month" /> <substitute_type_name from="GDateWeekday" to="Glib::Date::Weekday" /> <substitute_type_name from="GDateDMY" to="Glib::Date::DMY" /> + <substitute_type_name from="GKeyFileFlags" to="Glib::KeyFile::Flags" /> + <substitute_type_name from="GMarkupParseFlags" to="Glib::Markup::ParseFlags" /> + <substitute_type_name from="GModuleFlags" to="Glib::Module::Flags" /> + <substitute_type_name from="GRegexCompileFlags" to="Glib::Regex::CompileFlags" /> + <substitute_type_name from="GRegexMatchFlags" to="Glib::Regex::MatchFlags" /> + <substitute_enumerator_name from_prefix="G_DATE_" to_prefix="Glib::Date::" /> <substitute_enumerator_name from_prefix="G_PARAM_" to_prefix="Glib::ParamFlags::" /> - <substitute_enumerator_name from_prefix="G_REGEX_MATCH_" to_prefix="Glib::RegexMatchFlags::" /> - <substitute_enumerator_name from_prefix="G_REGEX_" to_prefix="Glib::RegexCompileFlags::" /> + <substitute_enumerator_name from_prefix="G_REGEX_MATCH_" to_prefix="Glib::Regex::MatchFlags::" /> + <substitute_enumerator_name from_prefix="G_REGEX_" to_prefix="Glib::Regex::CompileFlags::" /> <substitute_enumerator_name from_prefix="G_SPAWN_ERROR_" to_prefix="Glib::SpawnError::" /> <substitute_enumerator_name from_prefix="G_TIME_TYPE_" to_prefix="Glib::TimeType::" /> <substitute_enumerator_name from_prefix="G_UNICODE_BREAK_" to_prefix="Glib::UnicodeBreakType::" /> |