diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
| commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
| tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /src/resources/buddylist.cpp | |
| parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
| parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
| download | mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip | |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'src/resources/buddylist.cpp')
| -rw-r--r-- | src/resources/buddylist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index 24198f59..541acabe 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -21,13 +21,13 @@ #include <algorithm> #include <cstring> -#include <iostream> #include <fstream> +#include <iostream> #include "buddylist.h" -#include "../main.h" #include "../configuration.h" +#include "../main.h" BuddyList::BuddyList() { @@ -111,7 +111,7 @@ bool BuddyList::removeBuddy(const std::string buddy) return false; } -int BuddyList::getNumberOfElements() +int BuddyList::getNumberOfElements() { return mBuddylist.size(); } |