cosmetic patch from slava semushin, removes whitespaces and

uses only those things from "namespace std" what we really need.

1 files changed, 17 insertions, 14 deletions

diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index 5c4f1b8..8e5c8ef 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -28,7 +28,10 @@
 #include "I18n.hh"
 
 #include <iostream>
-using namespace std;
+
+using std::cerr;
+using std::endl;
+using std::string;
 
 namespace {
 
@@ -56,9 +59,9 @@ Color::Color(const Color &col_copy):
 }
 
 Color::Color(unsigned short red, unsigned short green, unsigned short blue, int screen):
-    m_red(red), m_green(green), m_blue(blue), 
+    m_red(red), m_green(green), m_blue(blue),
     m_pixel(0), m_allocated(false),
-    m_screen(screen) { 
+    m_screen(screen) {
     allocate(red, green, blue, screen);
 }
 
@@ -95,7 +98,7 @@ bool Color::setFromString(const char *color_string, int screen) {
         return false;
 
     setPixel(color.pixel);
-    setRGB(maxValue(color.red), 
+    setRGB(maxValue(color.red),
            maxValue(color.green),
            maxValue(color.blue));
     setAllocated(true);
@@ -107,7 +110,7 @@ bool Color::setFromString(const char *color_string, int screen) {
 bool Color::validColorString(const char *color_string, int screen) {
     XColor color;
     Display *disp = App::instance()->display();
-    Colormap colm = DefaultColormap(disp, screen);   
+    Colormap colm = DefaultColormap(disp, screen);
     // trim white space
     string color_string_tmp = color_string;
     StringUtil::removeFirstWhitespace(color_string_tmp);
@@ -120,7 +123,7 @@ Color &Color::operator = (const Color &col_copy) {
     // check for aliasing
     if (this == &col_copy)
         return *this;
-    
+
     copy(col_copy);
     return *this;
 }
@@ -134,7 +137,7 @@ void Color::free() {
         setPixel(0);
         setRGB(0, 0, 0);
         setAllocated(false);
-    }   
+    }
 }
 
 void Color::copy(const Color &col_copy) {
@@ -144,12 +147,12 @@ void Color::copy(const Color &col_copy) {
         setPixel(col_copy.pixel());
         return;
     }
-                
-    allocate(col_copy.red()*0xFF, 
+
+    allocate(col_copy.red()*0xFF,
              col_copy.green()*0xFF,
              col_copy.blue()*0xFF,
              col_copy.m_screen);
-        
+
 }
 
 void Color::allocate(unsigned short red, unsigned short green, unsigned short blue, int screen) {
@@ -158,10 +161,10 @@ void Color::allocate(unsigned short red, unsigned short green, unsigned short bl
     XColor color;
     // fill xcolor structure
     color.red = red;
-    color.green = green;        
+    color.green = green;
     color.blue = blue;
-        
-        
+
+
     if (!XAllocColor(disp, DefaultColormap(disp, screen), &color)) {
         _FB_USES_NLS;
         cerr<<"FbTk::Color: "<<_FBTK_CONSOLETEXT(Error, ColorAllocation, "Allocation error.", "XAllocColor failed...")<<endl;
@@ -173,7 +176,7 @@ void Color::allocate(unsigned short red, unsigned short green, unsigned short bl
         setPixel(color.pixel);
         setAllocated(true);
     }
-        
+
     m_screen = screen;
 }