From 0125afb440fb3423f9ad641546eb1c0bf14de1a9 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 12 Jan 2016 10:31:36 +0100
Subject: [PATCH] Refactor for consistency

---
 h5p-default-storage.class.php  | 2 +-
 h5p-file-storage.interface.php | 2 +-
 h5p.classes.php                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php
index fb7fb3d..08d3810 100644
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@@ -124,7 +124,7 @@ class DefaultStorage implements \H5P\FileStorage {
    *
    * @param string $filename
    */
-  public function removeExport($filename) {
+  public function deleteExport($filename) {
     // TODO
   }
 
diff --git a/h5p-file-storage.interface.php b/h5p-file-storage.interface.php
index 959ba8f..7056c6e 100644
--- a/h5p-file-storage.interface.php
+++ b/h5p-file-storage.interface.php
@@ -90,5 +90,5 @@ interface FileStorage {
    *
    * @param string $filename
    */
-  public function removeExport($filename);
+  public function deleteExport($filename);
 }
diff --git a/h5p.classes.php b/h5p.classes.php
index e767f48..7654779 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1406,7 +1406,7 @@ class H5PStorage {
    */
   public function deletePackage($content) {
     $this->h5pC->fs->deleteContent($content['id']);
-    $this->h5pC->fs->removeExport(($content['slug'] ? $content['slug'] . '-' : '') . $content['id'] . '.h5p');
+    $this->h5pC->fs->deleteExport(($content['slug'] ? $content['slug'] . '-' : '') . $content['id'] . '.h5p');
     $this->h5pF->deleteContentData($content['id']);
   }
 
@@ -1588,7 +1588,7 @@ Class H5PExport {
    * @param array $content object
    */
   public function deleteExport($content) {
-    $this->h5pC->fs->removeExport(($content['slug'] ? $content['slug'] . '-' : '') . $content['id'] . '.h5p');
+    $this->h5pC->fs->deleteExport(($content['slug'] ? $content['slug'] . '-' : '') . $content['id'] . '.h5p');
   }
 
   /**
@@ -1778,7 +1778,7 @@ class H5PCore {
         $content['slug'] = $this->generateContentSlug($content);
 
         // Remove old export file
-        $this->fs->removeExport($content['id'] . '.h5p');
+        $this->fs->deleteExport($content['id'] . '.h5p');
       }
 
       if ($this->exportEnabled) {