From 1213d979f8f2895e689b05fb2c2f1e8581e9169f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 3 Apr 2019 20:59:00 +0200 Subject: [PATCH] client/*: rename source files, remove "Client" prefix --- meson.build | 24 +++++++++---------- src/Main.cxx | 2 +- src/client/Client.cxx | 2 +- src/client/Client.hxx | 2 +- src/client/{ClientEvent.cxx => Event.cxx} | 0 src/client/{ClientExpire.cxx => Expire.cxx} | 2 +- src/client/{ClientFile.cxx => File.cxx} | 0 src/client/{ClientGlobal.cxx => Global.cxx} | 2 +- src/client/{ClientIdle.cxx => Idle.cxx} | 2 +- .../{ClientInternal.hxx => Internal.hxx} | 0 src/client/{ClientList.cxx => List.cxx} | 3 +-- src/client/{ClientList.hxx => List.hxx} | 0 src/client/{ClientMessage.cxx => Message.cxx} | 2 +- src/client/{ClientMessage.hxx => Message.hxx} | 0 src/client/{ClientNew.cxx => New.cxx} | 4 ++-- src/client/{ClientProcess.cxx => Process.cxx} | 2 +- src/client/{ClientRead.cxx => Read.cxx} | 2 +- .../{ClientSubscribe.cxx => Subscribe.cxx} | 2 +- src/client/{ClientWrite.cxx => Write.cxx} | 0 src/command/CommandListBuilder.cxx | 2 +- src/command/MessageCommands.cxx | 2 +- 21 files changed, 27 insertions(+), 28 deletions(-) rename src/client/{ClientEvent.cxx => Event.cxx} (100%) rename src/client/{ClientExpire.cxx => Expire.cxx} (97%) rename src/client/{ClientFile.cxx => File.cxx} (100%) rename src/client/{ClientGlobal.cxx => Global.cxx} (98%) rename src/client/{ClientIdle.cxx => Idle.cxx} (98%) rename src/client/{ClientInternal.hxx => Internal.hxx} (100%) rename src/client/{ClientList.cxx => List.cxx} (95%) rename src/client/{ClientList.hxx => List.hxx} (100%) rename src/client/{ClientMessage.cxx => Message.cxx} (97%) rename src/client/{ClientMessage.hxx => Message.hxx} (100%) rename src/client/{ClientNew.cxx => New.cxx} (97%) rename src/client/{ClientProcess.cxx => Process.cxx} (99%) rename src/client/{ClientRead.cxx => Read.cxx} (98%) rename src/client/{ClientSubscribe.cxx => Subscribe.cxx} (98%) rename src/client/{ClientWrite.cxx => Write.cxx} (100%) diff --git a/meson.build b/meson.build index 8b13a43e4..b5548733b 100644 --- a/meson.build +++ b/meson.build @@ -206,18 +206,18 @@ sources = [ 'src/decoder/DecoderPrint.cxx', 'src/client/Listener.cxx', 'src/client/Client.cxx', - 'src/client/ClientEvent.cxx', - 'src/client/ClientExpire.cxx', - 'src/client/ClientGlobal.cxx', - 'src/client/ClientIdle.cxx', - 'src/client/ClientList.cxx', - 'src/client/ClientNew.cxx', - 'src/client/ClientProcess.cxx', - 'src/client/ClientRead.cxx', - 'src/client/ClientWrite.cxx', - 'src/client/ClientMessage.cxx', - 'src/client/ClientSubscribe.cxx', - 'src/client/ClientFile.cxx', + 'src/client/Event.cxx', + 'src/client/Expire.cxx', + 'src/client/Global.cxx', + 'src/client/Idle.cxx', + 'src/client/List.cxx', + 'src/client/New.cxx', + 'src/client/Process.cxx', + 'src/client/Read.cxx', + 'src/client/Write.cxx', + 'src/client/Message.cxx', + 'src/client/Subscribe.cxx', + 'src/client/File.cxx', 'src/client/Response.cxx', 'src/Listen.cxx', 'src/LogInit.cxx', diff --git a/src/Main.cxx b/src/Main.cxx index 686813c1c..b392048f2 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -29,7 +29,7 @@ #include "Listen.hxx" #include "client/Listener.hxx" #include "client/Client.hxx" -#include "client/ClientList.hxx" +#include "client/List.hxx" #include "command/AllCommands.hxx" #include "Partition.hxx" #include "tag/Config.hxx" diff --git a/src/client/Client.cxx b/src/client/Client.cxx index 517b98f08..c141edf3c 100644 --- a/src/client/Client.cxx +++ b/src/client/Client.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "Partition.hxx" #include "Instance.hxx" #include "util/Domain.hxx" diff --git a/src/client/Client.hxx b/src/client/Client.hxx index 68c146077..031f5492e 100644 --- a/src/client/Client.hxx +++ b/src/client/Client.hxx @@ -20,7 +20,7 @@ #ifndef MPD_CLIENT_H #define MPD_CLIENT_H -#include "ClientMessage.hxx" +#include "Message.hxx" #include "command/CommandResult.hxx" #include "command/CommandListBuilder.hxx" #include "tag/Mask.hxx" diff --git a/src/client/ClientEvent.cxx b/src/client/Event.cxx similarity index 100% rename from src/client/ClientEvent.cxx rename to src/client/Event.cxx diff --git a/src/client/ClientExpire.cxx b/src/client/Expire.cxx similarity index 97% rename from src/client/ClientExpire.cxx rename to src/client/Expire.cxx index 5ba706c00..32adf5d54 100644 --- a/src/client/ClientExpire.cxx +++ b/src/client/Expire.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "Log.hxx" void diff --git a/src/client/ClientFile.cxx b/src/client/File.cxx similarity index 100% rename from src/client/ClientFile.cxx rename to src/client/File.cxx diff --git a/src/client/ClientGlobal.cxx b/src/client/Global.cxx similarity index 98% rename from src/client/ClientGlobal.cxx rename to src/client/Global.cxx index e23a0fb49..332d254bd 100644 --- a/src/client/ClientGlobal.cxx +++ b/src/client/Global.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "config/Data.hxx" #define CLIENT_TIMEOUT_DEFAULT (60) diff --git a/src/client/ClientIdle.cxx b/src/client/Idle.cxx similarity index 98% rename from src/client/ClientIdle.cxx rename to src/client/Idle.cxx index 18ff6ae35..92098bba1 100644 --- a/src/client/ClientIdle.cxx +++ b/src/client/Idle.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "Response.hxx" #include "Idle.hxx" diff --git a/src/client/ClientInternal.hxx b/src/client/Internal.hxx similarity index 100% rename from src/client/ClientInternal.hxx rename to src/client/Internal.hxx diff --git a/src/client/ClientList.cxx b/src/client/List.cxx similarity index 95% rename from src/client/ClientList.cxx rename to src/client/List.cxx index da95858d2..56c83c88f 100644 --- a/src/client/ClientList.cxx +++ b/src/client/List.cxx @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientList.hxx" -#include "ClientInternal.hxx" +#include "List.hxx" #include "util/DeleteDisposer.hxx" #include diff --git a/src/client/ClientList.hxx b/src/client/List.hxx similarity index 100% rename from src/client/ClientList.hxx rename to src/client/List.hxx diff --git a/src/client/ClientMessage.cxx b/src/client/Message.cxx similarity index 97% rename from src/client/ClientMessage.cxx rename to src/client/Message.cxx index 5c915bc41..7cea01713 100644 --- a/src/client/ClientMessage.cxx +++ b/src/client/Message.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientMessage.hxx" +#include "Message.hxx" #include "util/CharUtil.hxx" static constexpr bool diff --git a/src/client/ClientMessage.hxx b/src/client/Message.hxx similarity index 100% rename from src/client/ClientMessage.hxx rename to src/client/Message.hxx diff --git a/src/client/ClientNew.cxx b/src/client/New.cxx similarity index 97% rename from src/client/ClientNew.cxx rename to src/client/New.cxx index 5f1f36470..6ee1eeedb 100644 --- a/src/client/ClientNew.cxx +++ b/src/client/New.cxx @@ -18,8 +18,8 @@ */ #include "config.h" -#include "ClientInternal.hxx" -#include "ClientList.hxx" +#include "Internal.hxx" +#include "List.hxx" #include "Partition.hxx" #include "Instance.hxx" #include "net/UniqueSocketDescriptor.hxx" diff --git a/src/client/ClientProcess.cxx b/src/client/Process.cxx similarity index 99% rename from src/client/ClientProcess.cxx rename to src/client/Process.cxx index 3926bee71..1f37d6a91 100644 --- a/src/client/ClientProcess.cxx +++ b/src/client/Process.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "protocol/Result.hxx" #include "command/AllCommands.hxx" #include "Log.hxx" diff --git a/src/client/ClientRead.cxx b/src/client/Read.cxx similarity index 98% rename from src/client/ClientRead.cxx rename to src/client/Read.cxx index 1c69b2830..ebb502353 100644 --- a/src/client/ClientRead.cxx +++ b/src/client/Read.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "Partition.hxx" #include "Instance.hxx" #include "event/Loop.hxx" diff --git a/src/client/ClientSubscribe.cxx b/src/client/Subscribe.cxx similarity index 98% rename from src/client/ClientSubscribe.cxx rename to src/client/Subscribe.cxx index 23a40eba7..1a1367841 100644 --- a/src/client/ClientSubscribe.cxx +++ b/src/client/Subscribe.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ClientInternal.hxx" +#include "Internal.hxx" #include "Partition.hxx" #include "Idle.hxx" diff --git a/src/client/ClientWrite.cxx b/src/client/Write.cxx similarity index 100% rename from src/client/ClientWrite.cxx rename to src/client/Write.cxx diff --git a/src/command/CommandListBuilder.cxx b/src/command/CommandListBuilder.cxx index 2ff9a206f..40e2c833a 100644 --- a/src/command/CommandListBuilder.cxx +++ b/src/command/CommandListBuilder.cxx @@ -18,7 +18,7 @@ */ #include "CommandListBuilder.hxx" -#include "client/ClientInternal.hxx" +#include "client/Internal.hxx" #include diff --git a/src/command/MessageCommands.cxx b/src/command/MessageCommands.cxx index fd3592fb0..d52261476 100644 --- a/src/command/MessageCommands.cxx +++ b/src/command/MessageCommands.cxx @@ -20,7 +20,7 @@ #include "MessageCommands.hxx" #include "Request.hxx" #include "client/Client.hxx" -#include "client/ClientList.hxx" +#include "client/List.hxx" #include "client/Response.hxx" #include "Instance.hxx" #include "util/ConstBuffer.hxx"