aboutsummaryrefslogtreecommitdiff
path: root/src/clients/inquisitio
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-09 10:23:12 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-09 10:23:12 +0000
commit7a2c9e974666881f44406c88189ae546a67ff0b7 (patch)
treef6846da02bf779a262f58e5042f3fa1bbf7415d3 /src/clients/inquisitio
parent7f7c79fcc67df4fae498ca943e36592d3f7a3ad2 (diff)
downloadpaludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.gz
paludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.xz
Rework Pimp to avoid ImpPtr ickiness
Fixes: ticket:1070
Diffstat (limited to 'src/clients/inquisitio')
-rw-r--r--src/clients/inquisitio/exact_matcher.cc4
-rw-r--r--src/clients/inquisitio/exact_matcher.hh8
-rw-r--r--src/clients/inquisitio/key_extractor.cc4
-rw-r--r--src/clients/inquisitio/key_extractor.hh6
-rw-r--r--src/clients/inquisitio/pcre_matcher.cc4
-rw-r--r--src/clients/inquisitio/pcre_matcher.hh8
-rw-r--r--src/clients/inquisitio/text_matcher.cc4
-rw-r--r--src/clients/inquisitio/text_matcher.hh8
8 files changed, 27 insertions, 19 deletions
diff --git a/src/clients/inquisitio/exact_matcher.cc b/src/clients/inquisitio/exact_matcher.cc
index 7c9f8abc3..210456009 100644
--- a/src/clients/inquisitio/exact_matcher.cc
+++ b/src/clients/inquisitio/exact_matcher.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2010, 2011 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
@@ -39,7 +39,7 @@ namespace paludis
}
ExactMatcher::ExactMatcher(const std::string & s) :
- Pimp<ExactMatcher>(s)
+ _imp(s)
{
}
diff --git a/src/clients/inquisitio/exact_matcher.hh b/src/clients/inquisitio/exact_matcher.hh
index 975da047c..7cc7d3988 100644
--- a/src/clients/inquisitio/exact_matcher.hh
+++ b/src/clients/inquisitio/exact_matcher.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2011 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
@@ -26,9 +26,11 @@
namespace inquisitio
{
class ExactMatcher :
- public Matcher,
- private paludis::Pimp<ExactMatcher>
+ public Matcher
{
+ private:
+ paludis::Pimp<ExactMatcher> _imp;
+
public:
ExactMatcher(const std::string &);
virtual ~ExactMatcher();
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index 625442763..3895cdeac 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011 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
@@ -61,7 +61,7 @@ namespace paludis
KeyExtractor::KeyExtractor(const std::string & k, const bool f, const bool v,
const Environment & e) :
- Pimp<KeyExtractor>(k, f, v, e)
+ _imp(k, f, v, e)
{
}
diff --git a/src/clients/inquisitio/key_extractor.hh b/src/clients/inquisitio/key_extractor.hh
index d9aa9377c..1205a697a 100644
--- a/src/clients/inquisitio/key_extractor.hh
+++ b/src/clients/inquisitio/key_extractor.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2010, 2011 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
@@ -27,9 +27,11 @@
namespace inquisitio
{
class KeyExtractor :
- private paludis::Pimp<KeyExtractor>,
public Extractor
{
+ private:
+ paludis::Pimp<KeyExtractor> _imp;
+
public:
KeyExtractor(const std::string &, const bool flatten, const bool visible_only,
const paludis::Environment &);
diff --git a/src/clients/inquisitio/pcre_matcher.cc b/src/clients/inquisitio/pcre_matcher.cc
index dcf285788..03ff84491 100644
--- a/src/clients/inquisitio/pcre_matcher.cc
+++ b/src/clients/inquisitio/pcre_matcher.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2009, 2010, 2011 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
@@ -41,7 +41,7 @@ namespace paludis
}
PCREMatcher::PCREMatcher(const std::string & s) :
- Pimp<PCREMatcher>(s)
+ _imp(s)
{
}
diff --git a/src/clients/inquisitio/pcre_matcher.hh b/src/clients/inquisitio/pcre_matcher.hh
index 2b2c62884..3120ecd22 100644
--- a/src/clients/inquisitio/pcre_matcher.hh
+++ b/src/clients/inquisitio/pcre_matcher.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2009 Ciaran McCreesh
+ * Copyright (c) 2007, 2009, 2011 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
@@ -26,9 +26,11 @@
namespace inquisitio
{
class PCREMatcher :
- public Matcher,
- private paludis::Pimp<PCREMatcher>
+ public Matcher
{
+ private:
+ paludis::Pimp<PCREMatcher> _imp;
+
public:
PCREMatcher(const std::string &);
virtual ~PCREMatcher();
diff --git a/src/clients/inquisitio/text_matcher.cc b/src/clients/inquisitio/text_matcher.cc
index 736e237a7..131db2b5e 100644
--- a/src/clients/inquisitio/text_matcher.cc
+++ b/src/clients/inquisitio/text_matcher.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2010, 2011 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
@@ -39,7 +39,7 @@ namespace paludis
}
TextMatcher::TextMatcher(const std::string & s) :
- Pimp<TextMatcher>(s)
+ _imp(s)
{
}
diff --git a/src/clients/inquisitio/text_matcher.hh b/src/clients/inquisitio/text_matcher.hh
index eadb72c38..e7b5635c8 100644
--- a/src/clients/inquisitio/text_matcher.hh
+++ b/src/clients/inquisitio/text_matcher.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2011 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
@@ -26,9 +26,11 @@
namespace inquisitio
{
class TextMatcher :
- public Matcher,
- private paludis::Pimp<TextMatcher>
+ public Matcher
{
+ private:
+ paludis::Pimp<TextMatcher> _imp;
+
public:
TextMatcher(const std::string &);
virtual ~TextMatcher();