diff --git a/src/SongSave.cxx b/src/SongSave.cxx index 68686aee6..7372cdf49 100644 --- a/src/SongSave.cxx +++ b/src/SongSave.cxx @@ -17,7 +17,7 @@ #include "util/StringAPI.hxx" #include "util/StringBuffer.hxx" #include "util/StringStrip.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx index 00516909b..9812b3b89 100644 --- a/src/command/QueueCommands.cxx +++ b/src/command/QueueCommands.cxx @@ -23,7 +23,7 @@ #include "BulkEdit.hxx" #include "util/Exception.hxx" #include "util/StringAPI.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/db/plugins/simple/DirectorySave.cxx b/src/db/plugins/simple/DirectorySave.cxx index 8a3410c01..366c532e1 100644 --- a/src/db/plugins/simple/DirectorySave.cxx +++ b/src/db/plugins/simple/DirectorySave.cxx @@ -13,7 +13,7 @@ #include "lib/fmt/RuntimeError.hxx" #include "util/StringAPI.hxx" #include "util/StringCompare.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/db/plugins/upnp/ContentDirectoryService.cxx b/src/db/plugins/upnp/ContentDirectoryService.cxx index 1760ae9d7..87786d64e 100644 --- a/src/db/plugins/upnp/ContentDirectoryService.cxx +++ b/src/db/plugins/upnp/ContentDirectoryService.cxx @@ -4,7 +4,7 @@ #include "lib/upnp/ContentDirectoryService.hxx" #include "lib/upnp/Action.hxx" #include "Directory.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx index 87f439762..a0b2f957c 100644 --- a/src/db/plugins/upnp/Directory.cxx +++ b/src/db/plugins/upnp/Directory.cxx @@ -6,7 +6,7 @@ #include "Tags.hxx" #include "tag/Builder.hxx" #include "tag/Table.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include #include diff --git a/src/decoder/plugins/OpusTags.cxx b/src/decoder/plugins/OpusTags.cxx index 84e4e85ec..e42fa4ec4 100644 --- a/src/decoder/plugins/OpusTags.cxx +++ b/src/decoder/plugins/OpusTags.cxx @@ -9,7 +9,7 @@ #include "tag/ParseName.hxx" #include "util/ASCII.hxx" #include "tag/ReplayGainInfo.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "util/StringCompare.hxx" #include "util/StringSplit.hxx" diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx index 3df0aad8f..88fa28951 100644 --- a/src/decoder/plugins/PcmDecoderPlugin.cxx +++ b/src/decoder/plugins/PcmDecoderPlugin.cxx @@ -12,7 +12,7 @@ #include "util/Domain.hxx" #include "util/ByteReverse.hxx" #include "util/StaticFifoBuffer.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "util/MimeType.hxx" #include "Log.hxx" diff --git a/src/encoder/plugins/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx index b2e2e4b4b..05e28d93f 100644 --- a/src/encoder/plugins/LameEncoderPlugin.cxx +++ b/src/encoder/plugins/LameEncoderPlugin.cxx @@ -5,7 +5,7 @@ #include "../EncoderAPI.hxx" #include "pcm/AudioFormat.hxx" #include "lib/fmt/RuntimeError.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "util/ReusableArray.hxx" #include "util/SpanCast.hxx" diff --git a/src/encoder/plugins/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx index 50018d90f..3c2cc2c68 100644 --- a/src/encoder/plugins/TwolameEncoderPlugin.cxx +++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx @@ -5,7 +5,7 @@ #include "../EncoderAPI.hxx" #include "pcm/AudioFormat.hxx" #include "lib/fmt/RuntimeError.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "util/SpanCast.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx index b258932ac..e120b2351 100644 --- a/src/encoder/plugins/VorbisEncoderPlugin.cxx +++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx @@ -9,7 +9,7 @@ #include "pcm/AudioFormat.hxx" #include "config/Domain.hxx" #include "util/StringUtil.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 4cee498e0..d8584f896 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -20,7 +20,7 @@ #include "event/Call.hxx" #include "event/Loop.hxx" #include "util/ASCII.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "util/Domain.hxx" #include "Log.hxx" #include "PluginUnavailable.hxx" diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx index a43e65cdd..8180313a6 100644 --- a/src/mixer/plugins/PulseMixerPlugin.cxx +++ b/src/mixer/plugins/PulseMixerPlugin.cxx @@ -8,7 +8,7 @@ #include "mixer/Mixer.hxx" #include "mixer/Listener.hxx" #include "output/plugins/PulseOutputPlugin.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "config/Block.hxx" #include diff --git a/src/player/CrossFade.cxx b/src/player/CrossFade.cxx index dcffee513..1bf2c4666 100644 --- a/src/player/CrossFade.cxx +++ b/src/player/CrossFade.cxx @@ -5,7 +5,7 @@ #include "Chrono.hxx" #include "MusicChunk.hxx" #include "pcm/AudioFormat.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "util/Domain.hxx" #include "util/Math.hxx" #include "Log.hxx" diff --git a/src/protocol/ArgParser.cxx b/src/protocol/ArgParser.cxx index 018bd8ac8..29b7ec6a2 100644 --- a/src/protocol/ArgParser.cxx +++ b/src/protocol/ArgParser.cxx @@ -6,7 +6,7 @@ #include "Ack.hxx" #include "Chrono.hxx" #include "lib/fmt/ToBuffer.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx index 87c045d3c..8f45067b0 100644 --- a/src/queue/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx @@ -18,7 +18,7 @@ #include "util/CharUtil.hxx" #include "util/StringAPI.hxx" #include "util/StringCompare.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include "Log.hxx" #include diff --git a/src/tag/ReplayGainParser.cxx b/src/tag/ReplayGainParser.cxx index 31b65fe36..e940b720e 100644 --- a/src/tag/ReplayGainParser.cxx +++ b/src/tag/ReplayGainParser.cxx @@ -5,7 +5,7 @@ #include "VorbisComment.hxx" #include "ReplayGainInfo.hxx" #include "util/ASCII.hxx" -#include "util/NumberParser.hxx" +#include "util/CNumberParser.hxx" #include diff --git a/src/util/NumberParser.cxx b/src/util/CNumberParser.cxx similarity index 94% rename from src/util/NumberParser.cxx rename to src/util/CNumberParser.cxx index 9e0b2c760..f099e4391 100644 --- a/src/util/NumberParser.cxx +++ b/src/util/CNumberParser.cxx @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-2-Clause // author: Max Kellermann -#include "NumberParser.hxx" +#include "CNumberParser.hxx" #include #include diff --git a/src/util/NumberParser.hxx b/src/util/CNumberParser.hxx similarity index 100% rename from src/util/NumberParser.hxx rename to src/util/CNumberParser.hxx diff --git a/src/util/meson.build b/src/util/meson.build index f68670fb3..4afaa2506 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -3,7 +3,7 @@ util = static_library( 'Exception.cxx', 'UTF8.cxx', 'MimeType.cxx', - 'NumberParser.cxx', + 'CNumberParser.cxx', 'TruncateString.cxx', 'StringStrip.cxx', 'StringUtil.cxx',