summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Image_Reader.h2
-rw-r--r--src/Fl_Native_File_Chooser_GTK.cxx4
-rw-r--r--src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H12
-rw-r--r--src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H2
-rw-r--r--src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H22
-rw-r--r--src/gl_draw.cxx2
6 files changed, 22 insertions, 22 deletions
diff --git a/src/Fl_Image_Reader.h b/src/Fl_Image_Reader.h
index b013dc481..93f5edc0d 100644
--- a/src/Fl_Image_Reader.h
+++ b/src/Fl_Image_Reader.h
@@ -62,7 +62,7 @@ public:
// Read a 32-bit signed integer, LSB-first
int read_long() {
return (int)read_dword();
- };
+ }
// Move the current read position to a byte offset from the beginning
// of the file or the original start address in memory
diff --git a/src/Fl_Native_File_Chooser_GTK.cxx b/src/Fl_Native_File_Chooser_GTK.cxx
index 10877741a..269405e48 100644
--- a/src/Fl_Native_File_Chooser_GTK.cxx
+++ b/src/Fl_Native_File_Chooser_GTK.cxx
@@ -109,10 +109,10 @@ private:
pair(Fl_GTK_Native_File_Chooser_Driver* c, const char *f) {
running = c;
filter = fl_strdup(f);
- };
+ }
~pair() {
free((char*)filter);
- };
+ }
};
GtkWidget *gtkw_ptr; // used to hold a GtkWidget* without pulling GTK into everything...
void *gtkw_slist; // used to hold a GLib GSList...
diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
index 09a5d67a5..aff73c4f2 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
@@ -48,7 +48,7 @@ public:
int gap_;
int pages_;
cairo_t *cr() { return cairo_; }
- PangoLayout *pango_layout() {return pango_layout_;};
+ PangoLayout *pango_layout() {return pango_layout_;}
void check_status(void);
@@ -117,17 +117,17 @@ public:
void end_line();
void end_loop();
void end_polygon();
- void begin_complex_polygon(){begin_polygon();};
- void gap(){gap_=1;};
- void end_complex_polygon(){end_polygon();};
+ void begin_complex_polygon() { begin_polygon(); }
+ void gap() { gap_ = 1; }
+ void end_complex_polygon() { end_polygon(); }
void transformed_vertex(double x, double y);
void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0);
void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3);
void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1);
- void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); };
- void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); };
+ void draw(const char* s, int nBytes, int x, int y) { transformed_draw(s,nBytes,x,y); }
+ void draw(const char* s, int nBytes, float x, float y) { transformed_draw(s,nBytes,x,y); }
void draw(int angle, const char *str, int n, int x, int y);
void rtl_draw(const char* s, int n, int x, int y);
void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy);
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
index f240e769b..9932f0789 100644
--- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
@@ -84,7 +84,7 @@ public:
int descent();
// ---
Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; }
- void delete_bitmask(Fl_Bitmask bm) { };
+ void delete_bitmask(Fl_Bitmask bm) { }
};
#endif // FL_OPENGL_GRAPHICS_DRIVER_H
diff --git a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
index 84ac2e44c..4a0584036 100644
--- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
+++ b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
@@ -51,8 +51,8 @@ public:
Fl_PostScript_Graphics_Driver();
~Fl_PostScript_Graphics_Driver();
- void close_command(Fl_PostScript_Close_Command cmd){close_cmd_=cmd;};
- FILE * file() {return output;};
+ void close_command(Fl_PostScript_Close_Command cmd){close_cmd_=cmd;}
+ FILE * file() {return output;}
void page(double pw, double ph, int media = 0);
void page(int format);
int start_postscript (int pagecount, enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout);
@@ -112,7 +112,7 @@ public:
int my; // mask lines
int page_policy_;
void page_policy(int p);
- int page_policy(){return page_policy_;};
+ int page_policy() { return page_policy_; }
int alpha_mask(const uchar * data, int w, int h, int D, int LD=0);
/** Shields output PostScript data from modifications of the current locale.
It typically avoids PostScript errors caused if the current locale uses comma instead of dot
@@ -154,11 +154,11 @@ public:
enum Fl_Paged_Device::Page_Format page_format_;
char *ps_filename_;
- void close_command(Fl_PostScript_Close_Command cmd){close_cmd_=cmd;};
- FILE * file() {return output;};
+ void close_command(Fl_PostScript_Close_Command cmd){close_cmd_=cmd;}
+ FILE * file() {return output;}
//void orientation (int o);
//Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int pages = 0); // ps (also multi-page) constructor
- //void interpolate(int i){interpolate_=i;};
+ //void interpolate(int i){interpolate_=i;}
//int interpolate(){return interpolate_;}
void page(double pw, double ph, int media = 0);
@@ -211,9 +211,9 @@ public:
void end_line();
void end_loop();
void end_polygon();
- void begin_complex_polygon(){begin_polygon();};
- void gap(){gap_=1;};
- void end_complex_polygon(){end_polygon();};
+ void begin_complex_polygon(){begin_polygon();}
+ void gap(){gap_=1;}
+ void end_complex_polygon(){end_polygon();}
void transformed_vertex(double x, double y);
void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0);
@@ -221,8 +221,8 @@ public:
void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3);
void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1);
- void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); };
- void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); };
+ void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); }
+ void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); }
void draw(int angle, const char *str, int n, int x, int y);
void rtl_draw(const char* s, int n, int x, int y);
void font(int face, int size);
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index c64506d86..1ec4798bf 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -273,7 +273,7 @@ private:
int already_known(const char *str, int n);
public:
gl_texture_fifo(int max = 100); // 100 = default height of texture pile
- inline int size(void) {return size_; };
+ inline int size(void) {return size_; }
~gl_texture_fifo(void);
};