5 files changed, 29 insertions, 19 deletions
diff --git a/phpBB/phpbb/style/extension_path_provider.php b/phpBB/phpbb/style/extension_path_provider.php
index ec1d85f821..104cda757b 100644
--- a/phpBB/phpbb/style/extension_path_provider.php
+++ b/phpBB/phpbb/style/extension_path_provider.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\style;
+
 /**
 * @ignore
 */
@@ -22,7 +24,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_style_extension_path_provider extends phpbb_extension_provider implements phpbb_style_path_provider_interface
+class extension_path_provider extends \phpbb\extension\provider implements \phpbb\style\path_provider_interface
 {
 	/**
 	* Optional prefix for style paths searched within extensions.
@@ -36,7 +38,7 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 
 	/**
 	* A provider of paths to be searched for styles
-	* @var phpbb_style_path_provider
+	* @var \phpbb\style\path_provider
 	*/
 	protected $base_path_provider;
 
@@ -46,12 +48,12 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 	/**
 	* Constructor stores extension manager
 	*
-	* @param phpbb_extension_manager $extension_manager phpBB extension manager
-	* @param phpbb_style_path_provider $base_path_provider A simple path provider
+	* @param \phpbb\extension\manager $extension_manager phpBB extension manager
+	* @param \phpbb\style\path_provider $base_path_provider A simple path provider
 	*            to provide paths to be located in extensions
 	* @param string		$phpbb_root_path	phpBB root path
 	*/
-	public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider, $phpbb_root_path)
+	public function __construct(\phpbb\extension\manager $extension_manager, \phpbb\style\path_provider $base_path_provider, $phpbb_root_path)
 	{
 		parent::__construct($extension_manager);
 		$this->base_path_provider = $base_path_provider;
diff --git a/phpBB/phpbb/style/path_provider.php b/phpBB/phpbb/style/path_provider.php
index 731d682e88..0a5906d0a8 100644
--- a/phpBB/phpbb/style/path_provider.php
+++ b/phpBB/phpbb/style/path_provider.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\style;
+
 /**
 * @ignore
 */
@@ -22,7 +24,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_provider_interface
+class path_provider implements \IteratorAggregate, \phpbb\style\path_provider_interface
 {
 	protected $paths = array();
 
@@ -57,6 +59,6 @@ class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_p
 	*/
 	public function getIterator()
 	{
-		return new ArrayIterator($this->paths);
+		return new \ArrayIterator($this->paths);
 	}
 }
diff --git a/phpBB/phpbb/style/path_provider_interface.php b/phpBB/phpbb/style/path_provider_interface.php
index 1a6153a4d3..beb0da29df 100644
--- a/phpBB/phpbb/style/path_provider_interface.php
+++ b/phpBB/phpbb/style/path_provider_interface.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\style;
+
 /**
 * @ignore
 */
@@ -22,7 +24,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-interface phpbb_style_path_provider_interface extends Traversable
+interface path_provider_interface extends \Traversable
 {
 	/**
 	* Defines a prefix to use for style paths in extensions
diff --git a/phpBB/phpbb/style/resource_locator.php b/phpBB/phpbb/style/resource_locator.php
index 4cf767c062..848624ee69 100644
--- a/phpBB/phpbb/style/resource_locator.php
+++ b/phpBB/phpbb/style/resource_locator.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\style;
+
 /**
 * @ignore
 */
@@ -30,7 +32,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_style_resource_locator implements phpbb_template_locator
+class resource_locator implements \phpbb\template\locator
 {
 	/**
 	* Paths to style directories.
diff --git a/phpBB/phpbb/style/style.php b/phpBB/phpbb/style/style.php
index 034f518091..d3bacdb1ec 100644
--- a/phpBB/phpbb/style/style.php
+++ b/phpBB/phpbb/style/style.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\style;
+
 /**
 * @ignore
 */
@@ -19,12 +21,12 @@ if (!defined('IN_PHPBB'))
 * Base Style class.
 * @package phpBB3
 */
-class phpbb_style
+class style
 {
 	/**
 	* Template class.
 	* Handles everything related to templates.
-	* @var phpbb_template
+	* @var \phpbb\template\template
 	*/
 	private $template;
 
@@ -42,25 +44,25 @@ class phpbb_style
 
 	/**
 	* phpBB config instance
-	* @var phpbb_config
+	* @var \phpbb\config\config
 	*/
 	private $config;
 
 	/**
 	* Current user
-	* @var phpbb_user
+	* @var \phpbb\user
 	*/
 	private $user;
 
 	/**
 	* Style resource locator
-	* @var phpbb_style_resource_locator
+	* @var \phpbb\style\resource_locator
 	*/
 	private $locator;
 
 	/**
 	* Style path provider
-	* @var phpbb_style_path_provider
+	* @var \phpbb\style\path_provider
 	*/
 	private $provider;
 
@@ -69,11 +71,11 @@ class phpbb_style
 	*
 	* @param string $phpbb_root_path phpBB root path
 	* @param user $user current user
-	* @param phpbb_style_resource_locator $locator style resource locator
-	* @param phpbb_style_path_provider $provider style path provider
-	* @param phpbb_template $template template
+	* @param \phpbb\style\resource_locator $locator style resource locator
+	* @param \phpbb\style\path_provider $provider style path provider
+	* @param \phpbb\template\template $template template
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_template $template)
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, \phpbb\style\resource_locator $locator, \phpbb\style\path_provider_interface $provider, \phpbb\template\template $template)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;