From 0b5e5f6aaec8d073590935f4370ff3e07385b501 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Sun, 19 Oct 2008 00:06:46 +0100
Subject: [PATCH] Minor renaming

---
 kworship/KwDocument.cpp         | 2 +-
 kworship/archive/KwArchive.cpp  | 4 ++--
 kworship/archive/KwArchive.h    | 2 +-
 kworship/archive/KwDataFile.cpp | 2 +-
 kworship/archive/KwDataFile.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kworship/KwDocument.cpp b/kworship/KwDocument.cpp
index 3dbede2..7dc0536 100644
--- a/kworship/KwDocument.cpp
+++ b/kworship/KwDocument.cpp
@@ -175,7 +175,7 @@ void KwDocument::loadFromArchive(KwArchive* archive)
 {
   Q_ASSERT(archive->isReading());
 
-  KwPlaylistList* playlist = archive->createPlaylist("0");
+  KwPlaylistList* playlist = archive->extractPlaylist("0");
   if (0 != playlist)
   {
     delete m_playlist;
diff --git a/kworship/archive/KwArchive.cpp b/kworship/archive/KwArchive.cpp
index 44d885d..b59bf3b 100644
--- a/kworship/archive/KwArchive.cpp
+++ b/kworship/archive/KwArchive.cpp
@@ -136,14 +136,14 @@ QStringList KwArchive::playlists()
 }
 
 /// Create a new playlist from the archive.
-KwPlaylistList* KwArchive::createPlaylist(QString name)
+KwPlaylistList* KwArchive::extractPlaylist(QString name)
 {
   Q_ASSERT(isReading());
 
   KwDataFile* playlistFile = loadDataFile("playlist/"+name+".kw");
   if (0 != playlistFile)
   {
-    return playlistFile->createPlaylist(0);
+    return playlistFile->extractPlaylist(0);
   }
   return 0;
 }
diff --git a/kworship/archive/KwArchive.h b/kworship/archive/KwArchive.h
index 3b60928..369f36a 100644
--- a/kworship/archive/KwArchive.h
+++ b/kworship/archive/KwArchive.h
@@ -77,7 +77,7 @@ class KwArchive
     QStringList playlists();
 
     /// Create a new playlist from the archive.
-    KwPlaylistList* createPlaylist(QString name);
+    KwPlaylistList* extractPlaylist(QString name);
 
     /// Add a playlist to the archive.
     void addPlaylist(KwPlaylistList* playlist);
diff --git a/kworship/archive/KwDataFile.cpp b/kworship/archive/KwDataFile.cpp
index f54bea0..24befed 100644
--- a/kworship/archive/KwDataFile.cpp
+++ b/kworship/archive/KwDataFile.cpp
@@ -63,7 +63,7 @@ void KwDataFile::insertPlaylist(const KwPlaylistList* playlist, KwResourceManage
 }
 
 /// Create a playlist object from the data.
-KwPlaylistList* KwDataFile::createPlaylist(KwResourceManager* resourceManager) const
+KwPlaylistList* KwDataFile::extractPlaylist(KwResourceManager* resourceManager) const
 {
   QDomElement root = m_domDocument->documentElement();
 
diff --git a/kworship/archive/KwDataFile.h b/kworship/archive/KwDataFile.h
index 4720589..ebff5d1 100644
--- a/kworship/archive/KwDataFile.h
+++ b/kworship/archive/KwDataFile.h
@@ -63,7 +63,7 @@ class KwDataFile
     /** Create a playlist object from the data.
      * @returns Newly created playlist which the user must delete.
      */
-    KwPlaylistList* createPlaylist(KwResourceManager* resourceManager) const;
+    KwPlaylistList* extractPlaylist(KwResourceManager* resourceManager) const;
 
     /*
      * Reading and writing
-- 
2.11.4.GIT