Style cleanups throughout most of the code. Splitting function type from

the function names should no longer be around.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 19 insertions, 38 deletions

diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index ef00a738..5eb47433 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -91,8 +91,7 @@ PlayerRelationsManager::PlayerRelationsManager() :
 {
 }
 
-void
-PlayerRelationsManager::clear()
+void PlayerRelationsManager::clear()
 {
     std::vector<std::string> *names = getPlayers();
     for (std::vector<std::string>::const_iterator
@@ -105,8 +104,7 @@ PlayerRelationsManager::clear()
 #define PLAYER_IGNORE_STRATEGY "player-ignore-strategy"
 #define DEFAULT_PERMISSIONS "default-player-permissions"
 
-int
-PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name)
+int PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name)
 {
     std::vector<PlayerIgnoreStrategy *> *strategies = getPlayerIgnoreStrategies();
     for (unsigned int i = 0; i < strategies->size(); i++)
@@ -116,8 +114,7 @@ PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name)
     return -1;
 }
 
-void
-PlayerRelationsManager::load()
+void PlayerRelationsManager::load()
 {
     clear();
 
@@ -134,8 +131,7 @@ PlayerRelationsManager::load()
 }
 
 
-void
-PlayerRelationsManager::init()
+void PlayerRelationsManager::init()
 {
     load();
 
@@ -143,8 +139,7 @@ PlayerRelationsManager::init()
         clear(); // Yes, we still keep them around in the config file until the next update.
 }
 
-void
-PlayerRelationsManager::store()
+void PlayerRelationsManager::store()
 {
     config.setList<std::map<std::string, PlayerRelation *>::const_iterator,
                    std::pair<std::string, PlayerRelation *>,
@@ -161,8 +156,7 @@ PlayerRelationsManager::store()
     config.write();
 }
 
-void
-PlayerRelationsManager::signalUpdate(const std::string &name)
+void PlayerRelationsManager::signalUpdate(const std::string &name)
 {
     store();
 
@@ -170,8 +164,7 @@ PlayerRelationsManager::signalUpdate(const std::string &name)
         (*it)->updatedPlayer(name);
 }
 
-unsigned int
-PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags)
+unsigned int PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags)
 {
     PlayerRelation *r = mRelations[player_name];
     if (!r)
@@ -196,16 +189,14 @@ PlayerRelationsManager::checkPermissionSilently(const std::string &player_name,
     }
 }
 
-bool
-PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
+bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
 {
     if (being->getType() == Being::PLAYER)
         return hasPermission(being->getName(), flags) == flags;
     return true;
 }
 
-bool
-PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags)
+bool PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags)
 {
     unsigned int rejections = flags & ~checkPermissionSilently(name, flags);
     bool permitted = rejections == 0;
@@ -224,8 +215,7 @@ PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flag
     return permitted;
 }
 
-void
-PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation)
+void PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation)
 {
     PlayerRelation *r = mRelations[player_name];
     if (r == NULL)
@@ -236,8 +226,7 @@ PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelati
     signalUpdate(player_name);
 }
 
-std::vector<std::string> *
-PlayerRelationsManager::getPlayers()
+std::vector<std::string> * PlayerRelationsManager::getPlayers()
 {
     std::vector<std::string> *retval = new std::vector<std::string>();
 
@@ -250,8 +239,7 @@ PlayerRelationsManager::getPlayers()
     return retval;
 }
 
-void
-PlayerRelationsManager::removePlayer(const std::string &name)
+void PlayerRelationsManager::removePlayer(const std::string &name)
 {
     if (mRelations[name])
         delete mRelations[name];
@@ -262,8 +250,7 @@ PlayerRelationsManager::removePlayer(const std::string &name)
 }
 
 
-PlayerRelation::relation
-PlayerRelationsManager::getRelation(const std::string &name)
+PlayerRelation::relation PlayerRelationsManager::getRelation(const std::string &name)
 {
     if (mRelations[name])
         return mRelations[name]->mRelation;
@@ -274,14 +261,12 @@ PlayerRelationsManager::getRelation(const std::string &name)
 ////////////////////////////////////////
 // defaults
 
-unsigned int
-PlayerRelationsManager::getDefault() const
+unsigned int PlayerRelationsManager::getDefault() const
 {
     return mDefaultPermissions;
 }
 
-void
-PlayerRelationsManager::setDefault(unsigned int permissions)
+void PlayerRelationsManager::setDefault(unsigned int permissions)
 {
     mDefaultPermissions = permissions;
 
@@ -303,8 +288,7 @@ public:
         mShortName = PLAYER_IGNORE_STRATEGY_NOP;
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
      {
      }
 };
@@ -318,8 +302,7 @@ public:
         mShortName = "dotdotdot";
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
      {
          player->setSpeech("...", 5);
      }
@@ -335,8 +318,7 @@ public:
         mShortName = "blinkname";
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
     {
         player->flash(200);
     }
@@ -352,8 +334,7 @@ public:
         mShortName = shortname;
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
      {
          player->setEmote(mEmotion, IGNORE_EMOTE_TIME);
      }