Refs #3741 Resuming PHP Namespaces conversion of Piwik core, mostly finished core/ conversion

2 files changed, 6 insertions, 6 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 8d427b9813..642071148c 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -15,7 +15,7 @@ use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Controller;
 use Piwik\Http;
-use Piwik\Piwik_Updater;
+use Piwik\Updater;
 use Piwik\View;
 use Piwik\Version;
 use Piwik\UpdateCheck;
@@ -238,7 +238,7 @@ class Piwik_CoreUpdater_Controller extends Controller
 
     protected function runUpdaterAndExit()
     {
-        $updater = new Piwik_Updater();
+        $updater = new Updater();
         $componentsWithUpdateFile = Piwik_CoreUpdater::getComponentUpdates($updater);
         if (empty($componentsWithUpdateFile)) {
             Piwik::redirectToModule('CoreHome');
@@ -348,7 +348,7 @@ class Piwik_CoreUpdater_Controller extends Controller
         foreach ($componentsWithUpdateFile as $name => $filenames) {
             try {
                 $this->warningMessages = array_merge($this->warningMessages, $updater->update($name));
-            } catch (Piwik_Updater_UpdateErrorException $e) {
+            } catch (Updater_UpdateErrorException $e) {
                 $this->errorMessages[] = $e->getMessage();
                 if ($name == 'core') {
                     $this->coreError = true;
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index b682a705d5..7e4d2497a5 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -11,7 +11,7 @@
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\FrontController;
-use Piwik\Piwik_Updater;
+use Piwik\Updater;
 use Piwik\Version;
 use Piwik\UpdateCheck;
 use Piwik\Plugin;
@@ -34,7 +34,7 @@ class Piwik_CoreUpdater extends Plugin
         return $hooks;
     }
 
-    public static function getComponentUpdates(Piwik_Updater $updater)
+    public static function getComponentUpdates(Updater $updater)
     {
         $updater->addComponentToCheck('core', Version::VERSION);
         $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPlugins();
@@ -55,7 +55,7 @@ class Piwik_CoreUpdater extends Plugin
         $module = Common::getRequestVar('module', '', 'string');
         $action = Common::getRequestVar('action', '', 'string');
 
-        $updater = new Piwik_Updater();
+        $updater = new Updater();
         $updater->addComponentToCheck('core', Version::VERSION);
         $updates = $updater->getComponentsWithNewVersion();
         if (!empty($updates)) {