Remove $Id$ tags, update URL's, and more

- remove obsolete svn '$Id$' tags from all source files
- update .fl files and generated files accordingly
- replace 'http://www.fltk.org' URL's with 'https://...'
- replace bug report URL 'str.php' with 'bugs.php'
- remove trailing whitespace
- fix other whitespace errors flagged by Git
- add and/or fix missing or wrong standard headers
- convert tabs to spaces in all source files

The only relevant code changes are in the fluid/ folder where
some .fl files and other source files were used to generate
the '$Id' headers and footers.

13 files changed, 79 insertions, 157 deletions

diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H
index e6c56a75c..36f7e2543 100644
--- a/src/drivers/Quartz/Fl_Font.H
+++ b/src/drivers/Quartz/Fl_Font.H
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Font definitions for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 // Two internal fltk data structures:
@@ -46,7 +44,3 @@ public:
 extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table
 
 #endif
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
index 087a9fe4c..e97304fe3 100644
--- a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
+++ b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Definition of Apple Quartz graphics driver
 // for the Fast Light Tool Kit (FLTK).
 //
@@ -10,11 +8,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 
@@ -39,7 +37,3 @@ protected:
 };
 
 #endif /* Fl_Quartz_Copy_Surface_Driver_H */
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx
index bf8efceb6..a1377a556 100644
--- a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Copy-to-clipboard code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2019 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -100,12 +98,8 @@ void Fl_Quartz_Copy_Surface_Driver::draw_decorated_window(Fl_Window *win, int x_
   float s = Fl::screen_scale(win->screen_num());
   CGContextScaleCTM(gc, 1/s, s >= 1 ? -1/s : -1);
   Fl_Cocoa_Window_Driver::draw_layer_to_context(layer, gc, win->w() * s, bt*s);
-  CGContextRestoreGState(gc);  
+  CGContextRestoreGState(gc);
   draw(win, x_offset, y_offset + bt); // print the window inner part
 }
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
index 80d0bd615..6f511c6e4 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Definition of Apple Quartz graphics driver
 // for the Fast Light Tool Kit (FLTK).
 //
@@ -10,11 +8,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 /**
@@ -162,7 +160,7 @@ protected:
   virtual Fl_Font set_fonts(const char* xstarname);
   void set_fontname_in_fontdesc(Fl_Fontdesc *f);
   virtual void uncache_pixmap(fl_uintptr_t p);
-  
+
 #if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
   enum {use_CoreText = 1, use_ATSU};
   static int CoreText_or_ATSU;
@@ -196,7 +194,3 @@ public:
 };
 
 #endif // FL_QUARTZ_GRAPHICS_DRIVER_H
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
index e0383cebd..4ea518c9a 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -39,7 +37,7 @@ void Fl_Quartz_Graphics_Driver::init_CoreText_or_ATSU()
   } else {
     CoreText_or_ATSU = use_CoreText;
     CoreText_or_ATSU_draw = &Fl_Quartz_Graphics_Driver::draw_CoreText;
-    CoreText_or_ATSU_width = &Fl_Quartz_Graphics_Driver::width_CoreText;    
+    CoreText_or_ATSU_width = &Fl_Quartz_Graphics_Driver::width_CoreText;
   }
 }
 #endif
@@ -155,7 +153,3 @@ void Fl_Quartz_Graphics_Driver::XDestroyRegion(Fl_Region r) {
     free(r);
   }
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx
index f20b4135d..2cc7a12e6 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Arc (integer) drawing functions for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -70,7 +68,3 @@ void Fl_Quartz_Graphics_Driver::pie(int x,int y,int w,int h,double a1,double a2)
 }
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx
index 8164b9188..cd03a8c04 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // MacOS color functions for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -79,7 +77,3 @@ void Fl_Quartz_Graphics_Driver::set_color(Fl_Color i, unsigned c) {
 }
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
index 6dcfd7ca2..c528f2721 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // MacOS font selection routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 /* Implementation of support for two text drawing APIs: Core Text (current) and ATSU (legacy)
@@ -234,9 +232,9 @@ static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len)
   if (wlen >= utfWlen)
   {
     utfWlen = wlen + 100;
-	if (utfWbuf) free(utfWbuf);
+        if (utfWbuf) free(utfWbuf);
     utfWbuf = (UniChar*)malloc((utfWlen)*sizeof(UniChar));
-	wlen = fl_utf8toUtf16(txt, len, (unsigned short*)utfWbuf, utfWlen);
+        wlen = fl_utf8toUtf16(txt, len, (unsigned short*)utfWbuf, utfWlen);
   }
   *new_len = wlen;
   return utfWbuf;
@@ -522,15 +520,15 @@ double Fl_Quartz_Graphics_Driver::ADD_SUFFIX(width, _CoreText)(const UniChar* tx
       CGSize advance_size;
       CGGlyph glyph;
       for (int j = 0; j < block; j++) { // loop over the block
-	// ii spans all characters of this block
-	bool b = CTFontGetGlyphsForCharacters(fl_fontsize->fontref, &ii, &glyph, 1);
-	if (b)
-	  CTFontGetAdvancesForGlyphs(fl_fontsize->fontref, kCTFontHorizontalOrientation, &glyph, &advance_size, 1);
-	else
-	  advance_size.width = -1e9; // calculate this later
-	// the width of one character of this block of characters
-	fl_fontsize->width[r][j] = advance_size.width;
-	ii++;
+        // ii spans all characters of this block
+        bool b = CTFontGetGlyphsForCharacters(fl_fontsize->fontref, &ii, &glyph, 1);
+        if (b)
+          CTFontGetAdvancesForGlyphs(fl_fontsize->fontref, kCTFontHorizontalOrientation, &glyph, &advance_size, 1);
+        else
+          advance_size.width = -1e9; // calculate this later
+        // the width of one character of this block of characters
+        fl_fontsize->width[r][j] = advance_size.width;
+        ii++;
       }
     }
     // sum the widths of all characters of txt
@@ -542,12 +540,12 @@ double Fl_Quartz_Graphics_Driver::ADD_SUFFIX(width, _CoreText)(const UniChar* tx
       bool must_release = false;
       bool b = CTFontGetGlyphsForCharacters(font2, &uni, &glyph, 1);
       if (!b) { // the current font doesn't contain this char
-	CFStringRef str = CFStringCreateWithCharactersNoCopy(NULL, &uni, 1, kCFAllocatorNull);
-	// find a font that contains it
-	font2 = CTFontCreateForString(font2, str, CFRangeMake(0,1));
-	must_release = true;
-	CFRelease(str);
-	b = CTFontGetGlyphsForCharacters(font2, &uni, &glyph, 1);
+        CFStringRef str = CFStringCreateWithCharactersNoCopy(NULL, &uni, 1, kCFAllocatorNull);
+        // find a font that contains it
+        font2 = CTFontCreateForString(font2, str, CFRangeMake(0,1));
+        must_release = true;
+        CFRelease(str);
+        b = CTFontGetGlyphsForCharacters(font2, &uni, &glyph, 1);
       }
       if (b) CTFontGetAdvancesForGlyphs(font2, kCTFontHorizontalOrientation, &glyph, &advance_size, 1);
       else advance_size.width = 0.;
@@ -847,13 +845,13 @@ Fl_Font Fl_Quartz_Graphics_Driver::ADD_SUFFIX(set_fonts, _ATSU)(const char* xsta
   for (ItemCount idx = 0; idx < oFontCount; idx++)
   {
     //  ByteCount actualLength = 0;
-    //	Ptr oName;
+    //  Ptr oName;
     // How to get the name - Apples docs say call this twice, once to get the length, then again
     // to get the actual name...
     //    ATSUFindFontName (oFontIDs[idx], kFontFullName, kFontMacintoshPlatform, kFontRomanScript, kFontEnglishLanguage,
     //                      0, NULL, &actualLength, NULL);
     // Now actualLength tells us the length of buffer we need
-    //	oName = (Ptr)malloc(actualLength + 8);
+    //  oName = (Ptr)malloc(actualLength + 8);
     // But who's got time for that nonsense? Let's just hard code a fixed buffer (urgh!)
     ByteCount actualLength = 511;
     char oName[512];
@@ -865,7 +863,7 @@ Fl_Font Fl_Quartz_Graphics_Driver::ADD_SUFFIX(set_fonts, _ATSU)(const char* xsta
     else
       oName[actualLength] = 0;
     Fl::set_font((Fl_Font)(fl_free_font++), strdup(oName));
-    //	free(oName);
+    //  free(oName);
   }
   free(oFontIDs);
   return (Fl_Font)fl_free_font;
@@ -874,7 +872,3 @@ Fl_Font Fl_Quartz_Graphics_Driver::ADD_SUFFIX(set_fonts, _ATSU)(const char* xsta
 #endif // HAS_ATSU
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
index 5060c2009..98c37617c 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // MacOS image drawing code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -50,8 +48,8 @@ static void dataReleaseCB(void *info, const void *data, size_t size)
  userdata:  ?
  */
 static void innards(const uchar *buf, int X, int Y, int W, int H,
-		    int delta, int linedelta, int mono,
-		    Fl_Draw_Image_Cb cb, void* userdata, CGContextRef gc, Fl_Quartz_Graphics_Driver *driver)
+                    int delta, int linedelta, int mono,
+                    Fl_Draw_Image_Cb cb, void* userdata, CGContextRef gc, Fl_Quartz_Graphics_Driver *driver)
 {
   if (!linedelta) linedelta = W*abs(delta);
 
@@ -65,14 +63,14 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
     tmpBuf = new uchar[ H*W*abs(delta) ];
     if (cb) {
       for (int i=0; i<H; i++) {
-	cb(userdata, 0, i, W, tmpBuf+i*W*abs(delta));
+        cb(userdata, 0, i, W, tmpBuf+i*W*abs(delta));
       }
     } else {
       uchar *p = tmpBuf;
       for (int i=0; i<H; i++) {
-	memcpy(p, buf+i*abs(linedelta), W*abs(delta));
-	p += W*abs(delta);
-	}
+        memcpy(p, buf+i*abs(linedelta), W*abs(delta));
+        p += W*abs(delta);
+        }
     }
     array = (void*)tmpBuf;
     linedelta = W*abs(delta);
@@ -86,8 +84,8 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
   // a release callback is necessary when the gc is a print context because the image data
   // must be kept until the page is closed. Thus tmpBuf can't be deleted here. It's too early.
   CGDataProviderRef src = CGDataProviderCreateWithData( 0L, array, abs(linedelta)*H,
-						       tmpBuf ? dataReleaseCB : NULL
-						       );
+                                                       tmpBuf ? dataReleaseCB : NULL
+                                                       );
   CGImageRef        img = CGImageCreate( W, H, 8, 8*abs(delta), abs(linedelta),
                             lut, abs(delta)&1?kCGImageAlphaNone:kCGImageAlphaLast,
                             src, 0L, false, kCGRenderingIntentDefault);
@@ -115,14 +113,14 @@ void Fl_Quartz_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w
   innards(buf,x,y,w,h,d,l,(d<3&&d>-3),0,0,gc_,this);
 }
 void Fl_Quartz_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data,
-		   int x, int y, int w, int h,int d) {
+                   int x, int y, int w, int h,int d) {
   innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data,gc_,this);
 }
 void Fl_Quartz_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){
   innards(buf,x,y,w,h,d,l,1,0,0,gc_,this);
 }
 void Fl_Quartz_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data,
-		   int x, int y, int w, int h,int d) {
+                   int x, int y, int w, int h,int d) {
   innards(0,x,y,w,h,d,0,1,cb,data,gc_,this);
 }
 
@@ -211,7 +209,7 @@ void Fl_Quartz_Graphics_Driver::draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int
   if (!*id(pxm)) {
     cache(pxm);
   }
-  
+
   CGImageRef cgimg = (CGImageRef)*Fl_Graphics_Driver::id(pxm);
   draw_CGImage(cgimg, X,Y,W,H, cx,cy, pxm->w(), pxm->h());
 }
@@ -290,7 +288,3 @@ void Fl_Quartz_Graphics_Driver::draw_CGImage(CGImageRef cgimg, int x, int y, int
 void Fl_Quartz_Graphics_Driver::uncache_pixmap(fl_uintptr_t pixmap_ref) {
   CGImageRelease((CGImageRef)pixmap_ref);
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
index 1945ea55d..8dfa3090c 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Line style code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -44,7 +42,7 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
   static CGLineJoin Join[4] = { kCGLineJoinMiter, kCGLineJoinMiter,
                                     kCGLineJoinRound, kCGLineJoinBevel };
   if (width<1) width = 1;
-  quartz_line_width_ = (float)width; 
+  quartz_line_width_ = (float)width;
   quartz_line_cap_ = Cap[(style>>8)&3];
   // when printing kCGLineCapSquare seems better for solid lines
   if ( Fl_Surface_Device::surface() != Fl_Display_Device::display_device()
@@ -53,7 +51,7 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
     quartz_line_cap_ = kCGLineCapSquare;
   }
   quartz_line_join_ = Join[(style>>12)&3];
-  char *d = dashes; 
+  char *d = dashes;
   static CGFloat pattern[16];
   if (d && *d) {
     CGFloat *pDst = pattern;
@@ -65,7 +63,7 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
     // adjust lengths to account for cap:
     if (style & 0x200) {
       dash = char(2*width);
-      dot = 1; 
+      dot = 1;
       gap = char(2*width-1);
     } else {
       dash = char(3*width);
@@ -88,7 +86,3 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
 }
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx
index 8266f16e8..caf4277c4 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 
@@ -302,7 +300,3 @@ void Fl_Quartz_Graphics_Driver::restore_clip() {
 
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx
index 4a63b364d..5ee8f924f 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Portable drawing routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -42,7 +40,7 @@ void Fl_Quartz_Graphics_Driver::vertex(double x,double y) {
 
 void Fl_Quartz_Graphics_Driver::end_points() {
   if (quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(gc_, true);
-  for (int i=0; i<n; i++) { 
+  for (int i=0; i<n; i++) {
     CGContextMoveToPoint(gc_, p[i].x, p[i].y);
     CGContextAddLineToPoint(gc_, p[i].x, p[i].y);
     CGContextStrokePath(gc_);
@@ -79,7 +77,7 @@ void Fl_Quartz_Graphics_Driver::end_polygon() {
   if (n<=1) return;
   CGContextSetShouldAntialias(gc_, true);
   CGContextMoveToPoint(gc_, p[0].x, p[0].y);
-  for (int i=1; i<n; i++) 
+  for (int i=1; i<n; i++)
     CGContextAddLineToPoint(gc_, p[i].x, p[i].y);
   CGContextClosePath(gc_);
   CGContextFillPath(gc_);
@@ -153,7 +151,3 @@ void Fl_Quartz_Graphics_Driver::fixloop() {  // remove equal points from closed
 
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
index c0ac388d0..61068cf87 100644
--- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Draw-to-image code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -76,7 +74,7 @@ Fl_Quartz_Image_Surface_Driver::Fl_Quartz_Image_Surface_Driver(int w, int h, int
     driver()->scale(s);
   }
   CGContextSetShouldAntialias(offscreen, false);
-  CGContextTranslateCTM(offscreen, 0, height);  
+  CGContextTranslateCTM(offscreen, 0, height);
   CGContextScaleCTM(offscreen, 1.0f, -1.0f);
   CGContextSaveGState(offscreen);
   CGContextSetRGBFillColor(offscreen, 1, 1, 1, 0);
@@ -132,7 +130,3 @@ void Fl_Quartz_Image_Surface_Driver::end_current()
 }
 
 #endif // FL_CFG_GFX_QUARTZ
-
-//
-// End of "$Id$".
-//