aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-22 10:15:16 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-22 10:15:16 +0000
commit5445a304d47ad6809e11708b96e1af3852547b5f (patch)
tree2d7581095bd78999045a1bdc0e15d9fc438b0e48
parent9257ae6f20703e24aa68ecc8a24650b140d9b0c3 (diff)
downloadpaludis-5445a304d47ad6809e11708b96e1af3852547b5f.tar.gz
paludis-5445a304d47ad6809e11708b96e1af3852547b5f.tar.xz
More file merges
-rw-r--r--paludis/category_name_part.hh8
-rw-r--r--paludis/category_name_part_collection.cc31
-rw-r--r--paludis/category_name_part_collection.hh48
-rw-r--r--paludis/counted_ptr.cc7
-rw-r--r--paludis/counted_ptr.hh18
-rw-r--r--paludis/counted_ptr_error.cc29
-rw-r--r--paludis/counted_ptr_error.hh51
-rw-r--r--paludis/default_config.cc18
-rw-r--r--paludis/default_config.hh25
-rw-r--r--paludis/default_config_error.cc28
-rw-r--r--paludis/default_config_error.hh47
-rw-r--r--paludis/default_environment.cc1
-rw-r--r--paludis/dep_list.cc8
-rw-r--r--paludis/dep_list.hh47
-rw-r--r--paludis/dep_list_entry.cc31
-rw-r--r--paludis/dep_list_entry.hh67
-rw-r--r--paludis/dir_iterator.cc6
-rw-r--r--paludis/dir_iterator.hh16
-rw-r--r--paludis/dir_open_error.cc29
-rw-r--r--paludis/dir_open_error.hh49
-rw-r--r--paludis/fake_repository.cc1
-rw-r--r--paludis/files.m410
-rw-r--r--paludis/package_name_part.hh8
-rw-r--r--paludis/package_name_part_collection.cc31
-rw-r--r--paludis/package_name_part_collection.hh48
-rw-r--r--paludis/qualified_package_name.cc6
-rw-r--r--paludis/qualified_package_name.hh21
-rw-r--r--paludis/qualified_package_name_collection.cc32
-rw-r--r--paludis/qualified_package_name_collection.hh46
-rw-r--r--paludis/qualified_package_name_error.cc28
-rw-r--r--paludis/qualified_package_name_error.hh42
-rw-r--r--paludis/repository.hh2
-rw-r--r--paludis/repository_name.hh6
-rw-r--r--paludis/repository_name_collection.cc32
-rw-r--r--paludis/repository_name_collection.hh46
-rw-r--r--paludis/sequential_collection.hh3
36 files changed, 175 insertions, 751 deletions
diff --git a/paludis/category_name_part.hh b/paludis/category_name_part.hh
index ee2ed3b..d311955 100644
--- a/paludis/category_name_part.hh
+++ b/paludis/category_name_part.hh
@@ -23,6 +23,7 @@
#include <paludis/validated.hh>
#include <paludis/name_error.hh>
#include <paludis/private_implementation_pattern.hh>
+#include <paludis/sorted_collection.hh>
#include <string>
/** \file
@@ -73,6 +74,13 @@ namespace paludis
* \ingroup Database
*/
typedef Validated<std::string, CategoryNamePartValidator> CategoryNamePart;
+
+ /**
+ * Holds a set of CategoryNamePart instances.
+ *
+ * \ingroup Database
+ */
+ typedef SortedCollection<CategoryNamePart> CategoryNamePartCollection;
}
#endif
diff --git a/paludis/category_name_part_collection.cc b/paludis/category_name_part_collection.cc
deleted file mode 100644
index 360cea3..0000000
--- a/paludis/category_name_part_collection.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "category_name_part_collection.hh"
-
-using namespace paludis;
-
-CategoryNamePartCollection::CategoryNamePartCollection()
-{
-}
-
-CategoryNamePartCollection::~CategoryNamePartCollection()
-{
-}
-
diff --git a/paludis/category_name_part_collection.hh b/paludis/category_name_part_collection.hh
deleted file mode 100644
index 040d505..0000000
--- a/paludis/category_name_part_collection.hh
+++ /dev/null
@@ -1,48 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_CATEGORY_NAME_PART_COLLECTION_HH
-#define PALUDIS_GUARD_PALUDIS_CATEGORY_NAME_PART_COLLECTION_HH 1
-
-#include <paludis/category_name_part.hh>
-#include <paludis/sorted_collection.hh>
-
-namespace paludis
-{
- /**
- * Holds a set of CategoryNamePart instances.
- *
- * \ingroup Database
- */
- class CategoryNamePartCollection : public SortedCollection<CategoryNamePart>
- {
- public:
- /**
- * Constructor.
- */
- CategoryNamePartCollection();
-
- /**
- * Destructor.
- */
- virtual ~CategoryNamePartCollection();
- };
-}
-
-#endif
diff --git a/paludis/counted_ptr.cc b/paludis/counted_ptr.cc
index eb9f788..cd7daf8 100644
--- a/paludis/counted_ptr.cc
+++ b/paludis/counted_ptr.cc
@@ -19,3 +19,10 @@
#include "counted_ptr.hh"
+using namespace paludis;
+
+CountedPtrError::CountedPtrError() throw () :
+ Exception("CountedPtr dereference error")
+{
+}
+
diff --git a/paludis/counted_ptr.hh b/paludis/counted_ptr.hh
index 51cac27..7eeec2c 100644
--- a/paludis/counted_ptr.hh
+++ b/paludis/counted_ptr.hh
@@ -22,17 +22,33 @@
#include <paludis/attributes.hh>
#include <paludis/comparison_policy.hh>
-#include <paludis/counted_ptr_error.hh>
+#include <paludis/exception.hh>
/** \file
* Declaration for the CountedPtr template class.
*
* \ingroup Pointer
+ * \ingroup Exception
*/
namespace paludis
{
/**
+ * Thrown when a CountedPtr check fails.
+ *
+ * \ingroup Pointer
+ * \ingroup Exception
+ */
+ class CountedPtrError : public Exception
+ {
+ public:
+ /**
+ * Constructor.
+ */
+ CountedPtrError() throw ();
+ };
+
+ /**
* Contains CountedPtr count policies.
*
* \ingroup Pointer
diff --git a/paludis/counted_ptr_error.cc b/paludis/counted_ptr_error.cc
deleted file mode 100644
index e729370..0000000
--- a/paludis/counted_ptr_error.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * 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 "counted_ptr_error.hh"
-
-using namespace paludis;
-
-CountedPtrError::CountedPtrError() throw () :
- Exception("CountedPtr dereference error")
-{
-}
-
diff --git a/paludis/counted_ptr_error.hh b/paludis/counted_ptr_error.hh
deleted file mode 100644
index f3a39c8..0000000
--- a/paludis/counted_ptr_error.hh
+++ /dev/null
@@ -1,51 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * 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_PALUDIS_COUNTED_PTR_ERROR_HH
-#define PALUDIS_GUARD_PALUDIS_COUNTED_PTR_ERROR_HH 1
-
-#include <paludis/exception.hh>
-
-/** \file
- * Declarations for the CountedPtrError exception class.
- *
- * \ingroup Pointer
- * \ingroup Exception
- */
-
-namespace paludis
-{
- /**
- * Thrown when a CountedPtr check fails.
- *
- * \ingroup Pointer
- * \ingroup Exception
- */
- class CountedPtrError : public Exception
- {
- public:
- /**
- * Constructor.
- */
- CountedPtrError() throw ();
- };
-}
-
-#endif
diff --git a/paludis/default_config.cc b/paludis/default_config.cc
index 0237832..17233a8 100644
--- a/paludis/default_config.cc
+++ b/paludis/default_config.cc
@@ -18,24 +18,28 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "create_insert_iterator.hh"
#include "default_config.hh"
-#include "fs_entry.hh"
#include "dir_iterator.hh"
-#include "getenv.hh"
-#include "key_value_config_file.hh"
-#include "default_config_error.hh"
#include "filter_insert_iterator.hh"
+#include "fs_entry.hh"
+#include "getenv.hh"
#include "is_file_with_extension.hh"
+#include "iterator_utilities.hh"
+#include "key_value_config_file.hh"
+#include "line_config_file.hh"
#include "stringify.hh"
#include "tokeniser.hh"
-#include "line_config_file.hh"
-#include "create_insert_iterator.hh"
-#include "iterator_utilities.hh"
#include <fstream>
#include <algorithm>
using namespace paludis;
+DefaultConfigError::DefaultConfigError(const std::string & msg) throw () :
+ ConfigurationError("Default configuration error: " + msg)
+{
+}
+
DefaultConfig::DefaultConfig()
{
Context context("When loading default configuration:");
diff --git a/paludis/default_config.hh b/paludis/default_config.hh
index 62582fa..8b2a22e 100644
--- a/paludis/default_config.hh
+++ b/paludis/default_config.hh
@@ -21,20 +21,33 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEFAULT_CONFIG_HH
#define PALUDIS_GUARD_PALUDIS_DEFAULT_CONFIG_HH 1
-#include <paludis/instantiation_policy.hh>
-#include <paludis/smart_record.hh>
+#include <paludis/configuration_error.hh>
#include <paludis/fs_entry.hh>
-#include <paludis/qualified_package_name.hh>
-#include <paludis/package_dep_atom.hh>
-#include <paludis/keyword_name.hh>
#include <paludis/indirect_iterator.hh>
-#include <paludis/use_flag_state.hh>
+#include <paludis/instantiation_policy.hh>
+#include <paludis/keyword_name.hh>
+#include <paludis/package_dep_atom.hh>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/smart_record.hh>
#include <paludis/use_flag_name.hh>
+#include <paludis/use_flag_state.hh>
#include <map>
#include <vector>
namespace paludis
{
+ /**
+ * A DefaultConfigError is thrown if a configuration error is encountered
+ * by DefaultConfig.
+ *
+ * \ingroup Exception
+ */
+ class DefaultConfigError : public ConfigurationError
+ {
+ public:
+ DefaultConfigError(const std::string & msg) throw ();
+ };
+
enum RepositoryConfigEntryKeys
{
rce_location,
diff --git a/paludis/default_config_error.cc b/paludis/default_config_error.cc
deleted file mode 100644
index afff703..0000000
--- a/paludis/default_config_error.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * 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 "default_config_error.hh"
-
-using namespace paludis;
-
-DefaultConfigError::DefaultConfigError(const std::string & msg) throw () :
- ConfigurationError("Default configuration error: " + msg)
-{
-}
diff --git a/paludis/default_config_error.hh b/paludis/default_config_error.hh
deleted file mode 100644
index 6f3a4b7..0000000
--- a/paludis/default_config_error.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * 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_PALUDIS_DEFAULT_CONFIG_ERROR_HH
-#define PALUDIS_GUARD_PALUDIS_DEFAULT_CONFIG_ERROR_HH 1
-
-#include <paludis/configuration_error.hh>
-
-/** \file
- * Declarations for the DefaultConfigError class.
- *
- * \ingroup Exception
- */
-
-namespace paludis
-{
- /**
- * A DefaultConfigError is thrown if a configuration error is encountered
- * by DefaultConfig.
- *
- * \ingroup Exception
- */
- class DefaultConfigError : public ConfigurationError
- {
- public:
- DefaultConfigError(const std::string & msg) throw ();
- };
-}
-
-#endif
diff --git a/paludis/default_environment.cc b/paludis/default_environment.cc
index 89b3112..193c4c1 100644
--- a/paludis/default_environment.cc
+++ b/paludis/default_environment.cc
@@ -18,7 +18,6 @@
*/
#include "default_environment.hh"
-#include "default_config_error.hh"
#include "package_database.hh"
#include "portage_repository.hh"
#include "default_config.hh"
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index 091cae2..cc0f4b4 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -36,6 +36,14 @@
using namespace paludis;
+std::ostream &
+paludis::operator<< (std::ostream & s, const DepListEntry & e)
+{
+ s << e.get<dle_name>() << "-" << e.get<dle_version>() << ":"
+ << e.get<dle_slot>() << "::" << e.get<dle_repository>();
+ return s;
+}
+
DepListError::DepListError(const std::string & m) throw () :
Exception(m)
{
diff --git a/paludis/dep_list.hh b/paludis/dep_list.hh
index d5a336f..186db14 100644
--- a/paludis/dep_list.hh
+++ b/paludis/dep_list.hh
@@ -20,17 +20,56 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_LIST_HH
#define PALUDIS_GUARD_PALUDIS_DEP_LIST_HH 1
-#include <paludis/instantiation_policy.hh>
-#include <paludis/private_implementation_pattern.hh>
#include <paludis/dep_atom.hh>
-#include <paludis/environment.hh>
#include <paludis/dep_atom_visitor.hh>
-#include <paludis/dep_list_entry.hh>
+#include <paludis/environment.hh>
+#include <paludis/instantiation_policy.hh>
+#include <paludis/private_implementation_pattern.hh>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/repository_name.hh>
+#include <paludis/slot_name.hh>
+#include <paludis/smart_record.hh>
+#include <paludis/version_spec.hh>
+#include <ostream>
#include <list>
namespace paludis
{
/**
+ * Keys for a DepListEntry.
+ */
+ enum DepListEntryKeys
+ {
+ dle_name, ///< Package name
+ dle_version, ///< Package version
+ dle_slot, ///< Package SLOT
+ dle_repository ///< Repository name
+ };
+
+ /**
+ * Tag for a DepListEntry.
+ */
+ struct DepListEntryTag :
+ SmartRecordTag<comparison_mode::FullComparisonTag, comparison_method::SmartRecordCompareByAllTag>,
+ SmartRecordKeys<DepListEntryKeys, 4>,
+ SmartRecordKey<dle_name, QualifiedPackageName>,
+ SmartRecordKey<dle_version, VersionSpec>,
+ SmartRecordKey<dle_slot, SlotName>,
+ SmartRecordKey<dle_repository, RepositoryName>
+ {
+ };
+
+ /**
+ * A DepListEntry represents an entry in a DepList.
+ */
+ typedef MakeSmartRecord<DepListEntryTag>::Type DepListEntry;
+
+ /**
+ * A DepListEntry can be written to a stream.
+ */
+ std::ostream & operator<< (std::ostream &, const DepListEntry &);
+
+ /**
* Thrown if an error occurs whilst building a DepList.
*/
class DepListError : public Exception
diff --git a/paludis/dep_list_entry.cc b/paludis/dep_list_entry.cc
deleted file mode 100644
index 6a6e34b..0000000
--- a/paludis/dep_list_entry.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "dep_list_entry.hh"
-
-using namespace paludis;
-
-std::ostream &
-paludis::operator<< (std::ostream & s, const DepListEntry & e)
-{
- s << e.get<dle_name>() << "-" << e.get<dle_version>() << ":"
- << e.get<dle_slot>() << "::" << e.get<dle_repository>();
- return s;
-}
-
diff --git a/paludis/dep_list_entry.hh b/paludis/dep_list_entry.hh
deleted file mode 100644
index 72524db..0000000
--- a/paludis/dep_list_entry.hh
+++ /dev/null
@@ -1,67 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_DEP_LIST_ENTRY_HH
-#define PALUDIS_GUARD_PALUDIS_DEP_LIST_ENTRY_HH 1
-
-#include <paludis/smart_record.hh>
-#include <paludis/qualified_package_name.hh>
-#include <paludis/version_spec.hh>
-#include <paludis/slot_name.hh>
-#include <paludis/repository_name.hh>
-#include <ostream>
-
-namespace paludis
-{
- /**
- * Keys for a DepListEntry.
- */
- enum DepListEntryKeys
- {
- dle_name, ///< Package name
- dle_version, ///< Package version
- dle_slot, ///< Package SLOT
- dle_repository ///< Repository name
- };
-
- /**
- * Tag for a DepListEntry.
- */
- struct DepListEntryTag :
- SmartRecordTag<comparison_mode::FullComparisonTag, comparison_method::SmartRecordCompareByAllTag>,
- SmartRecordKeys<DepListEntryKeys, 4>,
- SmartRecordKey<dle_name, QualifiedPackageName>,
- SmartRecordKey<dle_version, VersionSpec>,
- SmartRecordKey<dle_slot, SlotName>,
- SmartRecordKey<dle_repository, RepositoryName>
- {
- };
-
- /**
- * A DepListEntry represents an entry in a DepList.
- */
- typedef MakeSmartRecord<DepListEntryTag>::Type DepListEntry;
-
- /**
- * A DepListEntry can be written to a stream.
- */
- std::ostream & operator<< (std::ostream &, const DepListEntry &);
-}
-
-#endif
diff --git a/paludis/dir_iterator.cc b/paludis/dir_iterator.cc
index 6dcde27..ce5eaaa 100644
--- a/paludis/dir_iterator.cc
+++ b/paludis/dir_iterator.cc
@@ -18,7 +18,6 @@
*/
#include "dir_iterator.hh"
-#include "dir_open_error.hh"
#include "stringify.hh"
#include <sys/types.h>
#include <dirent.h>
@@ -32,6 +31,11 @@
using namespace paludis;
+DirOpenError::DirOpenError(const FSEntry & location, const int errno_value) throw () :
+ FSError("Error opening directory '" + stringify(location) + "': " + strerror(errno_value))
+{
+}
+
DirIterator::DirIterator(const FSEntry & base) :
_base(base),
_items(new std::set<FSEntry>)
diff --git a/paludis/dir_iterator.hh b/paludis/dir_iterator.hh
index 7a1be6c..024519b 100644
--- a/paludis/dir_iterator.hh
+++ b/paludis/dir_iterator.hh
@@ -21,6 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_DIR_ITERATOR_HH 1
#include <paludis/fs_entry.hh>
+#include <paludis/fs_error.hh>
#include <paludis/counted_ptr.hh>
#include <iterator>
#include <set>
@@ -29,11 +30,26 @@
* Declarations for paludis::DirIterator.
*
* \ingroup Filesystem
+ * \ingroup Exception
*/
namespace paludis
{
/**
+ * Raised when a directory open fails.
+ *
+ * \ingroup Exception
+ */
+ class DirOpenError : public FSError
+ {
+ public:
+ /**
+ * Constructor.
+ */
+ DirOpenError(const FSEntry & location, const int errno_value) throw ();
+ };
+
+ /**
* An iterator that iterates over the contents of a directory. At present,
* we read in all the entries at creation time and maintain a CountedPtr
* to an ordered set of FSEntry instances. This may change at some point,
diff --git a/paludis/dir_open_error.cc b/paludis/dir_open_error.cc
deleted file mode 100644
index 550204d..0000000
--- a/paludis/dir_open_error.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "dir_open_error.hh"
-#include "stringify.hh"
-
-using namespace paludis;
-
-DirOpenError::DirOpenError(const FSEntry & location, const int errno_value) throw () :
- FSError("Error opening directory '" + stringify(location) + "': " + strerror(errno_value))
-{
-}
-
diff --git a/paludis/dir_open_error.hh b/paludis/dir_open_error.hh
deleted file mode 100644
index 743b94a..0000000
--- a/paludis/dir_open_error.hh
+++ /dev/null
@@ -1,49 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_DIR_OPEN_ERROR_HH
-#define PALUDIS_GUARD_PALUDIS_DIR_OPEN_ERROR_HH 1
-
-#include <paludis/fs_error.hh>
-#include <paludis/fs_entry.hh>
-
-/** \file
- * Declarations for DirOpenError.
- *
- * \ingroup Exception
- */
-
-namespace paludis
-{
- /**
- * Raised when a directory open fails.
- *
- * \ingroup Exception
- */
- class DirOpenError : public FSError
- {
- public:
- /**
- * Constructor.
- */
- DirOpenError(const FSEntry & location, const int errno_value) throw ();
- };
-}
-
-#endif
diff --git a/paludis/fake_repository.cc b/paludis/fake_repository.cc
index 63f6b23..46c761b 100644
--- a/paludis/fake_repository.cc
+++ b/paludis/fake_repository.cc
@@ -18,7 +18,6 @@
*/
#include "fake_repository.hh"
-#include "package_name_part_collection.hh"
#include "version_metadata.hh"
#include "stringify.hh"
#include <map>
diff --git a/paludis/files.m4 b/paludis/files.m4
index 19aa72f..7774afb 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -14,7 +14,6 @@ add(`any_dep_atom', `hh', `cc')
add(`attributes', `hh', `cc')
add(`block_dep_atom', `hh', `cc')
add(`category_name_part', `hh', `cc')
-add(`category_name_part_collection', `hh', `cc')
add(`comparison_policy', `hh', `cc', `test')
add(`composite_dep_atom', `hh', `cc')
add(`composite_pattern', `hh', `cc')
@@ -22,10 +21,8 @@ add(`config_file', `hh', `cc', `test', `testscript')
add(`configuration_error', `hh', `cc')
add(`container_entry', `hh', `cc', `test')
add(`counted_ptr', `hh', `cc', `test')
-add(`counted_ptr_error', `hh', `cc')
add(`create_insert_iterator', `hh', `cc', `test')
add(`default_config', `hh', `cc')
-add(`default_config_error', `hh', `cc')
add(`default_environment', `hh', `cc')
add(`deleter', `hh', `cc', `test')
add(`dep_atom', `hh', `cc')
@@ -33,14 +30,12 @@ add(`dep_atom_dumper', `hh', `cc', `test')
add(`dep_atom_visitor', `hh', `cc')
add(`dep_lexer', `hh', `cc', `test')
add(`dep_list', `hh', `cc', `test')
-add(`dep_list_entry', `hh', `cc')
add(`dep_parser', `hh', `cc', `test')
add(`dep_string_error', `hh', `cc')
add(`dep_string_lex_error', `hh', `cc')
add(`dep_string_nesting_error', `hh', `cc')
add(`dep_string_parse_error', `hh', `cc')
add(`dir_iterator', `hh', `cc')
-add(`dir_open_error', `hh', `cc')
add(`environment', `hh', `cc')
add(`exception', `hh', `cc')
add(`fake_repository', `hh', `cc')
@@ -62,17 +57,13 @@ add(`name_error', `hh', `cc')
add(`package_database', `hh', `cc', `test')
add(`package_dep_atom', `hh', `cc')
add(`package_name_part', `hh', `cc', `test')
-add(`package_name_part_collection', `hh', `cc')
add(`paludis', `hh', `cc')
add(`portage_repository', `hh', `cc')
add(`private_implementation_pattern', `hh', `cc')
add(`pstream', `hh', `cc', `test')
add(`qualified_package_name', `hh', `cc', `test')
-add(`qualified_package_name_collection', `hh', `cc')
-add(`qualified_package_name_error', `hh', `cc')
add(`repository', `hh', `cc')
add(`repository_name', `hh', `cc')
-add(`repository_name_collection', `hh', `cc')
add(`save', `hh', `cc', `test')
add(`sequential_collection', `hh', `cc')
add(`smart_record', `hh', `cc', `test')
@@ -92,4 +83,3 @@ add(`version_operator', `hh', `cc', `test')
add(`version_spec', `hh', `cc', `test')
add(`virtual_constructor', `hh', `cc', `test')
add(`visitor', `hh', `cc', `test')
-
diff --git a/paludis/package_name_part.hh b/paludis/package_name_part.hh
index 941ff8f..e6fa04a 100644
--- a/paludis/package_name_part.hh
+++ b/paludis/package_name_part.hh
@@ -23,6 +23,7 @@
#include <paludis/validated.hh>
#include <paludis/name_error.hh>
#include <paludis/private_implementation_pattern.hh>
+#include <paludis/sorted_collection.hh>
#include <string>
/** \file
@@ -73,6 +74,13 @@ namespace paludis
* \ingroup Database
*/
typedef Validated<std::string, PackageNamePartValidator> PackageNamePart;
+
+ /**
+ * Holds a set of PackageNamePart instances.
+ *
+ * \ingroup Database
+ */
+ typedef SortedCollection<PackageNamePart> PackageNamePartCollection;
}
#endif
diff --git a/paludis/package_name_part_collection.cc b/paludis/package_name_part_collection.cc
deleted file mode 100644
index a1929b2..0000000
--- a/paludis/package_name_part_collection.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "package_name_part_collection.hh"
-
-using namespace paludis;
-
-PackageNamePartCollection::PackageNamePartCollection()
-{
-}
-
-PackageNamePartCollection::~PackageNamePartCollection()
-{
-}
-
diff --git a/paludis/package_name_part_collection.hh b/paludis/package_name_part_collection.hh
deleted file mode 100644
index 3903e72..0000000
--- a/paludis/package_name_part_collection.hh
+++ /dev/null
@@ -1,48 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_PACKAGE_NAME_PART_COLLECTION_HH
-#define PALUDIS_GUARD_PALUDIS_PACKAGE_NAME_PART_COLLECTION_HH 1
-
-#include <paludis/package_name_part.hh>
-#include <paludis/sorted_collection.hh>
-
-namespace paludis
-{
- /**
- * Holds a set of PackageNamePart instances.
- *
- * \ingroup Database
- */
- class PackageNamePartCollection : public SortedCollection<PackageNamePart>
- {
- public:
- /**
- * Constructor.
- */
- PackageNamePartCollection();
-
- /**
- * Destructor.
- */
- virtual ~PackageNamePartCollection();
- };
-}
-
-#endif
diff --git a/paludis/qualified_package_name.cc b/paludis/qualified_package_name.cc
index 52ef334..e9ce157 100644
--- a/paludis/qualified_package_name.cc
+++ b/paludis/qualified_package_name.cc
@@ -18,11 +18,15 @@
*/
#include "qualified_package_name.hh"
-#include "qualified_package_name_error.hh"
#include "stringify.hh"
using namespace paludis;
+QualifiedPackageNameError::QualifiedPackageNameError(const std::string & s) throw () :
+ NameError(s, "qualified package name")
+{
+}
+
std::string get_category_name(const std::string & s)
{
Context c("When splitting out category name from '" + s + "':");
diff --git a/paludis/qualified_package_name.hh b/paludis/qualified_package_name.hh
index 5113ebf..846cd2b 100644
--- a/paludis/qualified_package_name.hh
+++ b/paludis/qualified_package_name.hh
@@ -23,6 +23,8 @@
#include <paludis/package_name_part.hh>
#include <paludis/category_name_part.hh>
#include <paludis/smart_record.hh>
+#include <paludis/sorted_collection.hh>
+#include <paludis/name_error.hh>
#include <ostream>
namespace paludis
@@ -63,6 +65,25 @@ namespace paludis
* Create a QualifiedPackageName from a string.
*/
QualifiedPackageName make_qualified_package_name(const std::string &);
+
+ /**
+ * Holds a collection of QualifiedPackageName instances.
+ */
+ typedef SortedCollection<QualifiedPackageName> QualifiedPackageNameCollection;
+
+ /**
+ * A QualifiedPackageNameError may be thrown if an invalid name is
+ * assigned to a QualifiedPackageName (alternatively, the exception
+ * raised may be a PackageNamePartError or a CategoryNamePartError).
+ */
+ class QualifiedPackageNameError : public NameError
+ {
+ public:
+ /**
+ * Constructor.
+ */
+ QualifiedPackageNameError(const std::string &) throw ();
+ };
}
#endif
diff --git a/paludis/qualified_package_name_collection.cc b/paludis/qualified_package_name_collection.cc
deleted file mode 100644
index 6c06bb9..0000000
--- a/paludis/qualified_package_name_collection.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "qualified_package_name_collection.hh"
-
-using namespace paludis;
-
-QualifiedPackageNameCollection::QualifiedPackageNameCollection() :
- SortedCollection<QualifiedPackageName>()
-{
-}
-
-QualifiedPackageNameCollection::~QualifiedPackageNameCollection()
-{
-}
-
diff --git a/paludis/qualified_package_name_collection.hh b/paludis/qualified_package_name_collection.hh
deleted file mode 100644
index 2c35bd1..0000000
--- a/paludis/qualified_package_name_collection.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_QUALIFIED_PACKAGE_NAME_COLLECTION_HH
-#define PALUDIS_GUARD_PALUDIS_QUALIFIED_PACKAGE_NAME_COLLECTION_HH 1
-
-#include <paludis/qualified_package_name.hh>
-#include <paludis/sorted_collection.hh>
-
-namespace paludis
-{
- /**
- * Holds a collection of QualifiedPackageName instances.
- */
- class QualifiedPackageNameCollection : public SortedCollection<QualifiedPackageName>
- {
- public:
- /**
- * Constructor.
- */
- QualifiedPackageNameCollection();
-
- /**
- * Destructor.
- */
- virtual ~QualifiedPackageNameCollection();
- };
-}
-
-#endif
diff --git a/paludis/qualified_package_name_error.cc b/paludis/qualified_package_name_error.cc
deleted file mode 100644
index 036a7dd..0000000
--- a/paludis/qualified_package_name_error.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "qualified_package_name_error.hh"
-
-using namespace paludis;
-
-QualifiedPackageNameError::QualifiedPackageNameError(const std::string & s) throw () :
- NameError(s, "qualified package name")
-{
-}
-
diff --git a/paludis/qualified_package_name_error.hh b/paludis/qualified_package_name_error.hh
deleted file mode 100644
index b0f2622..0000000
--- a/paludis/qualified_package_name_error.hh
+++ /dev/null
@@ -1,42 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_QUALIFIED_PACKAGE_NAME_ERROR_HH
-#define PALUDIS_GUARD_PALUDIS_QUALIFIED_PACKAGE_NAME_ERROR_HH 1
-
-#include <paludis/name_error.hh>
-
-namespace paludis
-{
- /**
- * A QualifiedPackageNameError may be thrown if an invalid name is
- * assigned to a QualifiedPackageName (alternatively, the exception
- * raised may be a PackageNamePartError or a CategoryNamePartError).
- */
- class QualifiedPackageNameError : public NameError
- {
- public:
- /**
- * Constructor.
- */
- QualifiedPackageNameError(const std::string &) throw ();
- };
-}
-
-#endif
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 62191aa..485980d 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -24,8 +24,6 @@
#include <paludis/repository_name.hh>
#include <paludis/category_name_part.hh>
#include <paludis/package_name_part.hh>
-#include <paludis/category_name_part_collection.hh>
-#include <paludis/qualified_package_name_collection.hh>
#include <paludis/counted_ptr.hh>
#include <paludis/version_metadata.hh>
#include <paludis/version_spec.hh>
diff --git a/paludis/repository_name.hh b/paludis/repository_name.hh
index 937968f..316a3b0 100644
--- a/paludis/repository_name.hh
+++ b/paludis/repository_name.hh
@@ -23,6 +23,7 @@
#include <paludis/validated.hh>
#include <paludis/private_implementation_pattern.hh>
#include <paludis/name_error.hh>
+#include <paludis/sequential_collection.hh>
#include <string>
/** \file
@@ -73,6 +74,11 @@ namespace paludis
* \ingroup Database
*/
typedef Validated<std::string, RepositoryNameValidator> RepositoryName;
+
+ /**
+ * Holds a collection of RepositoryName instances.
+ */
+ typedef SequentialCollection<RepositoryName> RepositoryNameCollection;
}
#endif
diff --git a/paludis/repository_name_collection.cc b/paludis/repository_name_collection.cc
deleted file mode 100644
index 81704f8..0000000
--- a/paludis/repository_name_collection.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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 "repository_name_collection.hh"
-
-using namespace paludis;
-
-RepositoryNameCollection::RepositoryNameCollection() :
- SequentialCollection<RepositoryName>()
-{
-}
-
-RepositoryNameCollection::~RepositoryNameCollection()
-{
-}
-
diff --git a/paludis/repository_name_collection.hh b/paludis/repository_name_collection.hh
deleted file mode 100644
index 59b2094..0000000
--- a/paludis/repository_name_collection.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@gentoo.org>
- *
- * 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_PALUDIS_REPOSITORY_NAME_COLLECTION_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORY_NAME_COLLECTION_HH 1
-
-#include <paludis/repository_name.hh>
-#include <paludis/sequential_collection.hh>
-
-namespace paludis
-{
- /**
- * Holds a collection of RepositoryName instances.
- */
- class RepositoryNameCollection : public SequentialCollection<RepositoryName>
- {
- public:
- /**
- * Constructor.
- */
- RepositoryNameCollection();
-
- /**
- * Destructor.
- */
- virtual ~RepositoryNameCollection();
- };
-}
-
-#endif
diff --git a/paludis/sequential_collection.hh b/paludis/sequential_collection.hh
index a8df8a9..53689e5 100644
--- a/paludis/sequential_collection.hh
+++ b/paludis/sequential_collection.hh
@@ -39,7 +39,7 @@ namespace paludis
private:
std::list<T_> _items;
- protected:
+ public:
/**
* Constructor.
*/
@@ -47,7 +47,6 @@ namespace paludis
{
}
- public:
/**
* Destructor.
*/