Author: mordante
Date: Mon Jul 7 19:18:50 2008
New Revision: 27819
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27819&view=rev
Log:
Add underscore to private members.
Modified:
trunk/src/image.cpp
trunk/src/image.hpp
Modified: trunk/src/image.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/image.cpp?rev=27819&r1=27818&r2=27819&view=diff
==============================================================================
--- trunk/src/image.cpp (original)
+++ trunk/src/image.cpp Mon Jul 7 19:18:50 2008
@@ -73,8 +73,8 @@
template<typename T>
void cache_type<T>::flush()
{
- typename std::vector<cache_item<T> >::iterator beg = content.begin();
- typename std::vector<cache_item<T> >::iterator end = content.end();
+ typename std::vector<cache_item<T> >::iterator beg = content_.begin();
+ typename std::vector<cache_item<T> >::iterator end = content_.end();
for(; beg != end; ++beg) {
beg->loaded = false;
@@ -799,32 +799,32 @@
template<typename T>
cache_item<T>& cache_type<T>::get_element(int index){
assert (index != -1);
- while(index >= content.size()) {
- content.push_back(cache_item<T>());
- }
- cache_item<T>& elt = content[index];
+ while(index >= content_.size()) {
+ content_.push_back(cache_item<T>());
+ }
+ cache_item<T>& elt = content_[index];
if(elt.loaded) {
assert(*elt.position == index);
- lru_list.erase(elt.position);
- lru_list.push_front(index);
- elt.position = lru_list.begin();
+ lru_list_.erase(elt.position);
+ lru_list_.push_front(index);
+ elt.position = lru_list_.begin();
}
return elt;
}
template<typename T>
void cache_type<T>::on_load(int index){
if(index == -1) return ;
- cache_item<T>& elt = content[index];
+ cache_item<T>& elt = content_[index];
if(!elt.loaded) return ;
- lru_list.push_front(index);
- cache_size++;
- elt.position = lru_list.begin();
- while(cache_size > cache_max_size-100) {
- cache_item<T>& elt = content[lru_list.back()];
+ lru_list_.push_front(index);
+ cache_size_++;
+ elt.position = lru_list_.begin();
+ while(cache_size_ > cache_max_size_-100) {
+ cache_item<T>& elt = content_[lru_list_.back()];
elt.loaded=false;
elt.item = T();
- lru_list.pop_back();
- cache_size--;
+ lru_list_.pop_back();
+ cache_size_--;
}
}
Modified: trunk/src/image.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/image.hpp?rev=27819&r1=27818&r2=27819&view=diff
==============================================================================
--- trunk/src/image.hpp (original)
+++ trunk/src/image.hpp Mon Jul 7 19:18:50 2008
@@ -67,10 +67,10 @@
{
public:
cache_type() :
- cache_size(0),
- cache_max_size(2000),
- lru_list(),
- content()
+ cache_size_(0),
+ cache_max_size_(2000),
+ lru_list_(),
+ content_()
{
}
@@ -78,10 +78,10 @@
void on_load(int index);
void flush();
private:
- int cache_size ;
- int cache_max_size ;
- std::list<int> lru_list;
- std::vector<cache_item<T> > content;
+ int cache_size_;
+ int cache_max_size_;
+ std::list<int> lru_list_;
+ std::vector<cache_item<T> > content_;
};
//a generic image locator. Abstracts the location of an image.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
