Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.

Removed some deprecated code.

3 files changed, 17 insertions, 11 deletions

diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 7a9f5b6dda..c1c5535c1c 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -11,6 +11,7 @@
 use Piwik\Archive;
 use Piwik\Metrics;
 use Piwik\Piwik;
+use Piwik\DataTable;
 
 /**
  * @see plugins/UserSettings/functions.php
@@ -111,7 +112,7 @@ class Piwik_UserSettings_API
         );
 
         $dataTables = array($dataTable);
-        if ($dataTable instanceof Piwik_DataTable_Array) {
+        if ($dataTable instanceof DataTable\Map) {
             $dataTables = $dataTable->getArray();
         }
         foreach ($dataTables AS $table) {
@@ -180,7 +181,7 @@ class Piwik_UserSettings_API
         $visitsSums = $archive->getDataTableFromNumeric('nb_visits');
 
         // check whether given tables are arrays
-        if ($dataTable instanceof Piwik_DataTable_Array) {
+        if ($dataTable instanceof DataTable\Map) {
             $tableArray = $dataTable->getArray();
             $browserTypesArray = $browserTypes->getArray();
             $visitSumsArray = $visitsSums->getArray();
diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
index 0c53938257..40f6b94eb3 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -10,11 +10,14 @@
  */
 
 use Piwik\Common;
+use Piwik\DataAccess\LogAggregator;
 use Piwik\Metrics;
+use Piwik\DataTable;
+use Piwik\PluginsArchiver;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
 
-class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver
+class Piwik_UserSettings_Archiver extends PluginsArchiver
 {
     const LANGUAGE_RECORD_NAME = 'UserSettings_language';
     const PLUGIN_RECORD_NAME = 'UserSettings_plugin';
@@ -69,7 +72,7 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver
         return $tableBrowser;
     }
 
-    protected function aggregateByBrowserType(Piwik_DataTable $tableBrowser)
+    protected function aggregateByBrowserType(DataTable $tableBrowser)
     {
         $tableBrowser->filter('GroupBy', array('label', 'Piwik_getBrowserFamily'));
         $this->insertTable(self::BROWSER_TYPE_RECORD_NAME, $tableBrowser);
@@ -90,7 +93,7 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver
         return $table;
     }
 
-    protected function aggregateByScreenType(Piwik_DataTable $resolutions)
+    protected function aggregateByScreenType(DataTable $resolutions)
     {
         $resolutions->filter('GroupBy', array('label', 'Piwik_getScreenTypeFromResolution'));
         $this->insertTable(self::SCREEN_TYPE_RECORD_NAME, $resolutions);
@@ -113,8 +116,8 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver
 
         $query = $this->getLogAggregator()->queryVisitsByDimension(array(), false, $selects, $metrics = array());
         $data = $query->fetch();
-        $cleanRow = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($data, Metrics::INDEX_NB_VISITS);
-        $table = Piwik_DataTable::makeFromIndexedArray($cleanRow);
+        $cleanRow = LogAggregator::makeArrayOneColumn($data, Metrics::INDEX_NB_VISITS);
+        $table = DataTable::makeFromIndexedArray($cleanRow);
         $this->insertTable(self::PLUGIN_RECORD_NAME, $table);
     }
 
@@ -132,7 +135,7 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver
         $this->insertTable(self::LANGUAGE_RECORD_NAME, $tableLanguage);
     }
 
-    protected function insertTable($recordName, Piwik_DataTable $table)
+    protected function insertTable($recordName, DataTable $table)
     {
         return $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS));
     }
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index ad0e5d9316..ce5a37f707 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -8,12 +8,14 @@
  * @category Piwik_Plugins
  * @package Piwik_UserSettings
  */
+use Piwik\ArchiveProcessor;
+use Piwik\Plugin;
 
 /**
  *
  * @package Piwik_UserSettings
  */
-class Piwik_UserSettings extends Piwik_Plugin
+class Piwik_UserSettings extends Plugin
 {
     /**
      * Mapping between the browser family shortcode and the displayed name
@@ -370,7 +372,7 @@ class Piwik_UserSettings extends Piwik_Plugin
      * by Browser, Browser family, etc. Some reports are built from the logs, some reports
      * are superset of an existing report (eg. Browser family is built from the Browser report)
      */
-    public function archiveDay(Piwik_ArchiveProcessor_Day $archiveProcessor)
+    public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
     {
         $archiving = new Piwik_UserSettings_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {
@@ -381,7 +383,7 @@ class Piwik_UserSettings extends Piwik_Plugin
     /**
      * Period archiving: simply sums up daily archives
      */
-    public function archivePeriod(Piwik_ArchiveProcessor_Period $archiveProcessor)
+    public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
     {
         $archiving = new Piwik_UserSettings_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {