1 files changed, 20 insertions, 17 deletions

diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 8df80b5..277808a 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -39,7 +39,10 @@
 #include <list>
 #include <iostream>
 #include <set>
-using namespace std;
+
+using std::string;
+using std::list;
+using std::set;
 
 namespace FbTk {
 
@@ -60,9 +63,9 @@ void Image::init() {
 
 void Image::shutdown() {
 
-    std::set<ImageBase*> handlers;
-    
-    // one imagehandler could be registered 
+    set<ImageBase*> handlers;
+
+    // one imagehandler could be registered
     // for more than one type
     ImageMap::iterator it = s_image_map.begin();
     ImageMap::iterator it_end = s_image_map.end();
@@ -72,8 +75,8 @@ void Image::shutdown() {
     }
 
     // free the unique handlers
-    std::set<ImageBase*>::iterator handler_it = handlers.begin();
-    std::set<ImageBase*>::iterator handler_it_end = handlers.end();
+    set<ImageBase*>::iterator handler_it = handlers.begin();
+    set<ImageBase*>::iterator handler_it_end = handlers.end();
     for(; handler_it != handler_it_end; handler_it++) {
         delete (*handler_it);
     }
@@ -81,26 +84,26 @@ void Image::shutdown() {
     s_image_map.clear();
 }
 
-PixmapWithMask *Image::load(const std::string &filename, int screen_num) {
+PixmapWithMask *Image::load(const string &filename, int screen_num) {
 
 
     if (filename == "")
         return false;
 
     // determine file ending
-    std::string extension(StringUtil::toUpper(StringUtil::findExtension(filename)));
-    
+    string extension(StringUtil::toUpper(StringUtil::findExtension(filename)));
+
     // valid handle?
     if (s_image_map.find(extension) == s_image_map.end())
         return false;
-    
+
     // load file
     PixmapWithMask *pm = s_image_map[extension]->load(filename, screen_num);
     // failed?, try different search paths
     if (pm == 0 && s_search_paths.size()) {
         // first we need to get basename of current filename
-        std::string base_filename = StringUtil::basename(filename);
-        std::string path = "";
+        string base_filename = StringUtil::basename(filename);
+        string path = "";
         // append each search path and try to load
         StringList::iterator it = s_search_paths.begin();
         StringList::iterator it_end = s_search_paths.end();
@@ -115,13 +118,13 @@ PixmapWithMask *Image::load(const std::string &filename, int screen_num) {
     return pm;
 }
 
-bool Image::registerType(const std::string &type, ImageBase &base) {
+bool Image::registerType(const string &type, ImageBase &base) {
 
     string ucase_type = StringUtil::toUpper(type);
 
     // not empty and not this base?
     if (s_image_map[ucase_type] != 0 &&
-        s_image_map[ucase_type] != &base) 
+        s_image_map[ucase_type] != &base)
         return false;
     // already registered?
     if (s_image_map[ucase_type] == &base)
@@ -136,7 +139,7 @@ void Image::remove(ImageBase &base) {
     // find and remove all referenses to base
     ImageMap::iterator it = s_image_map.begin();
     ImageMap::iterator it_end = s_image_map.end();
-    std::list<std::string> remove_list;
+    list<string> remove_list;
     for (; it != it_end; ++it) {
         if (it->second == &base)
             remove_list.push_back(it->first);
@@ -148,11 +151,11 @@ void Image::remove(ImageBase &base) {
     }
 }
 
-void Image::addSearchPath(const std::string &search_path) {
+void Image::addSearchPath(const string &search_path) {
     s_search_paths.push_back(search_path);
 }
 
-void Image::removeSearchPath(const std::string &search_path) {
+void Image::removeSearchPath(const string &search_path) {
     s_search_paths.remove(search_path);
 }