Refs #4059 Work in progress: Conversion to use Namespaces of dozen more classes

Removed many Piwik_ functions, in Piwik 2 it is best practise to use the methods calls instead

Todo: finish converting core/ classes + convert plugins/ classes to use \Piwik\Plugin namespace + fix build + Merge master

3 files changed, 19 insertions, 15 deletions

diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
index 40f6b94eb3..cdfa858d6e 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -13,6 +13,7 @@ use Piwik\Common;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\Metrics;
 use Piwik\DataTable;
+use Piwik\DataArray;
 use Piwik\PluginsArchiver;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
@@ -125,7 +126,7 @@ class Piwik_UserSettings_Archiver extends PluginsArchiver
     {
         $query = $this->getLogAggregator()->queryVisitsByDimension( array("label" => self::LANGUAGE_DIMENSION) );
         $languageCodes = array_keys(Common::getLanguagesList());
-        $metricsByLanguage = new Piwik_DataArray();
+        $metricsByLanguage = new DataArray();
         while ($row = $query->fetch()) {
             $code = Common::extractLanguageCodeFromBrowserLanguage($row['label'], $languageCodes);
             $metricsByLanguage->sumMetricsVisits($code, $row);
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index 515eacf118..086cd020e7 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -8,16 +8,19 @@
  * @category Piwik_Plugins
  * @package Piwik_UserSettings
  */
+use Piwik\Controller;
+use Piwik\ViewDataTable;
+use Piwik\View;
 
 /**
  *
  * @package Piwik_UserSettings
  */
-class Piwik_UserSettings_Controller extends Piwik_Controller
+class Piwik_UserSettings_Controller extends Controller
 {
     public function index()
     {
-        $view = new Piwik_View('@UserSettings/index');
+        $view = new View('@UserSettings/index');
 
         $view->dataTablePlugin = $this->getPlugin(true);
         $view->dataTableResolution = $this->getResolution(true);
@@ -33,56 +36,56 @@ class Piwik_UserSettings_Controller extends Piwik_Controller
     
     public function getResolution($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
     
     public function getConfiguration($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getOS($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getOSFamily($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getMobileVsDesktop($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getBrowserVersion($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getBrowser($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getBrowserType($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getWideScreen($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getPlugin($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 
     public function getLanguage($fetch = false)
     {
-        return Piwik_ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
+        return ViewDataTable::render($this->pluginName, __FUNCTION__, $fetch);
     }
 }
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index ce5a37f707..618f8fdfd9 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -355,7 +355,7 @@ class Piwik_UserSettings extends Plugin
         foreach ($this->reportMetadata as $report) {
             list($category, $name, $controllerName, $controllerAction) = $report;
             if ($category == false) continue;
-            Piwik_AddWidget($category, $name, $controllerName, $controllerAction);
+            WidgetsList::add($category, $name, $controllerName, $controllerAction);
         }
     }