Fix .clang-format and some whitespace errors

.clang-format: UseTab: ForIndentation -> Never

Update fluid generated files
This commit is contained in:
Albrecht Schlosser 2020-08-22 13:35:42 +02:00
parent 206675a3b1
commit 340e2ac3a1
9 changed files with 10 additions and 11 deletions

View File

@ -1,7 +1,7 @@
# #
# clang-format control file for the FLTK project. # 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 # 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 # 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. # this annoying bug of clang-format.
# #
# UseTab: Always # UseTab: Always
UseTab: ForIndentation UseTab: Never
# Should we extend code lines beyond 80 columns ? # Should we extend code lines beyond 80 columns ?
# Default: 80 # Default: 80

View File

@ -40,7 +40,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <locale.h> // setlocale().. #include <locale.h> // setlocale()..
#include <time.h> // time(), localtime(), etc. #include <time.h> // time(), localtime(), etc.
#include "../src/flstring.h" #include "../src/flstring.h"

View File

@ -317,7 +317,6 @@ ive to the origin at construction time");
{ Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Size:"); { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Size:");
o->tooltip("The size of the slider."); o->tooltip("The size of the slider.");
o->labelsize(11); o->labelsize(11);
o->step(0.010101);
o->textsize(11); o->textsize(11);
o->callback((Fl_Callback*)slider_size_cb); o->callback((Fl_Callback*)slider_size_cb);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT)); o->align(Fl_Align(FL_ALIGN_TOP_LEFT));

View File

@ -295,7 +295,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
Fl_Value_Input {} { Fl_Value_Input {} {
label {Size:} label {Size:}
callback slider_size_cb 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 {} { Fl_Value_Input {} {
label {Minimum:} label {Minimum:}
@ -674,7 +674,7 @@ wCallback->do_callback(wCallback, v);} open
Fl_Button {} { Fl_Button {} {
label Revert label Revert
callback revert_cb callback revert_cb
comment {Hidden Revert button} comment {Hidden Revert button} selected
xywh {90 370 60 20} labelsize 11 hide xywh {90 370 60 20} labelsize 11 hide
} }
Fl_Button wLiveMode { Fl_Button wLiveMode {

View File

@ -42,7 +42,7 @@
\endcode \endcode
- If no "*" pattern is provided, then an entry for "All Files (*)" is automatically added. - 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 - 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. - 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 - The favorites button shows up to 100 user-saved favorite directories, the user's home
directory, and a filesystems item. directory, and a filesystems item.

View File

@ -527,7 +527,7 @@ int Fl_WinAPI_Native_File_Chooser_Driver::showfile() {
strncpy(pathname, wchartoutf8(dirname), FNFC_MAX_PATH); strncpy(pathname, wchartoutf8(dirname), FNFC_MAX_PATH);
strncat(pathname, "\\", FNFC_MAX_PATH); strncat(pathname, "\\", FNFC_MAX_PATH);
strncat(pathname, wchartoutf8(s), 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); add_pathname(pathname);
} }
} }

View File

@ -157,7 +157,7 @@ fl_scandir(const char *dir, struct dirent ***namelist,
if (errmsg) fl_snprintf(errmsg, errmsg_sz, "%s", strerror(errno)); if (errmsg) fl_snprintf(errmsg, errmsg_sz, "%s", strerror(errno));
// XXX: This would be a thread safe alternative to the above, but commented // 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 // which AFAICT are incompatible: GNU doesn't guarantee errmsg is used
// at all, whereas POSIX /only/ fills buffer. The two calls are not really // at all, whereas POSIX /only/ fills buffer. The two calls are not really
// compatible but have the same name and different return values.. wtf? // compatible but have the same name and different return values.. wtf?

View File

@ -39,7 +39,7 @@
#include <FL/Fl_Double_Window.H> #include <FL/Fl_Double_Window.H>
#include <FL/Fl_Simple_Terminal.H> #include <FL/Fl_Simple_Terminal.H>
#include <string.h> #include <string.h>
#include <locale.h> // setlocale().. #include <locale.h> // setlocale()..
#define TERMINAL_HEIGHT 120 #define TERMINAL_HEIGHT 120
#define TERMINAL_GREEN "\033[32m" #define TERMINAL_GREEN "\033[32m"

View File

@ -23,7 +23,7 @@
#include <FL/Fl_Printer.H> #include <FL/Fl_Printer.H>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <locale.h> // setlocale().. #include <locale.h> // setlocale()..
#include <FL/Fl_File_Chooser.H> #include <FL/Fl_File_Chooser.H>
#include <FL/fl_message.H> #include <FL/fl_message.H>
#include <FL/Fl_SVG_File_Surface.H> #include <FL/Fl_SVG_File_Surface.H>