Skip to content

Commit f09e17c

Browse files
author
Albrecht Schlosser
committed
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.
1 parent b0e0c35 commit f09e17c

File tree

779 files changed

+25025
-29156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

779 files changed

+25025
-29156
lines changed

.clang-format

100755100644
+25-31
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#
2-
# "$Id$"
3-
#
42
# clang-format control file for the FLTK project.
53
#
64
# Copyright 2017 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
97
# the file "COPYING" which should have been included with this file. If this
108
# file is missing or damaged, see the license at:
119
#
12-
# http://www.fltk.org/COPYING.php
10+
# https://www.fltk.org/COPYING.php
1311
#
14-
# Please report all bugs and problems on the following page:
12+
# Please see the following page on how to report bugs and issues:
1513
#
16-
# http://www.fltk.org/str.php
14+
# https://www.fltk.org/bugs.php
1715
#
1816
#
1917
# Important notes:
@@ -46,11 +44,11 @@
4644

4745
# FLTK settings (currently experimental).
4846

49-
BasedOnStyle: LLVM
47+
BasedOnStyle: LLVM
5048

5149
# The Language tag marks C++ options
5250

53-
# Language: Cpp
51+
# Language: Cpp
5452

5553
# The following options override the LLVM style definitions, if set.
5654

@@ -65,61 +63,61 @@ BasedOnStyle: LLVM
6563
# UseTab can be set to 'Never' (default) or 'ForIndentation' to avoid
6664
# this annoying bug of clang-format.
6765
#
68-
# UseTab: Always
69-
UseTab: ForIndentation
66+
# UseTab: Always
67+
UseTab: ForIndentation
7068

7169
# Should we extend code lines beyond 80 columns ?
7270
# Default: 80
73-
ColumnLimit: 120
71+
ColumnLimit: 120
7472

7573
# The FLTK CMP requires that case labels are indented (LLVM: false)
76-
IndentCaseLabels: true
74+
IndentCaseLabels: true
7775

7876
# There are sometimes more than 1 empty lines; should we keep 2 or more ?
7977
# LLVM default is 1.
8078

81-
MaxEmptyLinesToKeep: 2
79+
MaxEmptyLinesToKeep: 2
8280

8381
# Present FLTK source code contains some short blocks and if statements
8482
# in one line, but we should better make it consistent and NOT use the
8583
# following "Allow..." statements (leave them commented out):
8684
#
8785
# LLVM default values:
88-
# AllowShortBlocksOnASingleLine: false
89-
# AllowShortFunctionsOnASingleLine: All
90-
# AllowShortIfStatementsOnASingleLine: false
91-
# AllowShortLoopsOnASingleLine: false
86+
# AllowShortBlocksOnASingleLine: false
87+
# AllowShortFunctionsOnASingleLine: All
88+
# AllowShortIfStatementsOnASingleLine: false
89+
# AllowShortLoopsOnASingleLine: false
9290
#
9391
# FLTK values:
94-
# AllowShortBlocksOnASingleLine: true
95-
# AllowShortIfStatementsOnASingleLine: true
92+
# AllowShortBlocksOnASingleLine: true
93+
# AllowShortIfStatementsOnASingleLine: true
9694

9795
# Short inline functions in header files are an exception to the above "rule":
9896

99-
AllowShortFunctionsOnASingleLine: Inline
97+
AllowShortFunctionsOnASingleLine: Inline
10098

10199
# The following is particularly useful for macros with continuation lines.
102-
# LLVM default: AlignEscapedNewlinesLeft: false
100+
# LLVM default: AlignEscapedNewlinesLeft: false
103101

104-
AlignEscapedNewlinesLeft: true
102+
AlignEscapedNewlinesLeft: true
105103

106104
# Include files should be left as-is until we know we can sort them
107105
# without any bad side effects (LLVM: true)
108106

109-
SortIncludes: false
107+
SortIncludes: false
110108

111109
# Multiple constructor initializers must be on consecutive lines:
112110

113-
BreakConstructorInitializersBeforeComma: true
111+
BreakConstructorInitializersBeforeComma: true
114112

115113
# Constructor initializers will be indented by 2 spaces (LLVM: 4):
116114

117-
ConstructorInitializerIndentWidth: 2
115+
ConstructorInitializerIndentWidth: 2
118116

119117
# Continuation lines (if automatically wrapped) may be indented differently.
120118
# This does not apply to function call arguments which are aligned to the
121119
# opening bracket. LLVM (default): 4
122-
# ContinuationIndentWidth: 2
120+
# ContinuationIndentWidth: 2
123121

124122
# Most of FLTK's code uses 'void *p' as opposed to 'void* p'.
125123
# This is particularly useful in combined declarations like:
@@ -131,9 +129,5 @@ ConstructorInitializerIndentWidth: 2
131129
# Note: this also applies to references like 'int &w, int &h', for instance
132130
# in function parameter lists.
133131

134-
DerivePointerAlignment: false
135-
PointerAlignment: Right
136-
137-
#
138-
# End of "$Id$".
139-
#
132+
DerivePointerAlignment: false
133+
PointerAlignment: Right

.gitattributes

+27-27
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,50 @@
1414

1515
# files that will not be exported in source tarballs
1616

17-
makesrcdist export-ignore eol=lf
18-
.gitattributes export-ignore
19-
.gitignore export-ignore
20-
.gitlab-ci.yml export-ignore
21-
.travis.yml export-ignore
17+
makesrcdist export-ignore eol=lf
18+
.gitattributes export-ignore
19+
.gitignore export-ignore
20+
.gitlab-ci.yml export-ignore
21+
.travis.yml export-ignore
2222

2323
# fluid files (eol=lf or text?)
2424

25-
*.fl eol=lf
25+
*.fl eol=lf
2626

2727
# shell scripts etc. with Unix line endings (lf)
2828

29-
*.ac eol=lf
30-
*.in eol=lf
31-
*.desktop eol=lf
32-
*.sh eol=lf
29+
*.ac eol=lf
30+
*.in eol=lf
31+
*.desktop eol=lf
32+
*.sh eol=lf
3333

34-
fltk-config.in eol=lf
34+
fltk-config.in eol=lf
3535

36-
documentation/make_pdf eol=lf
37-
misc/config.guess eol=lf
38-
misc/config.sub eol=lf
39-
misc/update_config_scripts eol=lf
36+
documentation/make_pdf eol=lf
37+
misc/config.guess eol=lf
38+
misc/config.sub eol=lf
39+
misc/update_config_scripts eol=lf
4040

4141
# files with Windows line endings (crlf)
4242

43-
*.rc eol=crlf
44-
*.bat eol=crlf
43+
*.rc eol=crlf
44+
*.bat eol=crlf
4545

4646
# Android Studio special support file (Windows .bat file)
4747
ide/AndroidStudio3/gradlew.rename_to_bat eol=crlf
4848

4949
# binary files
5050

51-
*.ico binary
52-
*.icns binary
53-
*.jar binary
54-
*.png binary
55-
*.jpg binary
56-
*.ttf binary
57-
*.xcf binary
58-
*.xcf_gz binary
51+
*.ico binary
52+
*.icns binary
53+
*.jar binary
54+
*.png binary
55+
*.jpg binary
56+
*.ttf binary
57+
*.xcf binary
58+
*.xcf_gz binary
5959

6060
# image files that consist of ASCII text
6161

62-
# *.xbm text
63-
# *.xpm text
62+
# *.xbm text
63+
# *.xpm text

.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ stages:
3131
build-autotools:
3232
stage: build
3333
# install the necessary build tools
34-
before_script:
34+
before_script:
3535
- apt update && apt -y install make autoconf man
3636
- apt -y install freeglut3-dev libfontconfig-dev libxft-dev
3737
- apt -y install libxcursor-dev libxinerama-dev libasound2-dev
3838
- apt -y install libpango1.0-dev libcairo2-dev
39-
script:
39+
script:
4040
- make clean
4141
- ./configure --enable-pango --enable-cairo
4242
- time make -j3

CHANGES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Changes in FLTK 1.4.0 Released: ??? ?? 2020
1+
Changes in FLTK 1.4.0 Released: ??? ?? 2020
22

33
General Information about this Release
44

0 commit comments

Comments
 (0)