Cosmetic patch from Slava Semushin

3 files changed, 34 insertions, 23 deletions

diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index c175e67..7797f76 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -49,7 +49,13 @@
 #include <fstream>
 #include <algorithm>
 
-using namespace std;
+using std::cerr;
+using std::endl;
+using std::string;
+using std::fstream;
+using std::ifstream;
+using std::ofstream;
+using std::ios;
 
 FbRun::FbRun(int x, int y, size_t width):
     FbTk::TextBox(DefaultScreen(FbTk::App::instance()->display()),
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index 878b5eb..e5d3e2f 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -35,7 +35,9 @@ extern  "C" {
 #include <string>
 #include <iostream>
 
-using namespace std;
+using std::cerr;
+using std::endl;
+using std::string;
 
 void showUsage(const char *progname) {
     cerr<<"fbrun 1.5 : (c) 2002-2004 Henrik Kinnunen"<<endl;
@@ -81,7 +83,7 @@ int main(int argc, char **argv) {
         } else if (strcmp(argv[i], "-text") == 0 && i+1 < argc) {
             text = argv[++i];
         } else if (strcmp(argv[i], "-w") == 0 && i+1 < argc) {
-            width = atoi(argv[++i]);                    
+            width = atoi(argv[++i]);
             set_width = true;
         } else if (strcmp(argv[i], "-h") == 0 && i+1 < argc) {
             height = atoi(argv[++i]);
@@ -115,7 +117,7 @@ int main(int argc, char **argv) {
     }
 
     try {
-                
+
         FbTk::App application(display_name.c_str());
         FbRun fbrun;
 
@@ -131,7 +133,7 @@ int main(int argc, char **argv) {
         // get color
         FbTk::Color fg_color(foreground.c_str(), 0);
         FbTk::Color bg_color(background.c_str(), 0);
-                
+
         fbrun.setForegroundColor(fg_color);
         fbrun.setBackgroundColor(bg_color);
 
@@ -148,17 +150,17 @@ int main(int argc, char **argv) {
 
         fbrun.setTitle(title);
         fbrun.setText(text);
-        
+
         if (near_mouse) {
-            
+
             int wx, wy;
             unsigned int mask;
             Window ret_win;
             Window child_win;
-            
+
             Display* dpy = FbTk::App::instance()->display();
-            
-            if (XQueryPointer(dpy, DefaultRootWindow(dpy), 
+
+            if (XQueryPointer(dpy, DefaultRootWindow(dpy),
                               &ret_win, &child_win,
                               &x, &y, &wx, &wy, &mask)) {
 
@@ -202,12 +204,12 @@ int main(int argc, char **argv) {
                     y = root_y + root_h - fbrun.height();
             }
         }
-        
+
         if (set_pos)
             fbrun.move(x, y);
 
         fbrun.lockPosition(set_pos);
-                
+
         fbrun.show();
 
         application.eventLoop();
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 54f5adb..9d2cf73 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -50,7 +50,10 @@
 #endif
 #include <iostream>
 
-using namespace std;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::string;
 
 fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name)
     : FbTk::App(dpy_name), m_app_name(argv[0]) {
@@ -118,7 +121,7 @@ fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name)
 
     if ((mod + sol + grd) != true) {
         _FB_USES_NLS;
-        cerr << _FB_CONSOLETEXT(fbsetroot, MustSpecify, 
+        cerr << _FB_CONSOLETEXT(fbsetroot, MustSpecify,
                     "Error: must specify one of: -solid, -mod, -gradient\n",
                     "user didn't give one of the required options") << endl;
 
@@ -172,10 +175,10 @@ void fbsetroot::setRootAtoms(Pixmap pixmap, int screen) {
         if (type == XA_PIXMAP) {
             root.property(atom_eroot, 0L, 1L, False, AnyPropertyType,
                           &type, &format, &length, &after, &data_eroot);
-                
+
             if (data_root && data_eroot && type == XA_PIXMAP &&
                 *((Pixmap *) data_root) == *((Pixmap *) data_eroot)) {
-                    
+
                 XKillClient(display(), *((Pixmap *) data_root));
             }
         }
@@ -197,7 +200,7 @@ void fbsetroot::setRootAtoms(Pixmap pixmap, int screen) {
 }
 
 /**
-   Draws pixmaps with a single color 
+   Draws pixmaps with a single color
 */
 void fbsetroot::solid() {
     FbTk::Color c(fore, screen);
@@ -209,7 +212,7 @@ void fbsetroot::solid() {
     FbTk::GContext gc(root);
     gc.setForeground(c);
 
-    pixmap = new Pixmap(XCreatePixmap(display(), 
+    pixmap = new Pixmap(XCreatePixmap(display(),
                                       root.window(),
                                       root.width(), root.height(),
                                       root.depth()));
@@ -282,7 +285,7 @@ void fbsetroot::modula(int x, int y) {
     gc.setTile(r_bitmap);
     gc.setFillStyle(FillTiled);
 
-    pixmap = new Pixmap(XCreatePixmap(display(), 
+    pixmap = new Pixmap(XCreatePixmap(display(),
                                       root.window(),
                                       root.width(), root.height(),
                                       root.depth()));
@@ -328,7 +331,7 @@ void fbsetroot::gradient() {
 
     tmp = img_ctrl->renderImage(root.width(), root.height(), texture);
 
-    pixmap = new Pixmap(XCreatePixmap(display(), 
+    pixmap = new Pixmap(XCreatePixmap(display(),
                                       root.window(),
                                       root.width(), root.height(),
                                       root.depth()));
@@ -376,9 +379,9 @@ void fbsetroot::usage(int exit_code) {
 int main(int argc, char **argv) {
     char *display_name = (char *) 0;
     int i = 1;
-  
+
     FbTk::NLSInit("fluxbox.cat");
-  
+
     for (; i < argc; i++) {
         if (! strcmp(argv[i], "-display")) {
             // check for -display option
@@ -398,7 +401,7 @@ int main(int argc, char **argv) {
 
     try {
         fbsetroot app(argc, argv, display_name);
-    } catch (std::string error_str) {
+    } catch (string error_str) {
         _FB_USES_NLS;
         cerr<<_FB_CONSOLETEXT(Common, Error, "Error", "Error message header")<<": "<<error_str<<endl;
     }