Use C++20 features to simplify the SystemLocation class.

powertab · Feb 10, 2024 · 9e2fdff · 9e2fdff
1 parent a107664
commit 9e2fdff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 deletions.
diff --git a/source/midi/midifile.cpp b/source/midi/midifile.cpp
@@ -87,7 +87,6 @@ static SystemLocation moveToNextBar(MidiEventList &event_list, int ticks,
                                     RepeatController &repeat_controller)
 {
     SystemLocation prev_location = location;
-    SystemLocation new_location;
 
     // Move to the next barline and follow any directions / repeats / alternate
     // endings.

diff --git a/source/score/precompiled.h b/source/score/precompiled.h
@@ -18,5 +18,4 @@
 #include <unordered_map>
 #include <vector>
 
-#include <boost/operators.hpp>
 #include <boost/rational.hpp>
diff --git a/source/score/systemlocation.cpp b/source/score/systemlocation.cpp
@@ -25,25 +25,6 @@ SystemLocation::SystemLocation(int system, int position)
 {
 }
 
-SystemLocation::SystemLocation()
-    : mySystem(0),
-      myPosition(0)
-{
-}
-
-bool SystemLocation::operator<(const SystemLocation &location) const
-{
-    if (mySystem == location.mySystem)
-        return myPosition < location.myPosition;
-    else
-        return mySystem < location.mySystem;
-}
-
-bool SystemLocation::operator==(const SystemLocation &location) const
-{
-    return mySystem == location.mySystem && myPosition == location.myPosition;
-}
-
 void SystemLocation::setPosition(int position)
 {
     myPosition = position;

diff --git a/source/score/systemlocation.h b/source/score/systemlocation.h
@@ -18,22 +18,16 @@
 #ifndef SCORE_SYSTEMLOCATION_H
 #define SCORE_SYSTEMLOCATION_H
 
-#include <boost/operators.hpp>
 #include <memory>
 
 /// Convenience class to represent a location in a system.
-class SystemLocation :
-        // Generate != from operator==
-        boost::equality_comparable<SystemLocation>,
-        // Generate <=, >, >= from operator<
-        boost::less_than_comparable<SystemLocation>
+class SystemLocation
 {
 public:
-    SystemLocation();
+    SystemLocation() = default;
     SystemLocation(int system, int position);
 
-    bool operator<(const SystemLocation &location) const;
-    bool operator==(const SystemLocation &location) const;
+    auto operator<=>(const SystemLocation &location) const = default;
 
     void setSystem(int system);
     int getSystem() const;
@@ -42,8 +36,8 @@ class SystemLocation :
     int getPosition() const;
 
 private:
-    int mySystem;
-    int myPosition;
+    int mySystem = 0;
+    int myPosition = 0;
 };
 
 /// Enable the use of SystemLocation as a key for std::unordered_map, etc.