mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid exposing doc::frames types to the global namespace

Browse Source
This commit is contained in:
Martín Capello 2024-02-07 14:04:35 -03:00
parent 9318ce4941
commit 9ef6c4848d
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/doc/frames_sequence.h
View File

@ -1,5 +1,5 @@
// Aseprite Document Library // Aseprite Document Library
// Copyright (c) 2023 Igara Studio S.A. // Copyright (c) 2023-2024 Igara Studio S.A.
// //
// This file is released under the terms of the MIT license. // This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information. // Read LICENSE.txt for more information.
@ -10,8 +10,6 @@
#include "doc/selected_frames.h" #include "doc/selected_frames.h"
using namespace doc::frames;
namespace doc { namespace doc {
// This class is based in several code of the SelectedFrames class. // This class is based in several code of the SelectedFrames class.
@ -22,10 +20,10 @@ namespace doc {
FramesSequence() {} FramesSequence() {}
FramesSequence(const SelectedFrames& selectedFrames); FramesSequence(const SelectedFrames& selectedFrames);
const_iterator begin() const { return const_iterator(m_ranges.begin()); } frames::const_iterator begin() const { return frames::const_iterator(m_ranges.begin()); }
const_iterator end() const { return const_iterator(m_ranges.end()); } frames::const_iterator end() const { return frames::const_iterator(m_ranges.end()); }
const_reverse_iterator rbegin() const { return const_reverse_iterator(m_ranges.rbegin()); } frames::const_reverse_iterator rbegin() const { return frames::const_reverse_iterator(m_ranges.rbegin()); }
const_reverse_iterator rend() const { return const_reverse_iterator(m_ranges.rend()); } frames::const_reverse_iterator rend() const { return frames::const_reverse_iterator(m_ranges.rend()); }
std::size_t size() const; std::size_t size() const;
std::size_t ranges() const { return m_ranges.size(); } std::size_t ranges() const { return m_ranges.size(); }
@ -44,7 +42,7 @@ namespace doc {
frame_t lowestFrame() const; frame_t lowestFrame() const;
void displace(frame_t frameDelta); void displace(frame_t frameDelta);
Reversed<FramesSequence> reversed() const { return Reversed(*this); } frames::Reversed<FramesSequence> reversed() const { return frames::Reversed(*this); }
FramesSequence makeReverse() const; FramesSequence makeReverse() const;
FramesSequence makePingPong() const; FramesSequence makePingPong() const;
@ -61,7 +59,7 @@ namespace doc {
bool read(std::istream& is); bool read(std::istream& is);
private: private:
Ranges m_ranges; frames::Ranges m_ranges;
}; };
} // namespace doc } // namespace doc

16
src/doc/selected_frames.h
View File

@ -1,5 +1,5 @@
// Aseprite Document Library // Aseprite Document Library
// Copyright (c) 2022 Igara Studio S.A. // Copyright (c) 2022-2024 Igara Studio S.A.
// Copyright (c) 2016-2018 David Capello // Copyright (c) 2016-2018 David Capello
// //
// This file is released under the terms of the MIT license. // This file is released under the terms of the MIT license.
@ -11,8 +11,6 @@
#include "doc/frames_iterators.h" #include "doc/frames_iterators.h"
using namespace doc::frames;
namespace doc { namespace doc {
// The FramesSequence class is based in several code of this class. // The FramesSequence class is based in several code of this class.
@ -20,10 +18,10 @@ namespace doc {
// classes. // classes.
class SelectedFrames { class SelectedFrames {
public: public:
const_iterator begin() const { return const_iterator(m_ranges.begin()); } frames::const_iterator begin() const { return frames::const_iterator(m_ranges.begin()); }
const_iterator end() const { return const_iterator(m_ranges.end()); } frames::const_iterator end() const { return frames::const_iterator(m_ranges.end()); }
const_reverse_iterator rbegin() const { return const_reverse_iterator(m_ranges.rbegin()); } frames::const_reverse_iterator rbegin() const { return frames::const_reverse_iterator(m_ranges.rbegin()); }
const_reverse_iterator rend() const { return const_reverse_iterator(m_ranges.rend()); } frames::const_reverse_iterator rend() const { return frames::const_reverse_iterator(m_ranges.rend()); }
std::size_t size() const; std::size_t size() const;
std::size_t ranges() const { return m_ranges.size(); } std::size_t ranges() const { return m_ranges.size(); }
@ -40,7 +38,7 @@ namespace doc {
frame_t lastFrame() const { return (!m_ranges.empty() ? m_ranges.back().toFrame: -1); } frame_t lastFrame() const { return (!m_ranges.empty() ? m_ranges.back().toFrame: -1); }
void displace(frame_t frameDelta); void displace(frame_t frameDelta);
Reversed<SelectedFrames> reversed() const { return Reversed(*this); } frames::Reversed<SelectedFrames> reversed() const { return frames::Reversed(*this); }
SelectedFrames makeReverse() const; SelectedFrames makeReverse() const;
SelectedFrames makePingPong() const; SelectedFrames makePingPong() const;
@ -57,7 +55,7 @@ namespace doc {
bool read(std::istream& is); bool read(std::istream& is);
private: private:
Ranges m_ranges; frames::Ranges m_ranges;
}; };
} // namespace doc } // namespace doc