Issue 5163 - Reduce the use of FilterPtr

shell/src/FiltersCommand.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus 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 Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <iostream>
 #include <sstream>
 
 #include "FiltersCommand.h"
 
 namespace
 {
-  typedef std::vector<AdblockPlus::FilterPtr> FilterList;
+  typedef std::vector<AdblockPlus::Filter> FilterList;
 
   void ShowFilterList(const FilterList& filters)
   {
     for (FilterList::const_iterator it = filters.begin();
          it != filters.end(); it++)
     {
       std::string type;
-      switch ((*it)->GetType())
+      switch (it->GetType())
       {
         case AdblockPlus::Filter::TYPE_BLOCKING:
           type = "blocking";
           break;
         case AdblockPlus::Filter::TYPE_EXCEPTION:
           type = "exception";
           break;
         case AdblockPlus::Filter::TYPE_ELEMHIDE:
           type = "elemhide";
           break;
         case AdblockPlus::Filter::TYPE_ELEMHIDE_EXCEPTION:
           type = "elemhideexception";
           break;
         case AdblockPlus::Filter::TYPE_COMMENT:
           type = "comment";
           break;
         case AdblockPlus::Filter::TYPE_INVALID:
           type = "invalid";
           break;
         default:
           type = "(unknown type)";
           break;
       }
-      std::cout << (*it)->GetProperty("text").AsString() << " - " <<
+      std::cout << it->GetProperty("text").AsString() << " - " <<
           type << std::endl;
     }
   }
 }
 
 FiltersCommand::FiltersCommand(AdblockPlus::FilterEngine& filterEngine)
   : Command("filters"), filterEngine(filterEngine)
 {
 }
 
@@ skipping 40 matching lines @@
   return name + " [add FILTER|remove FILTER]";
 }
 
 void FiltersCommand::ShowFilters()
 {
   ShowFilterList(filterEngine.GetListedFilters());
 }
 
 void FiltersCommand::AddFilter(const std::string& text)
 {
-  AdblockPlus::FilterPtr filter = filterEngine.GetFilter(text);
-  filter->AddToList();
+  AdblockPlus::Filter filter = filterEngine.GetFilter(text);
+  filter.AddToList();
 }
 
 void FiltersCommand::RemoveFilter(const std::string& text)
 {
-  AdblockPlus::FilterPtr filter = filterEngine.GetFilter(text);
-  if (!filter->IsListed())
+  AdblockPlus::Filter filter = filterEngine.GetFilter(text);
+  if (!filter.IsListed())
   {
     std::cout << "No such filter '" << text << "'" << std::endl;
     return;
   }
-  filter->RemoveFromList();
+  filter.RemoveFromList();
 }