format_general is dead

10 files changed, 0 insertions, 170 deletions

diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index c93059702..29f6bce29 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -161,7 +161,6 @@ libcave_a_SOURCES = \
 	cmd_verify.cc cmd_verify.hh cmd_verify-fmt.hh \
 	exceptions.cc exceptions.hh \
 	executables_common.cc executables_common.hh \
-	format_general.cc format_general.hh \
 	format_plain_contents_entry.cc format_plain_contents_entry.hh \
 	format_plain_metadata_key.cc format_plain_metadata_key.hh \
 	format_string.cc format_string.hh \
diff --git a/src/clients/cave/cmd_executables.cc b/src/clients/cave/cmd_executables.cc
index cb4c260dd..918582ed0 100644
--- a/src/clients/cave/cmd_executables.cc
+++ b/src/clients/cave/cmd_executables.cc
@@ -22,7 +22,6 @@
 #include "command_command_line.hh"
 #include "executables_common.hh"
 #include "formats.hh"
-#include "format_general.hh"
 #include "format_user_config.hh"
 
 #include <paludis/args/args.hh>
diff --git a/src/clients/cave/cmd_fix_cache.cc b/src/clients/cave/cmd_fix_cache.cc
index f43843b67..61ae0b43d 100644
--- a/src/clients/cave/cmd_fix_cache.cc
+++ b/src/clients/cave/cmd_fix_cache.cc
@@ -19,7 +19,6 @@
 
 #include "cmd_fix_cache.hh"
 #include "formats.hh"
-#include "format_general.hh"
 #include "format_user_config.hh"
 
 #include <paludis/args/args.hh>
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 127dc20cf..18d025ce0 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -20,7 +20,6 @@
 #include "cmd_info.hh"
 #include "cmd_perform.hh"
 #include "colour_formatter.hh"
-#include "format_general.hh"
 #include "formats.hh"
 #include "exceptions.hh"
 #include "format_user_config.hh"
diff --git a/src/clients/cave/cmd_owner.cc b/src/clients/cave/cmd_owner.cc
index efe1cbfdb..aa86d1a57 100644
--- a/src/clients/cave/cmd_owner.cc
+++ b/src/clients/cave/cmd_owner.cc
@@ -21,7 +21,6 @@
 #include "cmd_owner.hh"
 #include "command_command_line.hh"
 #include "owner_common.hh"
-#include "format_general.hh"
 #include "formats.hh"
 #include "format_user_config.hh"
 
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 97e7c40d1..32d4ed0da 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -19,7 +19,6 @@
 
 #include "cmd_show.hh"
 #include "colour_formatter.hh"
-#include "format_general.hh"
 #include "formats.hh"
 #include "exceptions.hh"
 #include "select_format_for_spec.hh"
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index ddb6e2a48..b5e0b3f13 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -20,7 +20,6 @@
 #include "cmd_sync.hh"
 #include "exceptions.hh"
 #include "formats.hh"
-#include "format_general.hh"
 #include "format_user_config.hh"
 #include <paludis/package_database.hh>
 #include <paludis/util/action_queue.hh>
diff --git a/src/clients/cave/colour_formatter.cc b/src/clients/cave/colour_formatter.cc
index d8aac9ae8..ae36b3d6a 100644
--- a/src/clients/cave/colour_formatter.cc
+++ b/src/clients/cave/colour_formatter.cc
@@ -19,7 +19,6 @@
 
 #include "colour_formatter.hh"
 #include "formats.hh"
-#include "format_general.hh"
 #include "format_user_config.hh"
 #include <paludis/util/stringify.hh>
 #include <paludis/name.hh>
diff --git a/src/clients/cave/format_general.cc b/src/clients/cave/format_general.cc
deleted file mode 100644
index 0722bfa77..000000000
--- a/src/clients/cave/format_general.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2008, 2010 Ciaran McCreesh
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis 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., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "format_general.hh"
-#include "format_string.hh"
-#include <paludis/util/map.hh>
-#include <paludis/util/stringify.hh>
-
-using namespace paludis;
-using namespace cave;
-
-std::string
-paludis::cave::format_general_s(const std::string & f, const std::string & s)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('s', s);
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_si(const std::string & f, const std::string & s, const int i)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('s', s);
-    m->insert('i', std::string(i, ' '));
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_kv(const std::string & f, const std::string & k, const std::string & v)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('k', k);
-    m->insert('v', v);
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_sr(const std::string & f, const std::string & s, const std::string & r)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('s', s);
-    m->insert('r', r);
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_spad(const std::string & f, const std::string & s, const int p, const int a, const int d)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('s', s);
-    m->insert('p', stringify(p));
-    m->insert('a', stringify(a));
-    m->insert('d', stringify(d));
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_rhvib(const std::string & f, const std::string & r, const std::string & h,
-        const std::string & v, const int i, const bool b)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('r', r);
-    m->insert('h', h);
-    m->insert('v', v);
-    m->insert('i', std::string(i, ' '));
-    m->insert('b', b ? "true" : "");
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_i(const std::string & f, const int i)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('i', std::string(i, ' '));
-    return format_string(f, m);
-}
-
-std::string
-paludis::cave::format_general_his(const std::string & f, const std::string & h, const int i, const std::string & s)
-{
-    std::shared_ptr<Map<char, std::string> > m(std::make_shared<Map<char, std::string>>());
-    m->insert('h', h);
-    m->insert('i', std::string(i, ' '));
-    m->insert('s', s);
-    return format_string(f, m);
-}
-
diff --git a/src/clients/cave/format_general.hh b/src/clients/cave/format_general.hh
deleted file mode 100644
index cf11de7d2..000000000
--- a/src/clients/cave/format_general.hh
+++ /dev/null
@@ -1,58 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2008, 2010 Ciaran McCreesh
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis 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., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef PALUDIS_GUARD_SRC_CLIENTS_CAVE_FORMAT_GENERAL_HH
-#define PALUDIS_GUARD_SRC_CLIENTS_CAVE_FORMAT_GENERAL_HH 1
-
-#include <paludis/util/attributes.hh>
-#include <string>
-
-namespace paludis
-{
-    namespace cave
-    {
-        std::string format_general_s(const std::string & f, const std::string & s)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_si(const std::string & f, const std::string & s, const int i)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_sr(const std::string & f, const std::string & s, const std::string & r)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_kv(const std::string & f, const std::string & k, const std::string & v)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_rhvib(const std::string & f, const std::string & r,
-                const std::string & h, const std::string & v, const int i, const bool b)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_spad(const std::string & f, const std::string & s,
-                const int p, const int a, const int d)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_i(const std::string & f, const int i)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-
-        std::string format_general_his(const std::string & f, const std::string & h, const int i, const std::string & s)
-            PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
-    }
-}
-
-#endif