1 files changed, 20 insertions, 18 deletions

diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 91c005bc9..cf22b55b7 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -10,10 +10,12 @@
 *
 */
 
+namespace OCA\News;
+
 /**
  * This class maps a feed to an entry in the feeds table of the database.
  */
-class OC_News_FolderMapper {
+class FolderMapper {
 
 	const tableName = '*PREFIX*news_folders';
 
@@ -23,7 +25,7 @@ class OC_News_FolderMapper {
 		if ($userid !== null) {
 			$this->userid = $userid;
 		}
-		$this->userid = OCP\USER::getUser();
+		$this->userid = \OCP\USER::getUser();
 	}
 
 	/**
@@ -33,20 +35,20 @@ class OC_News_FolderMapper {
 	 */
 	public function populate($folder){
 		// first add child feeds
-		$feedmapper = new OC_News_FeedMapper();
+		$feedmapper = new FeedMapper();
 		$feeds = $feedmapper->findByFolderId($folder->getId());
 		foreach ($feeds as $feed){
 			$folder->addChild($feed);
 		}
 
 		// and second child folders
-		$stmt = OCP\DB::prepare('SELECT *
+		$stmt = \OCP\DB::prepare('SELECT *
 					FROM ' . self::tableName .
 					' WHERE user_id = ? AND parent_id = ?');
 		$result = $stmt->execute(array($this->userid, $folder->getId()));
 
 		while( $row = $result->fetchRow()){
-			$unpopfolder = new OC_News_Folder($row['name'], $row['id']);
+			$unpopfolder = new Folder($row['name'], $row['id']);
 			$popfolder = self::populate($unpopfolder);
 			$folder->addChild($popfolder);
 		}
@@ -60,13 +62,13 @@ class OC_News_FolderMapper {
 	 * @returns  an instance of OC_News_Folder
 	 */
 	public function find($id){
-		$stmt = OCP\DB::prepare('SELECT *
+		$stmt = \OCP\DB::prepare('SELECT *
 					FROM ' . self::tableName .
 					' WHERE user_id = ? AND id = ?');
 		$result = $stmt->execute(array($this->userid, $id));
 
 		$row = $result->fetchRow();
-		$folder = new OC_News_Folder($row['name'], $row['id']);
+		$folder = new Folder($row['name'], $row['id']);
 
 		return $folder;
 	}
@@ -77,14 +79,14 @@ class OC_News_FolderMapper {
 	 * @returns
 	 */
 	public function findWithItems($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?');
+		$stmt = \OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?');
 		$result = $stmt->execute(array($id));
 		$row = $result->fetchRow();
 		$url = $row['url'];
 		$title = $row['title'];
-		$feed = new OC_News_Feed($url, $title, null,$id);
+		$feed = new Feed($url, $title, null,$id);
 
-		$itemMapper = new OC_News_ItemMapper($feed);
+		$itemMapper = new ItemMapper($feed);
 		$items = $itemMapper->findAll();
 		$feed->setItems($items);
 
@@ -96,8 +98,8 @@ class OC_News_FolderMapper {
 	 * @param folder the folder to be saved
 	 * @returns The id of the folder in the database table.
 	 */
-	public function save(OC_News_Folder $folder){
-		$query = OCP\DB::prepare('
+	public function save(Folder $folder){
+		$query = \OCP\DB::prepare('
 			INSERT INTO ' . self::tableName .
 			'(name, parent_id, user_id)
 			VALUES (?, ?, ?)
@@ -106,7 +108,7 @@ class OC_News_FolderMapper {
 		$name = $folder->getName();
 
 		if(empty($name)) {
-			$l = OC_L10N::get('news');
+			$l = \OC_L10N::get('news');
 			$name = $l->t('no name');
 		}
 
@@ -118,13 +120,13 @@ class OC_News_FolderMapper {
 		$this->userid
 		);
 		$query->execute($params);
-		$folderid = OCP\DB::insertid(self::tableName);
+		$folderid = \OCP\DB::insertid(self::tableName);
 
 		$folder->setId($folderid);
 		return $folderid;
 	}
 
-	public function delete(OC_News_Folder $folder){
+	public function delete(Folder $folder){
 		$folderid = $folder->getId();
 		return deleteById(folderid);
 	}
@@ -135,17 +137,17 @@ class OC_News_FolderMapper {
 		}
 
 		// delete child folders
-		$stmt = OCP\DB::prepare('SELECT id FROM ' . self::tableName .' WHERE parent_id = ?');
+		$stmt = \OCP\DB::prepare('SELECT id FROM ' . self::tableName .' WHERE parent_id = ?');
 		$result = $stmt->execute(array($folderid));
 		while ($row = $result->fetchRow()) {
 			if (!self::deleteById($row['id']))
 				return false;
 		}
 
-		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE id = ?');
+		$stmt = \OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE id = ?');
 		$result = $stmt->execute(array($folderid));
 
-		$feedMapper = new OC_News_FeedMapper();
+		$feedMapper = new FeedMapper();
 		//TODO: handle the value that the execute returns
 		if(!$feedMapper->deleteAll($folderid))
 			return false;