3 files changed, 18 insertions, 11 deletions

diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index 9075c65532..186c378f83 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -12,6 +12,8 @@ use Piwik\Archive;
 use Piwik\Metrics;
 use Piwik\Period;
 use Piwik\Piwik;
+use Piwik\Date;
+use Piwik\DataTable;
 use Piwik\Site;
 
 /**
@@ -64,7 +66,7 @@ class Piwik_VisitTime_API
      * @param string $date The start date of the period. Cannot refer to multiple dates.
      * @param bool|string $segment The segment.
      * @throws Exception
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getByDayOfWeek($idSite, $period, $date, $segment = false)
     {
@@ -105,7 +107,7 @@ class Piwik_VisitTime_API
         foreach (array(1, 2, 3, 4, 5, 6, 7) as $day) {
             $rows[] = array('label' => $day, 'nb_visits' => 0);
         }
-        $result = new Piwik_DataTable();
+        $result = new DataTable();
         $result->addRowsFromSimpleArray($rows);
         $result->addDataTable($dataTable);
 
@@ -128,9 +130,9 @@ class Piwik_VisitTime_API
 
         if ($period == 'day'
             && ($date == 'today'
-                || $date == Piwik_Date::factory('now', $site->getTimezone())->toString())
+                || $date == Date::factory('now', $site->getTimezone())->toString())
         ) {
-            $currentHour = Piwik_Date::factory('now', $site->getTimezone())->toString('G');
+            $currentHour = Date::factory('now', $site->getTimezone())->toString('G');
             // If no data for today, this is an exception to the API output rule, as we normally return nothing:
             // we shall return all hours of the day, with nb_visits = 0
             if ($table->getRowsCount() == 0) {
@@ -160,7 +162,7 @@ function Piwik_getTimeLabel($label)
 
 /**
  * Returns the day of the week for a date string, without creating a new
- * Piwik_Date instance.
+ * Date instance.
  *
  * @param string $dateStr
  * @return int The day of the week (1-7)
diff --git a/plugins/VisitTime/Archiver.php b/plugins/VisitTime/Archiver.php
index b695ba4558..fd6c1dcc8b 100644
--- a/plugins/VisitTime/Archiver.php
+++ b/plugins/VisitTime/Archiver.php
@@ -9,7 +9,10 @@
  * @package Piwik_VisitTime
  */
 
-class Piwik_VisitTime_Archiver extends Piwik_PluginsArchiver
+use Piwik\Date;
+use Piwik\PluginsArchiver;
+
+class Piwik_VisitTime_Archiver extends PluginsArchiver
 {
     const SERVER_TIME_RECORD_NAME = 'VisitTime_serverTime';
     const LOCAL_TIME_RECORD_NAME = 'VisitTime_localTime';
@@ -46,13 +49,13 @@ class Piwik_VisitTime_Archiver extends Piwik_PluginsArchiver
 
     protected function convertTimeToLocalTimezone(Piwik_DataArray &$array)
     {
-        $date = Piwik_Date::factory($this->getProcessor()->getDateStart()->getDateStartUTC())->toString();
+        $date = Date::factory($this->getProcessor()->getDateStart()->getDateStartUTC())->toString();
         $timezone = $this->getProcessor()->getSite()->getTimezone();
 
         $converted = array();
         foreach ($array->getDataArray() as $hour => $stats) {
             $datetime = $date . ' ' . $hour . ':00:00';
-            $hourInTz = (int)Piwik_Date::factory($datetime, $timezone)->toString('H');
+            $hourInTz = (int)Date::factory($datetime, $timezone)->toString('H');
             $converted[$hourInTz] = $stats;
         }
         return new Piwik_DataArray($converted);
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index abd69f7809..4d73dd8ae0 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -8,15 +8,17 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitTime
  */
+use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Period;
+use Piwik\Plugin;
 use Piwik\Site;
 
 /**
  *
  * @package Piwik_VisitTime
  */
-class Piwik_VisitTime extends Piwik_Plugin
+class Piwik_VisitTime extends Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered
@@ -167,7 +169,7 @@ class Piwik_VisitTime extends Piwik_Plugin
         }
     }
 
-    public function archivePeriod(Piwik_ArchiveProcessor_Period $archiveProcessor)
+    public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
     {
         $archiving = new Piwik_VisitTime_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {
@@ -176,7 +178,7 @@ class Piwik_VisitTime extends Piwik_Plugin
     }
 
 
-    public function archiveDay(Piwik_ArchiveProcessor_Day $archiveProcessor)
+    public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
     {
         $archiving = new Piwik_VisitTime_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {