From 84a6fa7da882aae8717298f5e7ca1bdbd9c337ff Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 31 Jul 2013 00:47:37 +0200
Subject: Fixing post merge bugs

---
 core/View/Interface.php          | 25 -------------------------
 core/View/OneClickDone.php       |  4 +++-
 core/View/ReportsByDimension.php |  4 +++-
 core/View/ViewInterface.php      | 27 +++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 core/View/Interface.php
 create mode 100644 core/View/ViewInterface.php

(limited to 'core/View')

diff --git a/core/View/Interface.php b/core/View/Interface.php
deleted file mode 100644
index a1730cebef..0000000000
--- a/core/View/Interface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- * @category Piwik
- * @package Piwik
- */
-
-/**
- * Rendering interface for View and Piwik_Visualization
- *
- * @package Piwik
- */
-interface Piwik_View_Interface
-{
-    /**
-     * Outputs the data.
-     *
-     * @return mixed (image, array, html...)
-     */
-    function render();
-}
diff --git a/core/View/OneClickDone.php b/core/View/OneClickDone.php
index d87be2dfe0..4e898e1ff7 100644
--- a/core/View/OneClickDone.php
+++ b/core/View/OneClickDone.php
@@ -9,6 +9,8 @@
  * @package Piwik
  */
 
+namespace Piwik\View;
+
 /**
  * Post-update view
  *
@@ -21,7 +23,7 @@
  *
  * @package Piwik
  */
-class Piwik_View_OneClickDone
+class OneClickDone
 {
     /**
      * @var string
diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php
index 69ac869eb8..b394736271 100644
--- a/core/View/ReportsByDimension.php
+++ b/core/View/ReportsByDimension.php
@@ -8,6 +8,8 @@
  * @category Piwik
  * @package SmartyPlugins
  */
+namespace Piwik\View;
+
 use Piwik\FrontController;
 use Piwik\View;
 use Piwik\Url;
@@ -19,7 +21,7 @@ use Piwik\Url;
  * loads them by AJAX when clicked. The loaded report is displayed to the right
  * of the report listing.
  */
-class Piwik_View_ReportsByDimension extends View
+class ReportsByDimension extends View
 {
     /**
      * Constructor.
diff --git a/core/View/ViewInterface.php b/core/View/ViewInterface.php
new file mode 100644
index 0000000000..99f3370cad
--- /dev/null
+++ b/core/View/ViewInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @category Piwik
+ * @package Piwik
+ */
+
+namespace Piwik\View;
+
+/**
+ * Rendering interface for View and Piwik_Visualization
+ *
+ * @package Piwik
+ */
+interface ViewInterface
+{
+    /**
+     * Outputs the data.
+     *
+     * @return mixed (image, array, html...)
+     */
+    function render();
+}
-- 
cgit v1.2.3