FLTK logo

[master] 340e2ac - Fix .clang-format and some whitespace errors

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 340e2ac - Fix .clang-format and some whitespace errors "Albrecht Schlosser" Aug 22, 2020  
 
commit 340e2ac3a176ae04c89c1a3e1036472d3e847c62
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sat Aug 22 13:35:42 2020 +0200
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sat Aug 22 13:35:42 2020 +0200

    Fix .clang-format and some whitespace errors
    
    .clang-format: UseTab: ForIndentation -> Never
    
    Update fluid generated files

 .clang-format                        | 4 ++--
 fluid/fluid.cxx                      | 2 +-
 fluid/widget_panel.cxx               | 1 -
 fluid/widget_panel.fl                | 4 ++--
 src/Fl_File_Chooser2.cxx             | 2 +-
 src/Fl_Native_File_Chooser_WIN32.cxx | 2 +-
 src/scandir_posix.c                  | 2 +-
 test/file_chooser.cxx                | 2 +-
 test/pixmap_browser.cxx              | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git .clang-format .clang-format
index 5c95a23..ffa57a8 100644
--- .clang-format
+++ .clang-format
@@ -1,7 +1,7 @@
 #
 # clang-format control file for the FLTK project.
 #
-# Copyright 2017 by Bill Spitzak and others.
+# Copyright 2017-2020 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -64,7 +64,7 @@ BasedOnStyle:                                   LLVM
 # this annoying bug of clang-format.
 #
 # UseTab:                                       Always
-UseTab:                                         ForIndentation
+UseTab:                                         Never
 
 # Should we extend code lines beyond 80 columns ?
 # Default: 80
diff --git fluid/fluid.cxx fluid/fluid.cxx
index e9025a4..dcea17e 100644
--- fluid/fluid.cxx
+++ fluid/fluid.cxx
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <locale.h>	// setlocale()..
+#include <locale.h>     // setlocale()..
 #include <time.h>   // time(), localtime(), etc.
 
 #include "../src/flstring.h"
diff --git fluid/widget_panel.cxx fluid/widget_panel.cxx
index f6a7caf..162fa86 100644
--- fluid/widget_panel.cxx
+++ fluid/widget_panel.cxx
@@ -317,7 +317,6 @@ ive to the origin at construction time");
           { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Size:");
             o->tooltip("The size of the slider.");
             o->labelsize(11);
-            o->step(0.010101);
             o->textsize(11);
             o->callback((Fl_Callback*)slider_size_cb);
             o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
diff --git fluid/widget_panel.fl fluid/widget_panel.fl
index 5ad384d..986f05e 100644
--- fluid/widget_panel.fl
+++ fluid/widget_panel.fl
@@ -295,7 +295,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
           Fl_Value_Input {} {
             label {Size:}
             callback slider_size_cb
-            tooltip {The size of the slider.} xywh {95 185 55 20} labelsize 11 align 5 step 0.010101 textsize 11
+            tooltip {The size of the slider.} xywh {95 185 55 20} labelsize 11 align 5 textsize 11
           }
           Fl_Value_Input {} {
             label {Minimum:}
@@ -674,7 +674,7 @@ wCallback->do_callback(wCallback, v);} open
       Fl_Button {} {
         label Revert
         callback revert_cb
-        comment {Hidden Revert button}
+        comment {Hidden Revert button} selected
         xywh {90 370 60 20} labelsize 11 hide
       }
       Fl_Button wLiveMode {
diff --git src/Fl_File_Chooser2.cxx src/Fl_File_Chooser2.cxx
index c22860c..6350f1d 100644
--- src/Fl_File_Chooser2.cxx
+++ src/Fl_File_Chooser2.cxx
@@ -42,7 +42,7 @@
         \endcode
     - If no "*" pattern is provided, then an entry for "All Files (*)" is automatically added.
     - An optional file preview box is provided which can be toggled by programmer or user
-      showing images, or the first 2048 bytes of printable text. 
+      showing images, or the first 2048 bytes of printable text.
     - Preview image loading functions can be registered to provide custom file previews.
     - The favorites button shows up to 100 user-saved favorite directories, the user's home
       directory, and a filesystems item.
diff --git src/Fl_Native_File_Chooser_WIN32.cxx src/Fl_Native_File_Chooser_WIN32.cxx
index 4b982a6..f9bc777 100644
--- src/Fl_Native_File_Chooser_WIN32.cxx
+++ src/Fl_Native_File_Chooser_WIN32.cxx
@@ -527,7 +527,7 @@ int Fl_WinAPI_Native_File_Chooser_Driver::showfile() {
           strncpy(pathname, wchartoutf8(dirname), FNFC_MAX_PATH);
           strncat(pathname, "\\",                 FNFC_MAX_PATH);
           strncat(pathname, wchartoutf8(s),       FNFC_MAX_PATH);
-	  pathname[FNFC_MAX_PATH-1] = 0;
+          pathname[FNFC_MAX_PATH-1] = 0;
           add_pathname(pathname);
         }
       }
diff --git src/scandir_posix.c src/scandir_posix.c
index 7295d7e..9d83966 100644
--- src/scandir_posix.c
+++ src/scandir_posix.c
@@ -157,7 +157,7 @@ fl_scandir(const char *dir, struct dirent ***namelist,
     if (errmsg) fl_snprintf(errmsg, errmsg_sz, "%s", strerror(errno));
 
     // XXX: This would be a thread safe alternative to the above, but commented
-    //      out because we can get either GNU or POSIX versions on linux, 
+    //      out because we can get either GNU or POSIX versions on linux,
     //      which AFAICT are incompatible: GNU doesn't guarantee errmsg is used
     //      at all, whereas POSIX /only/ fills buffer. The two calls are not really
     //      compatible but have the same name and different return values.. wtf?
diff --git test/file_chooser.cxx test/file_chooser.cxx
index 2d72c7f..abd5a08 100644
--- test/file_chooser.cxx
+++ test/file_chooser.cxx
@@ -39,7 +39,7 @@
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Simple_Terminal.H>
 #include <string.h>
-#include <locale.h>	// setlocale()..
+#include <locale.h>     // setlocale()..
 
 #define TERMINAL_HEIGHT 120
 #define TERMINAL_GREEN  "\033[32m"
diff --git test/pixmap_browser.cxx test/pixmap_browser.cxx
index f625e58..7f30c8a 100644
--- test/pixmap_browser.cxx
+++ test/pixmap_browser.cxx
@@ -23,7 +23,7 @@
 #include <FL/Fl_Printer.H>
 #include <string.h>
 #include <errno.h>
-#include <locale.h>	// setlocale()..
+#include <locale.h>     // setlocale()..
 #include <FL/Fl_File_Chooser.H>
 #include <FL/fl_message.H>
 #include <FL/Fl_SVG_File_Surface.H>
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.