wip

2 files changed, 16 insertions, 10 deletions

diff --git a/fluid/tools/ExternalCodeEditor_UNIX.cxx b/fluid/tools/ExternalCodeEditor_UNIX.cxx
index 1d1efc462..f848e8158 100644
--- a/fluid/tools/ExternalCodeEditor_UNIX.cxx
+++ b/fluid/tools/ExternalCodeEditor_UNIX.cxx
@@ -23,8 +23,6 @@
 #include <stdlib.h>     /* free().. */
 #include <stdio.h>      /* snprintf().. */
 
-using namespace fld;
-
 // Static local data
 static int L_editors_open = 0;                          // keep track of #editors open
 static Fl_Timeout_Handler L_update_timer_cb = 0;        // app's update timer callback
diff --git a/fluid/tools/autodoc.cxx b/fluid/tools/autodoc.cxx
index a59e08ab9..aaa61486e 100644
--- a/fluid/tools/autodoc.cxx
+++ b/fluid/tools/autodoc.cxx
@@ -125,10 +125,12 @@ void blend_alpha_left(const Fl_RGB_Image *img, int dx) {
     int max_x = dx, max_y = img->h();
     int ld = img->ld(); if (ld == 0) ld = img->w() * img->d();
     float a = 255.0f/static_cast<float>(max_x);
-    for (int i = 0; i < max_x; i++) {
+    int i;
+    for (i = 0; i < max_x; i++) {
       uchar *rgba = (uchar*)img->data()[0] + i * img->d();
       uchar alpha = static_cast<uchar>(i * a);
-      for (int j = 0; j < max_y; j++) {
+      int j;
+      for (j = 0; j < max_y; j++) {
         rgba[3] = fl_min(alpha, rgba[3]);
         rgba += ld;
       }
@@ -150,10 +152,12 @@ void blend_alpha_top(const Fl_RGB_Image *img, int dy) {
     int max_x = img->w(), max_y = dy;
     int ld = img->ld(); if (ld == 0) ld = img->w() * img->d();
     float a = 255.0f/static_cast<float>(max_y);
-    for (int i = 0; i < max_y; i++) {
+    int i;
+    for (i = 0; i < max_y; i++) {
       uchar *rgba = (uchar*)img->data()[0] + i * ld;
       uchar alpha = static_cast<uchar>(i * a);
-      for (int j = 0; j < max_x; j++) {
+      int j;
+      for (j = 0; j < max_x; j++) {
         rgba[3] = fl_min(alpha, rgba[3]);
         rgba += 4;
       }
@@ -175,10 +179,12 @@ void blend_alpha_right(const Fl_RGB_Image *img, int dx) {
     int max_x = dx, max_y = img->h();
     int ld = img->ld(); if (ld == 0) ld = img->w() * img->d();
     float a = 255.0f/static_cast<float>(max_x);
-    for (int i = 0; i < max_x; i++) {
+    int i;
+    for (i = 0; i < max_x; i++) {
       uchar *rgba = (uchar*)img->data()[0] + (img->w()-i-1) * img->d();
       uchar alpha = static_cast<uchar>(i * a);
-      for (int j = 0; j < max_y; j++) {
+      int j;
+      for (j = 0; j < max_y; j++) {
         rgba[3] = fl_min(alpha, rgba[3]);
         rgba += ld;
       }
@@ -200,10 +206,12 @@ void blend_alpha_bottom(const Fl_RGB_Image *img, int dy) {
     int max_x = img->w(), max_y = dy;
     int ld = img->ld(); if (ld == 0) ld = img->w() * img->d();
     float a = 255.0f/static_cast<float>(max_y);
-    for (int i = 0; i < max_y; i++) {
+    int i;
+    for (i = 0; i < max_y; i++) {
       uchar *rgba = (uchar*)img->data()[0] + (img->h()-i-1) * ld;
       uchar alpha = static_cast<uchar>(i * a);
-      for (int j = 0; j < max_x; j++) {
+      int j;
+      for (j = 0; j < max_x; j++) {
         rgba[3] = fl_min(alpha, rgba[3]);
         rgba += 4;
       }