summaryrefslogtreecommitdiff
path: root/src/lib/format.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-04 15:59:31 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-04 15:59:31 +0100
commitcd4a82d90677cec80e891ac190000cb70767446f (patch)
tree835776cf87239fb13b2da994c2d4285b03d0bea0 /src/lib/format.h
parent2cc2dc2aeaec62a4983991170fc5368e10d21748 (diff)
parent1738f2e7336734190bed7e94ce3d691d4a9c9e4c (diff)
Merge master.
Diffstat (limited to 'src/lib/format.h')
-rw-r--r--src/lib/format.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/format.h b/src/lib/format.h
index f240c89fc..d45a3a10a 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -67,10 +67,7 @@ public:
return _dci_name;
}
- std::string as_metadata () const;
-
static Format const * from_nickname (std::string n);
- static Format const * from_metadata (std::string m);
static Format const * from_id (std::string i);
static std::vector<Format const *> all ();
static void setup_formats ();