Skip to content

Commit

Permalink
clean more last traces
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 28, 2018
1 parent 9fe26af commit 11faa58
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 27 deletions.
12 changes: 5 additions & 7 deletions debian/copyright
Expand Up @@ -166,9 +166,7 @@ Comment: Voronoi diagram calculator/ Delaunay triangulator
Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html
License: GPL-2+

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

Files: src/providers/oracle/ocispatial/qsql_ocispatial.h
src/providers/oracle/ocispatial/qsqlcachedresult_p.h
src/providers/spatialite/qspatialite/qsql_spatialite.cpp
src/providers/spatialite/qspatialite/qsql_spatialite.h
src/providers/spatialite/qspatialite/qsqlcachedresult_p.h
src/providers/spatialite/qspatialite/smain.cpp
external/qspatialite/qsql_spatialite.cpp
external/qspatialite/qsql_spatialite.h
external/qspatialite/qsqlcachedresult_p.h
external/qspatialite/smain.cpp
Copyright: 2012, Digia Plc and/or its subsidiary(-ies)
License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3

Expand Down
2 changes: 1 addition & 1 deletion scripts/addcopyright.sh
Expand Up @@ -43,7 +43,7 @@ for i in $FILES; do
author=volayaf
;;

src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|lib/astyle/*)
src/app/qtmain_android.cpp)
# Skip third party files
echo "${i} skipped"
continue
Expand Down
2 changes: 1 addition & 1 deletion scripts/astyle.sh
Expand Up @@ -85,7 +85,7 @@ astyleit() {

for f in "$@"; do
case "$f" in
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/*)
src/plugins/grass/qtermwidget/*|external/o2/*|external/astyle/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
echo -ne "$f skipped $elcr"
continue
;;
Expand Down
5 changes: 0 additions & 5 deletions scripts/prepare-commit.sh
Expand Up @@ -74,11 +74,6 @@ for f in $MODIFIED; do
(( i++ )) || true

case "$f" in
src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*)
echo "$f" skipped
continue
;;

*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py)
;;

Expand Down
9 changes: 3 additions & 6 deletions scripts/sort_include.sh
Expand Up @@ -30,14 +30,11 @@ FILE3="sort_include_3.tmp"
DoNotSort="(sqlite3.h)|(spatialite.h)"

for file in $(find . \
! -path "./src/app/gps/qwtpolar-*" \
! -path "./src/core/gps/qextserialport/*" \
! -path "./src/plugins/grass/qtermwidget/*" \
! -path "./src/astyle/*" \
! -path "./python/ext-libs/*" \
! -path "./src/providers/spatialite/qspatialite/*" \
! -path "./src/plugins/globe/osgEarthQt/*" \
! -path "./src/plugins/globe/osgEarthUtil/*" \
! -path "./external/astyle/*" \
! -path "./external/qwtpolar-*" \
! -path "./external/qspatialite/*" \
-regex "./src/\(.+/\)*.*\.\(h\|cpp\)" -type f \
-or -regex "./tests/\(.+/\)*.*\.\(h\|cpp\)" -type f )
do
Expand Down
1 change: 0 additions & 1 deletion scripts/spell_check/.agignore
Expand Up @@ -14,7 +14,6 @@ src/app/gps/qwtpolar-1.0/
src/app/gps/qwtpolar-1.1.1/
src/core/pal
src/plugins/grass/qtermwidget/
src/3d/poly2tri/


#Extensions
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-indent.sh
Expand Up @@ -57,7 +57,7 @@ true > $ASTYLEDIFF
# reformat
for f in $MODIFIED; do
case "$f" in
src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|external/astyle/*)
src/plugins/grass/qtermwidget/*|external/astyle/*)
echo $f skipped
continue
;;
Expand Down
5 changes: 0 additions & 5 deletions scripts/verify-indentation.sh
Expand Up @@ -36,11 +36,6 @@ for f in $FILES; do

echo "Checking $f" >>/tmp/ctest-important.log
case "$f" in
src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*|scripts/customwidget_template*)
echo "$f skipped"
continue
;;

*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py)
;;

Expand Down

0 comments on commit 11faa58

Please sign in to comment.