Skip to content

Commit 11faa58

Browse files
committed
clean more last traces
1 parent 9fe26af commit 11faa58

File tree

8 files changed

+11
-27
lines changed

8 files changed

+11
-27
lines changed

debian/copyright

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ Comment: Voronoi diagram calculator/ Delaunay triangulator
166166
Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html
167167
License: GPL-2+
168168

169-
Files: external//qwtpolar-0.1/*
170-
external//qwtpolar-1.0/*
171-
external//qwtpolar-1.1.1/*
169+
Files: external/qwtpolar-1.1.1/*
172170
Copyright: 2008, Uwe Rathmann
173171
Comment: This library is free software; you can redistribute it and/or
174172
modify it under the terms of the Qwt License, Version 1.0
@@ -304,10 +302,10 @@ License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
304302

305303
Files: src/providers/oracle/ocispatial/qsql_ocispatial.h
306304
src/providers/oracle/ocispatial/qsqlcachedresult_p.h
307-
src/providers/spatialite/qspatialite/qsql_spatialite.cpp
308-
src/providers/spatialite/qspatialite/qsql_spatialite.h
309-
src/providers/spatialite/qspatialite/qsqlcachedresult_p.h
310-
src/providers/spatialite/qspatialite/smain.cpp
305+
external/qspatialite/qsql_spatialite.cpp
306+
external/qspatialite/qsql_spatialite.h
307+
external/qspatialite/qsqlcachedresult_p.h
308+
external/qspatialite/smain.cpp
311309
Copyright: 2012, Digia Plc and/or its subsidiary(-ies)
312310
License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
313311

scripts/addcopyright.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ for i in $FILES; do
4343
author=volayaf
4444
;;
4545

46-
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|lib/astyle/*)
46+
src/app/qtmain_android.cpp)
4747
# Skip third party files
4848
echo "${i} skipped"
4949
continue

scripts/astyle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ astyleit() {
8585

8686
for f in "$@"; do
8787
case "$f" in
88-
src/app/gps/qwtpolar-*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|external/o2/*|external/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|*/ui_*.py|*.astyle|tests/testdata/*|editors/*)
88+
src/plugins/grass/qtermwidget/*|external/o2/*|external/astyle/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
8989
echo -ne "$f skipped $elcr"
9090
continue
9191
;;

scripts/prepare-commit.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ for f in $MODIFIED; do
7474
(( i++ )) || true
7575

7676
case "$f" in
77-
src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*)
78-
echo "$f" skipped
79-
continue
80-
;;
81-
8277
*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py)
8378
;;
8479

scripts/sort_include.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,11 @@ FILE3="sort_include_3.tmp"
3030
DoNotSort="(sqlite3.h)|(spatialite.h)"
3131

3232
for file in $(find . \
33-
! -path "./src/app/gps/qwtpolar-*" \
34-
! -path "./src/core/gps/qextserialport/*" \
3533
! -path "./src/plugins/grass/qtermwidget/*" \
36-
! -path "./src/astyle/*" \
3734
! -path "./python/ext-libs/*" \
38-
! -path "./src/providers/spatialite/qspatialite/*" \
39-
! -path "./src/plugins/globe/osgEarthQt/*" \
40-
! -path "./src/plugins/globe/osgEarthUtil/*" \
35+
! -path "./external/astyle/*" \
36+
! -path "./external/qwtpolar-*" \
37+
! -path "./external/qspatialite/*" \
4138
-regex "./src/\(.+/\)*.*\.\(h\|cpp\)" -type f \
4239
-or -regex "./tests/\(.+/\)*.*\.\(h\|cpp\)" -type f )
4340
do

scripts/spell_check/.agignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ src/app/gps/qwtpolar-1.0/
1414
src/app/gps/qwtpolar-1.1.1/
1515
src/core/pal
1616
src/plugins/grass/qtermwidget/
17-
src/3d/poly2tri/
1817

1918

2019
#Extensions

scripts/update-indent.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ true > $ASTYLEDIFF
5757
# reformat
5858
for f in $MODIFIED; do
5959
case "$f" in
60-
src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|external/astyle/*)
60+
src/plugins/grass/qtermwidget/*|external/astyle/*)
6161
echo $f skipped
6262
continue
6363
;;

scripts/verify-indentation.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ for f in $FILES; do
3636

3737
echo "Checking $f" >>/tmp/ctest-important.log
3838
case "$f" in
39-
src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*|scripts/customwidget_template*)
40-
echo "$f skipped"
41-
continue
42-
;;
43-
4439
*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py)
4540
;;
4641

0 commit comments

Comments
 (0)