Author: matt
Date: 2010-04-04 12:08:22 -0700 (Sun, 04 Apr 2010)
New Revision: 7418
Log:
Remove all the other 'using namespace' statements.
Modified:
branches/branch-3.0/test/boxtype.cxx
branches/branch-3.0/test/button.cxx
branches/branch-3.0/test/buttons.cxx
branches/branch-3.0/test/hello.cxx
branches/branch-3.0/test/label.cxx
Modified: branches/branch-3.0/test/boxtype.cxx
===================================================================
--- branches/branch-3.0/test/boxtype.cxx 2010-04-04 14:47:27 UTC (rev
7417)
+++ branches/branch-3.0/test/boxtype.cxx 2010-04-04 19:08:22 UTC (rev
7418)
@@ -31,91 +31,89 @@
#include <fltk3/DoubleBufferWindow.h>
#include <fltk3/Widget.h>
-using namespace fltk3;
-
int N = 0;
#define W 200
#define H 50
#define ROWS 14
-DoubleBufferWindow *window;
+fltk3::DoubleBufferWindow *window;
-void bt(const char *name, Boxtype type, int square=0) {
+void bt(const char *name, fltk3::Boxtype type, int square=0) {
int x = N%4;
int y = N/4;
N++;
x = x*W+10;
y = y*H+10;
- Widget *b = new Widget(x,y,square ? H-20 : W-20,H-20,name);
+ fltk3::Widget *b = new fltk3::Widget(x,y,square ? H-20 : W-20,H-20,name);
b->box(type);
b->labelsize(11);
- if (square) b->align(ALIGN_RIGHT);
+ if (square) b->align(fltk3::ALIGN_RIGHT);
}
int main(int argc, char ** argv) {
- window = new DoubleBufferWindow(4*W,ROWS*H,"boxtype test for FLTK 3");
- window->box(FLAT_BOX);
+ window = new fltk3::DoubleBufferWindow(4*W,ROWS*H,"boxtype test for FLTK 3");
+ window->box(fltk3::FLAT_BOX);
window->begin();
- args(argc, argv);
- get_system_colors();
+ fltk3::args(argc, argv);
+ fltk3::get_system_colors();
window->color(12);// light blue
- bt("NO_BOX",NO_BOX);
- bt("FLAT_BOX",FLAT_BOX);
+ bt("NO_BOX",fltk3::NO_BOX);
+ bt("FLAT_BOX",fltk3::FLAT_BOX);
N += 2; // go to start of next row to line up boxes & frames
- bt("UP_BOX",UP_BOX);
- bt("DOWN_BOX",DOWN_BOX);
- bt("UP_FRAME",UP_FRAME);
- bt("DOWN_FRAME",DOWN_FRAME);
- bt("THIN_UP_BOX",THIN_UP_BOX);
- bt("THIN_DOWN_BOX",THIN_DOWN_BOX);
- bt("THIN_UP_FRAME",THIN_UP_FRAME);
- bt("THIN_DOWN_FRAME",THIN_DOWN_FRAME);
- bt("ENGRAVED_BOX",ENGRAVED_BOX);
- bt("EMBOSSED_BOX",EMBOSSED_BOX);
- bt("ENGRAVED_FRAME",ENGRAVED_FRAME);
- bt("EMBOSSED_FRAME",EMBOSSED_FRAME);
- bt("BORDER_BOX",BORDER_BOX);
- bt("SHADOW_BOX",SHADOW_BOX);
- bt("BORDER_FRAME",BORDER_FRAME);
- bt("SHADOW_FRAME",SHADOW_FRAME);
- bt("ROUNDED_BOX",ROUNDED_BOX);
- bt("RSHADOW_BOX",RSHADOW_BOX);
- bt("ROUNDED_FRAME",ROUNDED_FRAME);
- bt("RFLAT_BOX",RFLAT_BOX);
- bt("OVAL_BOX",OVAL_BOX);
- bt("OSHADOW_BOX",OSHADOW_BOX);
- bt("OVAL_FRAME",OVAL_FRAME);
- bt("OFLAT_BOX",OFLAT_BOX);
- bt("ROUND_UP_BOX",ROUND_UP_BOX);
- bt("ROUND_DOWN_BOX",ROUND_DOWN_BOX);
- bt("DIAMOND_UP_BOX",DIAMOND_UP_BOX);
- bt("DIAMOND_DOWN_BOX",DIAMOND_DOWN_BOX);
+ bt("UP_BOX",fltk3::UP_BOX);
+ bt("DOWN_BOX",fltk3::DOWN_BOX);
+ bt("UP_FRAME",fltk3::UP_FRAME);
+ bt("DOWN_FRAME",fltk3::DOWN_FRAME);
+ bt("THIN_UP_BOX",fltk3::THIN_UP_BOX);
+ bt("THIN_DOWN_BOX",fltk3::THIN_DOWN_BOX);
+ bt("THIN_UP_FRAME",fltk3::THIN_UP_FRAME);
+ bt("THIN_DOWN_FRAME",fltk3::THIN_DOWN_FRAME);
+ bt("ENGRAVED_BOX",fltk3::ENGRAVED_BOX);
+ bt("EMBOSSED_BOX",fltk3::EMBOSSED_BOX);
+ bt("ENGRAVED_FRAME",fltk3::ENGRAVED_FRAME);
+ bt("EMBOSSED_FRAME",fltk3::EMBOSSED_FRAME);
+ bt("BORDER_BOX",fltk3::BORDER_BOX);
+ bt("SHADOW_BOX",fltk3::SHADOW_BOX);
+ bt("BORDER_FRAME",fltk3::BORDER_FRAME);
+ bt("SHADOW_FRAME",fltk3::SHADOW_FRAME);
+ bt("ROUNDED_BOX",fltk3::ROUNDED_BOX);
+ bt("RSHADOW_BOX",fltk3::RSHADOW_BOX);
+ bt("ROUNDED_FRAME",fltk3::ROUNDED_FRAME);
+ bt("RFLAT_BOX",fltk3::RFLAT_BOX);
+ bt("OVAL_BOX",fltk3::OVAL_BOX);
+ bt("OSHADOW_BOX",fltk3::OSHADOW_BOX);
+ bt("OVAL_FRAME",fltk3::OVAL_FRAME);
+ bt("OFLAT_BOX",fltk3::OFLAT_BOX);
+ bt("ROUND_UP_BOX",fltk3::ROUND_UP_BOX);
+ bt("ROUND_DOWN_BOX",fltk3::ROUND_DOWN_BOX);
+ bt("DIAMOND_UP_BOX",fltk3::DIAMOND_UP_BOX);
+ bt("DIAMOND_DOWN_BOX",fltk3::DIAMOND_DOWN_BOX);
- bt("PLASTIC_UP_BOX",PLASTIC_UP_BOX);
- bt("PLASTIC_DOWN_BOX",PLASTIC_DOWN_BOX);
- bt("PLASTIC_UP_FRAME",PLASTIC_UP_FRAME);
- bt("PLASTIC_DOWN_FRAME",PLASTIC_DOWN_FRAME);
- bt("PLASTIC_THIN_UP_BOX",PLASTIC_THIN_UP_BOX);
- bt("PLASTIC_THIN_DOWN_BOX",PLASTIC_THIN_DOWN_BOX);
+ bt("PLASTIC_UP_BOX",fltk3::PLASTIC_UP_BOX);
+ bt("PLASTIC_DOWN_BOX",fltk3::PLASTIC_DOWN_BOX);
+ bt("PLASTIC_UP_FRAME",fltk3::PLASTIC_UP_FRAME);
+ bt("PLASTIC_DOWN_FRAME",fltk3::PLASTIC_DOWN_FRAME);
+ bt("PLASTIC_THIN_UP_BOX",fltk3::PLASTIC_THIN_UP_BOX);
+ bt("PLASTIC_THIN_DOWN_BOX",fltk3::PLASTIC_THIN_DOWN_BOX);
N += 2;
- bt("PLASTIC_ROUND_UP_BOX",PLASTIC_ROUND_UP_BOX);
- bt("PLASTIC_ROUND_DOWN_BOX",PLASTIC_ROUND_DOWN_BOX);
+ bt("PLASTIC_ROUND_UP_BOX",fltk3::PLASTIC_ROUND_UP_BOX);
+ bt("PLASTIC_ROUND_DOWN_BOX",fltk3::PLASTIC_ROUND_DOWN_BOX);
N += 2;
- bt("GTK_UP_BOX",GTK_UP_BOX);
- bt("GTK_DOWN_BOX",GTK_DOWN_BOX);
- bt("GTK_UP_FRAME",GTK_UP_FRAME);
- bt("GTK_DOWN_FRAME",GTK_DOWN_FRAME);
- bt("GTK_THIN_UP_BOX",GTK_THIN_UP_BOX);
- bt("GTK_THIN_DOWN_BOX",GTK_THIN_DOWN_BOX);
- bt("GTK_THIN_UP_FRAME",GTK_THIN_UP_FRAME);
- bt("GTK_THIN_DOWN_FRAME",GTK_THIN_DOWN_FRAME);
- bt("GTK_ROUND_UP_BOX",GTK_ROUND_UP_BOX);
- bt("GTK_ROUND_DOWN_BOX",GTK_ROUND_DOWN_BOX);
+ bt("GTK_UP_BOX",fltk3::GTK_UP_BOX);
+ bt("GTK_DOWN_BOX",fltk3::GTK_DOWN_BOX);
+ bt("GTK_UP_FRAME",fltk3::GTK_UP_FRAME);
+ bt("GTK_DOWN_FRAME",fltk3::GTK_DOWN_FRAME);
+ bt("GTK_THIN_UP_BOX",fltk3::GTK_THIN_UP_BOX);
+ bt("GTK_THIN_DOWN_BOX",fltk3::GTK_THIN_DOWN_BOX);
+ bt("GTK_THIN_UP_FRAME",fltk3::GTK_THIN_UP_FRAME);
+ bt("GTK_THIN_DOWN_FRAME",fltk3::GTK_THIN_DOWN_FRAME);
+ bt("GTK_ROUND_UP_BOX",fltk3::GTK_ROUND_UP_BOX);
+ bt("GTK_ROUND_DOWN_BOX",fltk3::GTK_ROUND_DOWN_BOX);
window->resizable(window);
window->end();
window->show();
- return run();
+ return fltk3::run();
}
//
Modified: branches/branch-3.0/test/button.cxx
===================================================================
--- branches/branch-3.0/test/button.cxx 2010-04-04 14:47:27 UTC (rev 7417)
+++ branches/branch-3.0/test/button.cxx 2010-04-04 19:08:22 UTC (rev 7418)
@@ -32,27 +32,25 @@
#include <fltk3/Window.h>
#include <fltk3/Button.h>
-using namespace fltk3;
-
-void beepcb(Widget *, void *) {
- beep();
+void beepcb(fltk3::Widget *, void *) {
+ fltk3::beep();
}
-void exitcb(Widget *, void *) {
+void exitcb(fltk3::Widget *, void *) {
exit(0);
}
int main(int argc, char ** argv) {
- Window *window = new Window(320,65);
+ fltk3::Window *window = new fltk3::Window(320,65);
window->begin();
- Button *b1 = new Button(20, 20, 80, 25, "&Beep");
+ fltk3::Button *b1 = new fltk3::Button(20, 20, 80, 25, "&Beep");
b1->callback(beepcb,0);
- new Button(120,20, 80, 25, "&no op");
- Button *b3 = new Button(220,20, 80, 25, "E&xit");
+ new fltk3::Button(120,20, 80, 25, "&no op");
+ fltk3::Button *b3 = new fltk3::Button(220,20, 80, 25, "E&xit");
b3->callback(exitcb,0);
window->end();
window->show(argc,argv);
- return run();
+ return fltk3::run();
}
//
Modified: branches/branch-3.0/test/buttons.cxx
===================================================================
--- branches/branch-3.0/test/buttons.cxx 2010-04-04 14:47:27 UTC (rev
7417)
+++ branches/branch-3.0/test/buttons.cxx 2010-04-04 19:08:22 UTC (rev
7418)
@@ -37,22 +37,20 @@
#include <fltk3/RoundButton.h>
#include <fltk3/Tooltip.h>
-using namespace fltk3;
-
int main(int argc, char ** argv) {
- Window *window = new Window(320,130);
+ fltk3::Window *window = new fltk3::Window(320,130);
window->begin();
{
- (new Button(10, 10, 130, 30, "Button"))->tooltip("This is a Tooltip.");
- new ReturnButton(150, 10, 160, 30, "ReturnButton");
- new RepeatButton(10,50,130,30,"RepeatButton");
- new LightButton(10,90,130,30,"LightButton");
- new RoundButton(150,50,160,30,"RoundButton");
- new CheckButton(150,90,160,30,"CheckButton");
+ (new fltk3::Button(10, 10, 130, 30, "Button"))->tooltip("This is a
Tooltip.");
+ new fltk3::ReturnButton(150, 10, 160, 30, "ReturnButton");
+ new fltk3::RepeatButton(10,50,130,30,"RepeatButton");
+ new fltk3::LightButton(10,90,130,30,"LightButton");
+ new fltk3::RoundButton(150,50,160,30,"RoundButton");
+ new fltk3::CheckButton(150,90,160,30,"CheckButton");
}
window->end();
window->show(argc,argv);
- return run();
+ return fltk3::run();
}
//
Modified: branches/branch-3.0/test/hello.cxx
===================================================================
--- branches/branch-3.0/test/hello.cxx 2010-04-04 14:47:27 UTC (rev 7417)
+++ branches/branch-3.0/test/hello.cxx 2010-04-04 19:08:22 UTC (rev 7418)
@@ -29,17 +29,15 @@
#include <fltk3/Window.h>
#include <fltk3/Widget.h>
-using namespace fltk3;
-
int main(int argc, char **argv) {
- Window *window = new Window(300,180);
+ fltk3::Window *window = new fltk3::Window(300,180);
window->begin();
{
- Widget *box = new Widget(20,40,260,100,"Hello, World!");
- box->box(UP_BOX);
- box->labelfont(BOLD+ITALIC);
+ fltk3::Widget *box = new fltk3::Widget(20,40,260,100,"Hello, World!");
+ box->box(fltk3::UP_BOX);
+ box->labelfont(fltk3::BOLD+fltk3::ITALIC);
box->labelsize(36);
- box->labeltype(SHADOW_LABEL);
+ box->labeltype(fltk3::SHADOW_LABEL);
}
window->end();
window->show(argc, argv);
Modified: branches/branch-3.0/test/label.cxx
===================================================================
--- branches/branch-3.0/test/label.cxx 2010-04-04 14:47:27 UTC (rev 7417)
+++ branches/branch-3.0/test/label.cxx 2010-04-04 19:08:22 UTC (rev 7418)
@@ -35,51 +35,50 @@
#include <fltk3/Input.h>
#include <fltk3/Choice.h>
-using namespace fltk3;
-ToggleButton *leftb,*rightb,*topb,*bottomb,*insideb,*clipb,*wrapb;
-Widget *text;
-Input *input;
-HorValueSlider *fonts;
-HorValueSlider *sizes;
-DoubleBufferWindow *window;
+fltk3::ToggleButton *leftb,*rightb,*topb,*bottomb,*insideb,*clipb,*wrapb;
+fltk3::Widget *text;
+fltk3::Input *input;
+fltk3::HorValueSlider *fonts;
+fltk3::HorValueSlider *sizes;
+fltk3::DoubleBufferWindow *window;
-void button_cb(Widget *,void *) {
+void button_cb(fltk3::Widget *,void *) {
int i = 0;
- if (leftb->value()) i |= ALIGN_LEFT;
- if (rightb->value()) i |= ALIGN_RIGHT;
- if (topb->value()) i |= ALIGN_TOP;
- if (bottomb->value()) i |= ALIGN_BOTTOM;
- if (insideb->value()) i |= ALIGN_INSIDE;
- if (clipb->value()) i |= ALIGN_CLIP;
- if (wrapb->value()) i |= ALIGN_WRAP;
+ if (leftb->value()) i |= fltk3::ALIGN_LEFT;
+ if (rightb->value()) i |= fltk3::ALIGN_RIGHT;
+ if (topb->value()) i |= fltk3::ALIGN_TOP;
+ if (bottomb->value()) i |= fltk3::ALIGN_BOTTOM;
+ if (insideb->value()) i |= fltk3::ALIGN_INSIDE;
+ if (clipb->value()) i |= fltk3::ALIGN_CLIP;
+ if (wrapb->value()) i |= fltk3::ALIGN_WRAP;
text->align(i);
window->redraw();
}
-void font_cb(Widget *,void *) {
+void font_cb(fltk3::Widget *,void *) {
text->labelfont(int(fonts->value()));
window->redraw();
}
-void size_cb(Widget *,void *) {
+void size_cb(fltk3::Widget *,void *) {
text->labelsize(int(sizes->value()));
window->redraw();
}
-void input_cb(Widget *,void *) {
+void input_cb(fltk3::Widget *,void *) {
text->label(input->value());
window->redraw();
}
-void normal_cb(Widget *,void *) {
- text->labeltype(NORMAL_LABEL);
+void normal_cb(fltk3::Widget *,void *) {
+ text->labeltype(fltk3::NORMAL_LABEL);
window->redraw();
}
-void symbol_cb(Widget *,void *) {
- text->labeltype(NORMAL_LABEL);
+void symbol_cb(fltk3::Widget *,void *) {
+ text->labeltype(fltk3::NORMAL_LABEL);
if (input->value()[0] != '@') {
input->static_value("@->");
text->label("@->");
@@ -87,86 +86,86 @@
window->redraw();
}
-void shadow_cb(Widget *,void *) {
- text->labeltype(SHADOW_LABEL);
+void shadow_cb(fltk3::Widget *,void *) {
+ text->labeltype(fltk3::SHADOW_LABEL);
window->redraw();
}
-void embossed_cb(Widget *,void *) {
- text->labeltype(EMBOSSED_LABEL);
+void embossed_cb(fltk3::Widget *,void *) {
+ text->labeltype(fltk3::EMBOSSED_LABEL);
window->redraw();
}
-void engraved_cb(Widget *,void *) {
- text->labeltype(ENGRAVED_LABEL);
+void engraved_cb(fltk3::Widget *,void *) {
+ text->labeltype(fltk3::ENGRAVED_LABEL);
window->redraw();
}
-MenuItem choices[] = {
- {"NORMAL_LABEL",0,normal_cb},
- {"SYMBOL_LABEL",0,symbol_cb},
- {"SHADOW_LABEL",0,shadow_cb},
- {"ENGRAVED_LABEL",0,engraved_cb},
- {"EMBOSSED_LABEL",0,embossed_cb},
- {0}
+fltk3::MenuItem choices[] = {
+ { "NORMAL_LABEL", 0, normal_cb },
+ { "SYMBOL_LABEL", 0, symbol_cb },
+ { "SHADOW_LABEL", 0, shadow_cb },
+ { "ENGRAVED_LABEL", 0, engraved_cb },
+ { "EMBOSSED_LABEL", 0, embossed_cb },
+ { 0 }
};
int main(int argc, char **argv) {
- window = new DoubleBufferWindow(400,400);
+ window = new fltk3::DoubleBufferWindow(400,400);
window->begin();
{
- input = new Input(50,375,350,25);
+ input = new fltk3::Input(50,375,350,25);
input->static_value("The quick brown fox jumped over the lazy dog.");
- input->when(WHEN_CHANGED);
+ input->when(fltk3::WHEN_CHANGED);
input->callback(input_cb);
- sizes= new HorValueSlider(50,350,350,25,"Size:");
- sizes->align(ALIGN_LEFT);
+ sizes= new fltk3::HorValueSlider(50,350,350,25,"Size:");
+ sizes->align(fltk3::ALIGN_LEFT);
sizes->bounds(1,64);
sizes->step(1);
sizes->value(14);
sizes->callback(size_cb);
- fonts=new HorValueSlider(50,325,350,25,"Font:");
- fonts->align(ALIGN_LEFT);
+ fonts=new fltk3::HorValueSlider(50,325,350,25,"Font:");
+ fonts->align(fltk3::ALIGN_LEFT);
fonts->bounds(0,15);
fonts->step(1);
fonts->value(0);
fonts->callback(font_cb);
- Group *g = new Group(50,300,350,25);
+ fltk3::Group *g = new fltk3::Group(50,300,350,25);
g->begin();
{
- leftb = new ToggleButton(50,300,50,25,"left");
+ leftb = new fltk3::ToggleButton(50,300,50,25,"left");
leftb->callback(button_cb);
- rightb = new ToggleButton(100,300,50,25,"right");
+ rightb = new fltk3::ToggleButton(100,300,50,25,"right");
rightb->callback(button_cb);
- topb = new ToggleButton(150,300,50,25,"top");
+ topb = new fltk3::ToggleButton(150,300,50,25,"top");
topb->callback(button_cb);
- bottomb = new ToggleButton(200,300,50,25,"bottom");
+ bottomb = new fltk3::ToggleButton(200,300,50,25,"bottom");
bottomb->callback(button_cb);
- insideb = new ToggleButton(250,300,50,25,"inside");
+ insideb = new fltk3::ToggleButton(250,300,50,25,"inside");
insideb->callback(button_cb);
- wrapb = new ToggleButton(300,300,50,25,"wrap");
+ wrapb = new fltk3::ToggleButton(300,300,50,25,"wrap");
wrapb->callback(button_cb);
- clipb = new ToggleButton(350,300,50,25,"clip");
+ clipb = new fltk3::ToggleButton(350,300,50,25,"clip");
clipb->callback(button_cb);
g->resizable(insideb);
}
g->end();
- Choice *c = new Choice(50,275,200,25);
+ fltk3::Choice *c = new fltk3::Choice(50,275,200,25);
c->menu(choices);
- text = new Widget(100,75,200,100,input->value());
- text->box(BORDER_BOX);
- text->align(ALIGN_CENTER);
+ text = new fltk3::Widget(100,75,200,100,input->value());
+ text->box(fltk3::BORDER_BOX);
+ text->align(fltk3::ALIGN_CENTER);
window->resizable(text);
}
window->end();
window->show(argc,argv);
- return run();
+ return fltk3::run();
}
//
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
