aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-03 19:56:50 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-03 19:56:50 +0000
commit5cda754e130b1a54fbf4a50c77368cdb72f1ee3b (patch)
tree82ab4bc34b367a10e4bf166bf0afd5bc946deb82
parent795c9e6614d175b91a129bba265cc8da7d44352d (diff)
downloadpaludis-5cda754e130b1a54fbf4a50c77368cdb72f1ee3b.tar.gz
paludis-5cda754e130b1a54fbf4a50c77368cdb72f1ee3b.tar.xz
use_flag_state -> name
-rw-r--r--paludis/default_config.hh1
-rw-r--r--paludis/files.m41
-rw-r--r--paludis/name.hh9
-rw-r--r--paludis/repository.hh1
-rw-r--r--paludis/use_flag_state.cc21
-rw-r--r--paludis/use_flag_state.hh36
6 files changed, 9 insertions, 60 deletions
diff --git a/paludis/default_config.hh b/paludis/default_config.hh
index 9e5fa76..4f82539 100644
--- a/paludis/default_config.hh
+++ b/paludis/default_config.hh
@@ -22,7 +22,6 @@
#include <paludis/dep_atom.hh>
#include <paludis/name.hh>
-#include <paludis/use_flag_state.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/iterator.hh>
diff --git a/paludis/files.m4 b/paludis/files.m4
index f53ae3a..fcd7120 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -30,7 +30,6 @@ add(`paludis', `hh', `cc')
add(`portage_repository', `hh', `cc')
add(`repository', `hh', `cc')
add(`test_environment', `hh', `cc')
-add(`use_flag_state', `hh', `cc')
add(`vdb_repository', `hh', `cc')
add(`version_metadata', `hh', `cc')
add(`version_operator', `hh', `cc', `test')
diff --git a/paludis/name.hh b/paludis/name.hh
index 1bd9374..e83c2a7 100644
--- a/paludis/name.hh
+++ b/paludis/name.hh
@@ -387,6 +387,15 @@ namespace paludis
*/
typedef Validated<std::string, KeywordNameValidator> KeywordName;
+ /**
+ * A USE flag can be on, off or unspecified.
+ */
+ enum UseFlagState
+ {
+ use_unspecified, /// unspecified
+ use_disabled, /// disabled
+ use_enabled /// enabled
+ };
}
#endif
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 4c8f0b1..0edaae5 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -21,7 +21,6 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORY_HH 1
#include <paludis/name.hh>
-#include <paludis/use_flag_state.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/counted_ptr.hh>
#include <paludis/util/exception.hh>
diff --git a/paludis/use_flag_state.cc b/paludis/use_flag_state.cc
deleted file mode 100644
index 0532635..0000000
--- a/paludis/use_flag_state.cc
+++ /dev/null
@@ -1,21 +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 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 <paludis/use_flag_state.hh>
-
diff --git a/paludis/use_flag_state.hh b/paludis/use_flag_state.hh
deleted file mode 100644
index 0cf17ef..0000000
--- a/paludis/use_flag_state.hh
+++ /dev/null
@@ -1,36 +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 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_USE_FLAG_STATE_HH
-#define PALUDIS_GUARD_PALUDIS_USE_FLAG_STATE_HH 1
-
-namespace paludis
-{
- /**
- * A USE flag can be on, off or unspecified.
- */
- enum UseFlagState
- {
- use_unspecified, /// unspecified
- use_disabled, /// disabled
- use_enabled /// enabled
- };
-}
-
-#endif