From 29030b54c98b0aee65fbc10ebf7ba36bed98c02c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 10 Aug 2013 18:02:44 +0200
Subject: util/Error: new error passing library
Replaces GLib's GError.
---
src/protocol/Ack.cxx | 24 ++++++++++++++++++++++++
src/protocol/Ack.hxx | 14 ++------------
src/protocol/Result.hxx | 2 ++
3 files changed, 28 insertions(+), 12 deletions(-)
create mode 100644 src/protocol/Ack.cxx
(limited to 'src/protocol')
diff --git a/src/protocol/Ack.cxx b/src/protocol/Ack.cxx
new file mode 100644
index 000000000..3c8185afd
--- /dev/null
+++ b/src/protocol/Ack.cxx
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Ack.hxx"
+#include "util/Domain.hxx"
+
+const Domain ack_domain("ack");
diff --git a/src/protocol/Ack.hxx b/src/protocol/Ack.hxx
index b76fae17d..a7f8e5e53 100644
--- a/src/protocol/Ack.hxx
+++ b/src/protocol/Ack.hxx
@@ -20,9 +20,7 @@
#ifndef MPD_ACK_H
#define MPD_ACK_H
-#include "gcc.h"
-
-#include <glib.h>
+class Domain;
enum ack {
ACK_ERROR_NOT_LIST = 1,
@@ -40,14 +38,6 @@ enum ack {
ACK_ERROR_EXIST = 56,
};
-/**
- * Quark for GError.domain; the code is an enum #ack.
- */
-gcc_const
-static inline GQuark
-ack_quark(void)
-{
- return g_quark_from_static_string("ack");
-}
+extern const Domain ack_domain;
#endif
diff --git a/src/protocol/Result.hxx b/src/protocol/Result.hxx
index 6766da3d5..0f953c62b 100644
--- a/src/protocol/Result.hxx
+++ b/src/protocol/Result.hxx
@@ -24,6 +24,8 @@
#include "gcc.h"
#include "Ack.hxx"
+#include <stdarg.h>
+
class Client;
extern const char *current_command;
--
cgit v1.2.3