diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-07-20 08:49:26 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-07-20 08:49:26 +0400 |
commit | 6e38973acc12e9f7fa2d02edee3f8bbbfdbb9694 (patch) | |
tree | 603ff550b4302bd88a2a73f413b59cf61ef9e372 /core/DataTable | |
parent | 03b4953f008c1063e6d7166143ba844e8c6e89cc (diff) |
Removing extra namespace \Core
Diffstat (limited to 'core/DataTable')
-rw-r--r-- | core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php | 2 | ||||
-rw-r--r-- | core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php | 2 | ||||
-rw-r--r-- | core/DataTable/Filter/ReplaceColumnNames.php | 2 | ||||
-rw-r--r-- | core/DataTable/Manager.php | 4 | ||||
-rw-r--r-- | core/DataTable/Renderer.php | 2 | ||||
-rw-r--r-- | core/DataTable/Renderer/Csv.php | 4 | ||||
-rw-r--r-- | core/DataTable/Renderer/Json.php | 4 | ||||
-rw-r--r-- | core/DataTable/Renderer/Php.php | 2 | ||||
-rw-r--r-- | core/DataTable/Renderer/Rss.php | 2 | ||||
-rw-r--r-- | core/DataTable/Renderer/Xml.php | 2 |
10 files changed, 14 insertions, 12 deletions
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php index b2fd046254..21468628f6 100644 --- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php +++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * @package Piwik diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php index 191f9146b3..5ac99ce678 100644 --- a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php +++ b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * Add a new column to the table which is a percentage based on the value resulting diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php index 85fb633194..f0255a8086 100644 --- a/core/DataTable/Filter/ReplaceColumnNames.php +++ b/core/DataTable/Filter/ReplaceColumnNames.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * This filter replaces column names using a mapping table that maps from the old name to the new name. diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php index eab94df8f8..21dc600481 100644 --- a/core/DataTable/Manager.php +++ b/core/DataTable/Manager.php @@ -9,6 +9,8 @@ * @package Piwik */ +use Piwik\Common; + /** * The DataTable_Manager registers all the instanciated DataTable and provides an * easy way to access them. This is used to store all the DataTable during the archiving process. @@ -112,7 +114,7 @@ class Piwik_DataTable_Manager public function deleteTable($id) { if (isset($this->tables[$id])) { - destroy($this->tables[$id]); + Common::destroy($this->tables[$id]); $this->setTableDeleted($id); } } diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 74f4785e90..c8f353a64e 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * A DataTable Renderer can produce an output given a DataTable object. diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index 38c97fa2fc..0e1a3f39d4 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -8,8 +8,8 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Piwik; +use Piwik\Common; /** * CSV export diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php index 2d408d7fda..92e0830316 100644 --- a/core/DataTable/Renderer/Json.php +++ b/core/DataTable/Renderer/Json.php @@ -8,8 +8,8 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Piwik; +use Piwik\Common; /** * JSON export. diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php index 1dc7ee501b..ec66701cbe 100644 --- a/core/DataTable/Renderer/Php.php +++ b/core/DataTable/Renderer/Php.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * Returns the equivalent PHP array for a given DataTable. diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php index 662ad0ad82..2c1fd05114 100644 --- a/core/DataTable/Renderer/Rss.php +++ b/core/DataTable/Renderer/Rss.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Common; +use Piwik\Common; /** * RSS Feed. diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php index adbe5e7206..ba00e6d39e 100644 --- a/core/DataTable/Renderer/Xml.php +++ b/core/DataTable/Renderer/Xml.php @@ -8,7 +8,7 @@ * @category Piwik * @package Piwik */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * XML export of a given DataTable. |