diff --git a/debian/copyright b/debian/copyright index fb9f4617c8d..d57b985763b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -816,30 +816,6 @@ Files: src/plugins/globe/featuresource/qgsglobefeatureoptions.h Copyright: osgEarth License: LGPL-2+ -Files: src/plugins/grass/qtermwidget/konsole_wcwidth.* -Copyright: 2011, Markus Kuhn -License: public-domain - This file is in the public domain - -Files: src/plugins/grass/qtermwidget/kprocess.cpp - src/plugins/grass/qtermwidget/kprocess.h - src/plugins/grass/qtermwidget/kpty.cpp - src/plugins/grass/qtermwidget/kpty.h - src/plugins/grass/qtermwidget/kpty_p.h - src/plugins/grass/qtermwidget/kptydevice.cpp - src/plugins/grass/qtermwidget/kptydevice.h - src/plugins/grass/qtermwidget/kptyprocess.cpp - src/plugins/grass/qtermwidget/kptyprocess.h - src/plugins/grass/qtermwidget/qtermwidget.cpp - src/plugins/grass/qtermwidget/qtermwidget.h - src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp - src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h -Copyright: 2002, Waldo Bastian - 2002-2003, 2007, Oswald Buddenhagen - 2008, e_k - 2010, KDE e.V. -License: LGPL-2+ - Files: src/providers/oracle/ocispatial/main.cpp src/providers/oracle/ocispatial/main.h src/providers/oracle/ocispatial/qsql_ocispatial.cpp diff --git a/debian/qgis-plugin-grass-common.install b/debian/qgis-plugin-grass-common.install index 52cc3147558..61eb52f3bec 100644 --- a/debian/qgis-plugin-grass-common.install +++ b/debian/qgis-plugin-grass-common.install @@ -4,4 +4,3 @@ usr/share/qgis/grass/modules/*.qgm usr/share/qgis/grass/modules/*.svg usr/share/qgis/grass/modules/default.qgc usr/share/qgis/grass/scripts/*.py -usr/share/qgis/grass/qtermwidget/* diff --git a/scripts/astyle.sh b/scripts/astyle.sh index 3c62b0a279d..8b4f6c5ba95 100755 --- a/scripts/astyle.sh +++ b/scripts/astyle.sh @@ -105,7 +105,7 @@ astyleit() { for f in "$@"; do case "$f" in - src/plugins/grass/qtermwidget/*|external/libdxfrw/*|external/untwine/*|external/qwt*|external/o2/*|external/odbccpp/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/lazperf/*|external/meshOptimizer/*|external/mapbox-vector-tile/*|external/pdal_wrench/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*) + external/libdxfrw/*|external/untwine/*|external/qwt*|external/o2/*|external/odbccpp/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/lazperf/*|external/meshOptimizer/*|external/mapbox-vector-tile/*|external/pdal_wrench/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*) echo -ne "$f skipped $elcr" continue ;; diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh index dfd72c1392c..c6691f74e51 100755 --- a/scripts/chkspelling.sh +++ b/scripts/chkspelling.sh @@ -17,6 +17,6 @@ RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\|/;') | sed -e 's/| /|/g; s/|$//;') -EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build.*|debian/.*/usr/|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-|python/ext-libs|i18n/" +EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build.*|debian/.*/usr/|ms-windows/osgeo4w|ChangeLog|src/app/gps/qwtpolar-|python/ext-libs|i18n/" grep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api,pyc} --exclude-dir=.git --exclude-dir=debian/build* --color=always -E "$RE" -ir . | grep -iv -E "$EX" diff --git a/scripts/sort_include.sh b/scripts/sort_include.sh index 7d33cae05d9..6a7f16e33cf 100755 --- a/scripts/sort_include.sh +++ b/scripts/sort_include.sh @@ -30,7 +30,6 @@ FILE3="sort_include_3.tmp" DoNotSort="(sqlite3.h)|(spatialite.h)" for file in $(find . \ - ! -path "./src/plugins/grass/qtermwidget/*" \ ! -path "./python/ext-libs/*" \ ! -path "./external/astyle/*" \ ! -path "./external/qwtpolar-*" \ diff --git a/scripts/spell_check/.agignore b/scripts/spell_check/.agignore index 725959cc7ba..df2bc8e896f 100644 --- a/scripts/spell_check/.agignore +++ b/scripts/spell_check/.agignore @@ -9,10 +9,7 @@ external/* ms-windows/osgeo4w/ python/ext-libs/ python/qsci_apis/ -src/app/gps/qwtpolar-1.0/ -src/app/gps/qwtpolar-1.1.1/ src/core/pal -src/plugins/grass/qtermwidget/ tests/testdata/provider/postgresraster/ #Extensions diff --git a/scripts/update_indent.sh b/scripts/update_indent.sh index ab45645a648..29b555a834e 100644 --- a/scripts/update_indent.sh +++ b/scripts/update_indent.sh @@ -57,7 +57,7 @@ true > $ASTYLEDIFF # reformat for f in $MODIFIED; do case "$f" in - src/plugins/grass/qtermwidget/*|external/astyle/*) + external/astyle/*) echo $f skipped continue ;; diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh index c03e64820db..5ee5238110d 100755 --- a/scripts/update_ts.sh +++ b/scripts/update_ts.sh @@ -193,16 +193,9 @@ EOF echo Updating appinfo files python3 scripts/appinfo2ui.py >src/app/appinfo-i18n.ui - echo Excluding qtermwidget translation files - tar --remove-files -cf src/plugins/grass/qtermwidget/translations.tar src/plugins/grass/qtermwidget/translations/ - echo Creating qmake project file $QMAKE -project -o qgis_ts.pro -nopwd $SRCDIR/src $SRCDIR/python $SRCDIR/i18n $textcpp - echo Restoring qtermwidget translation files - tar xf src/plugins/grass/qtermwidget/translations.tar - rm src/plugins/grass/qtermwidget/translations.tar - QT_INSTALL_HEADERS=$(qmake -query QT_INSTALL_HEADERS) echo "TR_EXCLUDE = ${QT_INSTALL_HEADERS% }/*" >>qgis_ts.pro diff --git a/src/plugins/grass/qtermwidget_version.h b/src/plugins/grass/qtermwidget_version.h deleted file mode 100644 index 7a9831fddba..00000000000 --- a/src/plugins/grass/qtermwidget_version.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 2020 Axel Kittenberger (axel.kittenberger@univie.ac.at) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -#ifndef _Q_TERM_WIDGET_VERSION -#define _Q_TERM_WIDGET_VERSION - -#include -#define QTERMWIDGET_VERSION_MAJOR 1 -#define QTERMWIDGET_VERSION_MINOR 2 -#define QTERMWIDGET_VERSION_PATCH 0 -#define QTERMWIDGET_VERSION QT_VERSION_CHECK(\ - QTERMWIDGET_VERSION_MAJOR,\ - QTERMWIDGET_VERSION_MINOR,\ - QTERMWIDGET_VERSION_PATCH) - -#endif diff --git a/tests/code_layout/test_banned_keywords.sh b/tests/code_layout/test_banned_keywords.sh index bd3aec4d369..b3883e90c5c 100755 --- a/tests/code_layout/test_banned_keywords.sh +++ b/tests/code_layout/test_banned_keywords.sh @@ -147,7 +147,7 @@ pushd "${DIR}" > /dev/null || exit for i in "${!KEYWORDS[@]}" do - FOUND=$(git grep "${KEYWORDS[$i]}" -- 'src/*.h' 'src/*.cpp' -- ':!*qtermwidget*' | grep --invert-match skip-keyword-check) + FOUND=$(git grep "${KEYWORDS[$i]}" -- 'src/*.h' 'src/*.cpp' | grep --invert-match skip-keyword-check) if [[ ${FOUND} ]]; then echo "Found source files with banned keyword: ${KEYWORDS[$i]}!" diff --git a/tests/code_layout/test_licenses.sh b/tests/code_layout/test_licenses.sh index 8ed65f39919..c17c69fa1c9 100755 --- a/tests/code_layout/test_licenses.sh +++ b/tests/code_layout/test_licenses.sh @@ -3,7 +3,7 @@ # This test checks that all source files correctly have license headers INCLUDE_EXTENSIONS="h|cpp|hpp|py|c" -EXCLUDE_LIST="(.*\\/(qtermwidget)\\/|.*\\/(auto_additions)\\/|ui_defaults\\.h|qgspluginmanager_texts\\.cpp|src\\/analysis\\/vector\\/mersenne-twister\\.|^[^.]*$|.*\\.(?!($INCLUDE_EXTENSIONS)$))" +EXCLUDE_LIST="(.*\\/(auto_additions)\\/|ui_defaults\\.h|qgspluginmanager_texts\\.cpp|src\\/analysis\\/vector\\/mersenne-twister\\.|^[^.]*$|.*\\.(?!($INCLUDE_EXTENSIONS)$))" LICENSE_CHECK="external/licensecheck/licensecheck.pl" DIR=$(git rev-parse --show-toplevel)