Avoid some needless pointer indirection

* Don't use `PlayerRelation*` in `mRelations`, but just store the value.

* Pass `std::vector<PlayerIgnoreStrategy *>` by reference instead of
  pointer.

* Return player list in `PlayerRelationsManager::getPlayers` by value
  instead of pointer.

Overall these changes simplify the code, making it less prone to errors.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/playerrelations.h b/src/playerrelations.h
index a836a976..2a0426a1 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -56,7 +56,7 @@ struct PlayerRelation
         IGNORED     = 3
     };
 
-    PlayerRelation(Relation relation);
+    explicit PlayerRelation(Relation relation = NEUTRAL);
 
     Relation mRelation; // bitmask for all of the above
 };
@@ -158,11 +158,8 @@ public:
 
     /**
      * Retrieves all known player ignore strategies.
-     *
-     * The player ignore strategies are allocated statically and must not be
-     * deleted.
      */
-    std::vector<PlayerIgnoreStrategy *> *getPlayerIgnoreStrategies();
+    std::vector<PlayerIgnoreStrategy *> &getPlayerIgnoreStrategies();
 
     /**
      * Return the current player ignore strategy.
@@ -195,7 +192,7 @@ public:
      * Retrieves a sorted vector of all players for which we have any relations
      * recorded.
      */
-    std::vector<std::string> *getPlayers() const;
+    std::vector<std::string> getPlayers() const;
 
     /**
      * Removes all recorded player info.
@@ -231,7 +228,7 @@ private:
     unsigned int mDefaultPermissions;
 
     PlayerIgnoreStrategy *mIgnoreStrategy;
-    std::map<std::string, PlayerRelation *> mRelations;
+    std::map<std::string, PlayerRelation> mRelations;
     std::list<PlayerRelationsListener *> mListeners;
     std::vector<PlayerIgnoreStrategy *> mIgnoreStrategies;
 };