krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Utils] Use consistent names for utility functions added by tes3mp

Browse source
This commit is contained in:
David Cernat 2017-08-31 10:12:22 +03:00
parent cf4021a7b5
commit cca4991e74
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmp/Networking.cpp
View file

@ -328,7 +328,7 @@ void Networking::preInit(std::vector<std::string> &content, Files::Collections &
if (col.doesExist(*it)) if (col.doesExist(*it))
{ {
PacketPreInit::HashList hashList; PacketPreInit::HashList hashList;
unsigned crc32 = Utils::crc32checksum(col.getPath(*it).string()); unsigned crc32 = Utils::crc32Checksum(col.getPath(*it).string());
hashList.push_back(crc32); hashList.push_back(crc32);
checksums.push_back(make_pair(*it, hashList)); checksums.push_back(make_pair(*it, hashList));

12
components/openmw-mp/Utils.cpp
View file

@ -54,7 +54,7 @@ void Utils::timestamp()
} }
// http://stackoverflow.com/questions/1637587/c-libcurl-console-progress-bar // http://stackoverflow.com/questions/1637587/c-libcurl-console-progress-bar
int Utils::progress_func(double TotalToDownload, double NowDownloaded) int Utils::progressFunc(double TotalToDownload, double NowDownloaded)
{ {
// how wide you want the progress meter to be // how wide you want the progress meter to be
int totaldotz=40; int totaldotz=40;
@ -79,7 +79,7 @@ int Utils::progress_func(double TotalToDownload, double NowDownloaded)
return 1; return 1;
} }
bool Utils::DoubleCompare(double a, double b, double epsilon) bool Utils::compareDoubles(double a, double b, double epsilon)
{ {
return fabs(a - b) < epsilon; return fabs(a - b) < epsilon;
} }
@ -91,7 +91,7 @@ std::string Utils::toString(int num)
return stream.str(); return stream.str();
} }
string Utils::str_replace(const string& source, const char* find, const char* replace) string Utils::replaceString(const string& source, const char* find, const char* replace)
{ {
unsigned int find_len = strlen(find); unsigned int find_len = strlen(find);
unsigned int replace_len = strlen(replace); unsigned int replace_len = strlen(replace);
@ -108,7 +108,7 @@ string Utils::str_replace(const string& source, const char* find, const char* re
return dest; return dest;
} }
string& Utils::RemoveExtension(string& file) string& Utils::removeExtension(string& file)
{ {
size_t pos = file.find_last_of('.'); size_t pos = file.find_last_of('.');
@ -118,7 +118,7 @@ string& Utils::RemoveExtension(string& file)
return file; return file;
} }
long int Utils::FileLength(const char* file) long int Utils::getFileLength(const char* file)
{ {
FILE* _file = fopen(file, "rb"); FILE* _file = fopen(file, "rb");
@ -132,7 +132,7 @@ long int Utils::FileLength(const char* file)
return size; return size;
} }
unsigned int ::Utils::crc32checksum(const std::string &file) unsigned int ::Utils::crc32Checksum(const std::string &file)
{ {
boost::crc_32_type crc32; boost::crc_32_type crc32;
boost::filesystem::ifstream ifs(file, std::ios_base::binary); boost::filesystem::ifstream ifs(file, std::ios_base::binary);

12
components/openmw-mp/Utils.hpp
View file

@ -22,19 +22,19 @@ namespace Utils
void timestamp(); void timestamp();
int progress_func(double TotalToDownload, double NowDownloaded); int progressFunc(double TotalToDownload, double NowDownloaded);
bool DoubleCompare(double a, double b, double epsilon); bool compareDoubles(double a, double b, double epsilon);
std::string str_replace(const std::string &source, const char *find, const char *replace); std::string replaceString(const std::string &source, const char *find, const char *replace);
std::string toString(int num); std::string toString(int num);
std::string &RemoveExtension(std::string &file); std::string &removeExtension(std::string &file);
long int FileLength(const char *file); long int getFileLength(const char *file);
unsigned int crc32checksum(const std::string &file); unsigned int crc32Checksum(const std::string &file);
void printWithWidth(std::ostringstream &sstr, std::string str, size_t width); void printWithWidth(std::ostringstream &sstr, std::string str, size_t width);