Move cmdline_is_search_pattern() to aptitude::matching::is_pattern().

8 files changed, 8 insertions, 23 deletions

diff --git a/src/cmdline/cmdline_action.cc b/src/cmdline/cmdline_action.cc
index d2bb7683..7d886cd2 100644
--- a/src/cmdline/cmdline_action.cc
+++ b/src/cmdline/cmdline_action.cc
@@ -484,7 +484,7 @@ bool cmdline_applyaction(string s,
       return false;
     }
 
-  if(!cmdline_is_search_pattern(package))
+  if(!aptitude::matching::is_pattern(package))
     {
       pkgCache::PkgIterator pkg=(*apt_cache_file)->FindPkg(package.c_str());
       if(pkg.end())
diff --git a/src/cmdline/cmdline_download.cc b/src/cmdline/cmdline_download.cc
index de9d0a3b..c85bb8e6 100644
--- a/src/cmdline/cmdline_download.cc
+++ b/src/cmdline/cmdline_download.cc
@@ -66,7 +66,7 @@ int cmdline_download(int argc, char *argv[])
 
       std::vector<pkgCache::PkgIterator> packages;
 
-      if(!cmdline_is_search_pattern(name))
+      if(!aptitude::matching::is_pattern(name))
 	{
 	  pkgCache::PkgIterator pkg=(*apt_cache_file)->FindPkg(name);
 	  if(pkg.end())
diff --git a/src/cmdline/cmdline_extract_cache_subset.cc b/src/cmdline/cmdline_extract_cache_subset.cc
index 2041c107..c4de362c 100644
--- a/src/cmdline/cmdline_extract_cache_subset.cc
+++ b/src/cmdline/cmdline_extract_cache_subset.cc
@@ -1,6 +1,6 @@
 // cmdline_extract_cache_subset.cc
 //
-//   Copyright (C) 2008 Daniel Burrows
+//   Copyright (C) 2008-2009 Daniel Burrows
 //
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the GNU General Public License as
@@ -71,7 +71,7 @@ namespace aptitude
 	    {
 	      std::string arg(argv[i]);
 
-	      if(!cmdline_is_search_pattern(arg))
+	      if(!aptitude::matching::is_pattern(arg))
 		{
 		  pkgCache::PkgIterator pIt = (*apt_cache_file)->FindPkg(arg);
 		  if(pIt.end())
diff --git a/src/cmdline/cmdline_show.cc b/src/cmdline/cmdline_show.cc
index 2f174196..bbdbf086 100644
--- a/src/cmdline/cmdline_show.cc
+++ b/src/cmdline/cmdline_show.cc
@@ -532,7 +532,7 @@ bool do_cmdline_show(string s, int verbose)
       sourcestr = default_release;
     }
 
-  bool is_pattern = cmdline_is_search_pattern(name);
+  bool is_pattern = aptitude::matching::is_pattern(name);
   pkgCache::PkgIterator pkg;
 
   if(!is_pattern)
diff --git a/src/cmdline/cmdline_user_tag.cc b/src/cmdline/cmdline_user_tag.cc
index 48d6e5a8..65ad13a3 100644
--- a/src/cmdline/cmdline_user_tag.cc
+++ b/src/cmdline/cmdline_user_tag.cc
@@ -1,6 +1,6 @@
 // cmdline_user_tag.cc
 //
-//   Copyright (C) 2008 Daniel Burrows
+//   Copyright (C) 2008-2009 Daniel Burrows
 //
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the GNU General Public License as
@@ -109,7 +109,7 @@ namespace aptitude
       bool all_ok = true;
       for(int i = 2; i < argc; ++i)
 	{
-	  if(!cmdline_is_search_pattern(argv[i]))
+	  if(!aptitude::matching::is_pattern(argv[i]))
 	    {
 	      pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(argv[i]);
 	      if(pkg.end())
diff --git a/src/cmdline/cmdline_util.cc b/src/cmdline/cmdline_util.cc
index d4e8cd7d..1ac3a518 100644
--- a/src/cmdline/cmdline_util.cc
+++ b/src/cmdline/cmdline_util.cc
@@ -431,11 +431,6 @@ download_manager::result cmdline_do_download(download_manager *m,
   return finish_res;
 }
 
-bool cmdline_is_search_pattern(const std::string &s)
-{
-  return s.find_first_of("~?") != s.npos;
-}
-
 namespace aptitude
 {
   namespace cmdline
diff --git a/src/cmdline/cmdline_util.h b/src/cmdline/cmdline_util.h
index 7415d84d..df04f4a1 100644
--- a/src/cmdline/cmdline_util.h
+++ b/src/cmdline/cmdline_util.h
@@ -71,16 +71,6 @@ bool cmdline_parse_source(const string &input,
 download_manager::result cmdline_do_download(download_manager *m,
 					     int verbose);
 
-/** \brief Test whether a string looks like a search pattern.
- *
- *  \param s  the string to test.
- *
- *  Looks for tildes and question marks.
- *
- *  \return \b true if the string qualifies as a search pattern.
- */
-bool cmdline_is_search_pattern(const std::string &s);
-
 namespace aptitude
 {
   namespace cmdline
diff --git a/src/cmdline/cmdline_why.cc b/src/cmdline/cmdline_why.cc
index 488a1132..2638b672 100644
--- a/src/cmdline/cmdline_why.cc
+++ b/src/cmdline/cmdline_why.cc
@@ -1045,7 +1045,7 @@ bool interpret_why_args(const std::vector<std::string> &args,
     {
       // If there isn't a tilde, treat it as an exact package name.
       cwidget::util::ref_ptr<pattern> p;
-      if(!cmdline_is_search_pattern(*it))
+      if(!aptitude::matching::is_pattern(*it))
 	{
 	  pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(*it);
 	  if(pkg.end())