diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-10 18:02:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-04 18:14:22 +0200 |
| commit | 29030b54c98b0aee65fbc10ebf7ba36bed98c02c (patch) | |
| tree | 79766830b55ebca38ddbce84d8d548227eedb69e /src/ConfigGlobal.hxx | |
| parent | c9fcc7f14860777458153eb2d13c773ccfa1daa2 (diff) | |
| download | mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.gz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.xz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.zip | |
util/Error: new error passing library
Replaces GLib's GError.
Diffstat (limited to 'src/ConfigGlobal.hxx')
| -rw-r--r-- | src/ConfigGlobal.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ConfigGlobal.hxx b/src/ConfigGlobal.hxx index aaae82bd1..efa5e0604 100644 --- a/src/ConfigGlobal.hxx +++ b/src/ConfigGlobal.hxx @@ -21,7 +21,6 @@ #define MPD_CONFIG_GLOBAL_HXX #include "ConfigOption.hxx" -#include "gerror.h" #include "gcc.h" #include <stdbool.h> @@ -30,6 +29,7 @@ #define DEFAULT_PLAYLIST_MAX_LENGTH (1024*16) #define DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS false +class Error; class Path; void config_global_init(void); @@ -42,7 +42,7 @@ void config_global_finish(void); void config_global_check(void); bool -ReadConfigFile(const Path &path, GError **error_r); +ReadConfigFile(const Path &path, Error &error); /* don't free the returned value set _last_ to NULL to get first entry */ @@ -76,7 +76,7 @@ config_get_string(enum ConfigOption option, const char *default_value); * could not be parsed, returns Path::Null() and sets the error. */ Path -config_get_path(enum ConfigOption option, GError **error_r); +config_get_path(enum ConfigOption option, Error &error); gcc_pure unsigned |