From 5a3828ed4adb16959ad6be860a00cd90bcc967a6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 24 Apr 2019 15:15:19 +0200
Subject: [PATCH] sticker/*: rename source files, drop "Sticker" prefix

---
 meson.build                                       | 4 ++--
 src/Instance.cxx                                  | 2 +-
 src/Main.cxx                                      | 2 +-
 src/command/AllCommands.cxx                       | 2 +-
 src/command/StickerCommands.cxx                   | 4 ++--
 src/sticker/{StickerDatabase.cxx => Database.cxx} | 2 +-
 src/sticker/{StickerDatabase.hxx => Database.hxx} | 0
 src/sticker/{StickerPrint.cxx => Print.cxx}       | 2 +-
 src/sticker/{StickerPrint.hxx => Print.hxx}       | 0
 src/sticker/SongSticker.cxx                       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename src/sticker/{StickerDatabase.cxx => Database.cxx} (99%)
 rename src/sticker/{StickerDatabase.hxx => Database.hxx} (100%)
 rename src/sticker/{StickerPrint.cxx => Print.cxx} (97%)
 rename src/sticker/{StickerPrint.hxx => Print.hxx} (100%)

diff --git a/meson.build b/meson.build
index 1355edc2b..d46338751 100644
--- a/meson.build
+++ b/meson.build
@@ -350,8 +350,8 @@ endif
 if sqlite_dep.found()
   sources += [
     'src/command/StickerCommands.cxx',
-    'src/sticker/StickerDatabase.cxx',
-    'src/sticker/StickerPrint.cxx',
+    'src/sticker/Database.cxx',
+    'src/sticker/Print.cxx',
     'src/sticker/SongSticker.cxx',
   ]
 endif
diff --git a/src/Instance.cxx b/src/Instance.cxx
index 5b6600420..0103498ad 100644
--- a/src/Instance.cxx
+++ b/src/Instance.cxx
@@ -35,7 +35,7 @@
 #include "storage/StorageInterface.hxx"
 
 #ifdef ENABLE_SQLITE
-#include "sticker/StickerDatabase.hxx"
+#include "sticker/Database.hxx"
 #include "sticker/SongSticker.hxx"
 #endif
 #endif
diff --git a/src/Main.cxx b/src/Main.cxx
index d353fe262..9a2919d79 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -82,7 +82,7 @@
 #endif
 
 #ifdef ENABLE_SQLITE
-#include "sticker/StickerDatabase.hxx"
+#include "sticker/Database.hxx"
 #endif
 
 #ifdef ENABLE_ARCHIVE
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index b0b7f57e9..23c3589e0 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -46,7 +46,7 @@
 
 #ifdef ENABLE_SQLITE
 #include "StickerCommands.hxx"
-#include "sticker/StickerDatabase.hxx"
+#include "sticker/Database.hxx"
 #endif
 
 #include <assert.h>
diff --git a/src/command/StickerCommands.cxx b/src/command/StickerCommands.cxx
index f68462798..940a96943 100644
--- a/src/command/StickerCommands.cxx
+++ b/src/command/StickerCommands.cxx
@@ -23,8 +23,8 @@
 #include "db/Interface.hxx"
 #include "sticker/Sticker.hxx"
 #include "sticker/SongSticker.hxx"
-#include "sticker/StickerPrint.hxx"
-#include "sticker/StickerDatabase.hxx"
+#include "sticker/Print.hxx"
+#include "sticker/Database.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
 #include "Partition.hxx"
diff --git a/src/sticker/StickerDatabase.cxx b/src/sticker/Database.cxx
similarity index 99%
rename from src/sticker/StickerDatabase.cxx
rename to src/sticker/Database.cxx
index 4c1e2e883..0c0d5f3c3 100644
--- a/src/sticker/StickerDatabase.cxx
+++ b/src/sticker/Database.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "StickerDatabase.hxx"
+#include "Database.hxx"
 #include "Sticker.hxx"
 #include "lib/sqlite/Util.hxx"
 #include "fs/Path.hxx"
diff --git a/src/sticker/StickerDatabase.hxx b/src/sticker/Database.hxx
similarity index 100%
rename from src/sticker/StickerDatabase.hxx
rename to src/sticker/Database.hxx
diff --git a/src/sticker/StickerPrint.cxx b/src/sticker/Print.cxx
similarity index 97%
rename from src/sticker/StickerPrint.cxx
rename to src/sticker/Print.cxx
index bd71bceb3..01ab1e090 100644
--- a/src/sticker/StickerPrint.cxx
+++ b/src/sticker/Print.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "StickerPrint.hxx"
+#include "Print.hxx"
 #include "Sticker.hxx"
 #include "client/Response.hxx"
 
diff --git a/src/sticker/StickerPrint.hxx b/src/sticker/Print.hxx
similarity index 100%
rename from src/sticker/StickerPrint.hxx
rename to src/sticker/Print.hxx
diff --git a/src/sticker/SongSticker.cxx b/src/sticker/SongSticker.cxx
index 39b92f11d..1c43f4d04 100644
--- a/src/sticker/SongSticker.cxx
+++ b/src/sticker/SongSticker.cxx
@@ -19,7 +19,7 @@
 
 #include "SongSticker.hxx"
 #include "Sticker.hxx"
-#include "StickerDatabase.hxx"
+#include "Database.hxx"
 #include "song/LightSong.hxx"
 #include "db/Interface.hxx"
 #include "util/Alloc.hxx"