Minor cleanup (#188)

* Use license file from gnu.org

This fixes a strange typo in the license file, as well as upgrades links
to https and fixes one redirect.

Downloaded from:
https://www.gnu.org/licenses/gpl-3.0.txt

* Fix shellcheck warnings

Co-authored-by: Your Name <you@example.com>

COPYING

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
-the only significan't mode of use of the product.
+the only significant mode of use of the product.
 
   "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

ChangeLog

@@ -229,7 +229,7 @@ Version 1.0
   - System Language autodetection does not work [BUG-13]
   - Error while loading application settings by key: 'WineLibs'. File or path does not exist: "" [BUG-12]
   - q4wine doesn't clean up user's tmp directory [BUG-11]
- 
+
  Removed:
   - File -> Install wizard menu entry;
 

INSTALL

@@ -1,6 +1,6 @@
 Qt GUI for Wine
 ***********************************************
- 
+
 Q4Wine is a Qt GUI for Wine that helps manage Wine prefixes and installed applications.
 
 This software is published under the terms of the GNU GPL V3 and comes
@@ -56,7 +56,7 @@ Installation
 
        LINGUAS                   : "af;cs;de;en;es;fa;fr;he;it;ja;pl;pt_BR;ru;uk;zh_TW"
 
-       Optional buils flags:     : Default | Possible
+       Optional build flags:     : Default | Possible
 
        DEBUG                     : OFF | ON
        RELEASE                   : ON  | OFF
@@ -69,7 +69,7 @@ Installation
 
        DEBUG                     : If ON, then q4wine will send debug messages to STDOUT.
                                  : Use it for development or bug reportint purposes;
-       RELEASE                   : If OFF, then force q4wine to use APP_BUILD as CMAKE_INSTALL_PREFIX. 
+       RELEASE                   : If OFF, then force q4wine to use APP_BUILD as CMAKE_INSTALL_PREFIX.
                                  : Use it for development purposes;
        QT5                       : If ON, then q4wine will be built with Qt 5.x.
        WITH_ICOUTILS             : If ON, then build q4wine with icoutils support;
@@ -88,7 +88,7 @@ Known Issues:
 ***********************************************
 1. Non-standard directories
 
-If you have installed q4wine in a non-standard directory, 
+If you have installed q4wine in a non-standard directory,
 and you get the following error message: "error while loading shared libraries: libq4wine-core.so",
 then you need to override LD_LIBRARY_PATH variable.
 

README

@@ -64,4 +64,3 @@ BrezBlock ( https://brezblock.org.ua/ ) maintainer
 E-mail: brezerk@gmail.com
 Web-site: https://brezblock.org.ua/
 BrezBlock, Kyiv, Ukraine
-

cleanup.sh

@@ -6,15 +6,15 @@ echo ' * Following script will remove all files not needed for release process.
  * Hit ^C to abort or any key to continue.'
 read
 
-SRC_DIR="$(dirname $(realpath -s ${0}))"
+SRC_DIR="$(dirname "$(realpath -s "${0}")")"
 
 cd "${SRC_DIR}"
 rm   -rf .git build config.h doc
-find -name CMakeLists.txt.user -delete
-find -name CMakeCache.txt -delete
-find -name cmake_install.cmake -delete
-find -name '*.swo' -delete
-find -name '*.swp' -delete
-find -depth -empty -type d -delete
+find . -name CMakeLists.txt.user -delete
+find . -name CMakeCache.txt -delete
+find . -name cmake_install.cmake -delete
+find . -name '*.swo' -delete
+find . -name '*.swp' -delete
+find . -depth -empty -type d -delete
 
 echo 'Done. Happy releasing :P'

pkg/ua.org.brezblock.Q4Wine.yaml

@@ -200,4 +200,3 @@ modules:
       - type: archive
         url: http://savannah.nongnu.org/download/icoutils/icoutils-0.32.3.tar.bz2
         sha256: 17abe02d043a253b68b47e3af69c9fc755b895db68fdc8811786125df564c6e0
-

src/core/database/db.cpp

@@ -80,7 +80,7 @@ bool DataBase::checkDb(){
                 if(!query.exec("CREATE TABLE prefix (wine_dllpath TEXT, wine_loader TEXT, wine_server TEXT, wine_exec TEXT, cdrom_mount TEXT, id INTEGER PRIMARY KEY, name TEXT, path TEXT, version TEXT);"))
                     return false;
 
-                // Creating default prefix reccord
+                // Creating default prefix record
                 query.prepare("INSERT INTO prefix(id, name) VALUES(NULL, :name);");
                 query.bindValue(":name", "Default");
                 if (!query.exec())
@@ -159,7 +159,7 @@ bool DataBase::checkDb(){
                 if(!query.exec("CREATE TABLE versions (wine_dllpath32 TEXT, wine_dllpath64 TEXT, wine_loader TEXT, wine_server TEXT, wine_exec TEXT, id INTEGER PRIMARY KEY, name TEXT);"))
                     return false;
 
-                // Creating default version reccord
+                // Creating default version record
                 Version vers;
                 vers.name_ = "Default";
 

src/core/database/dir.cpp

@@ -128,4 +128,3 @@ bool Dir::renameDir(const QString &dir_name, const QString &prefix_name, const Q
 
     return true;
 }
-

src/core/database/dir.h

@@ -62,7 +62,7 @@ class Dir
      */
     bool addDir(const QString &prefix_name, const QString &dir_name) const;
 
-    /*! \brief This function check is reccord exists by dir_name or not.
+    /*! \brief This function check is record exists by dir_name or not.
      *
      * \param  prefix_name    A prefix name value.
      * \param  dir_name		 A dir name value.

src/core/database/icon.h

@@ -137,7 +137,7 @@ class Icon
                  const QString &dir_name,
                  const QString &icon_name) const;
 
-    /*! \brief This function check is reccord exists by icon_name or not.
+    /*! \brief This function check is record exists by icon_name or not.
      *
      * \param  prefix_name    A prefix name value.
      * \param  name    A name value.
@@ -146,7 +146,7 @@ class Icon
     bool isExistsByName(const QString &prefix_name,
                         const QString &icon_name) const;
 
-    /*! \brief This function check is reccord exists by icon_name or not.
+    /*! \brief This function check is record exists by icon_name or not.
      *
      * \param  prefix_name    A prefix name value.
      * \param  dir_name		 A dir name value.

src/core/database/image.h

@@ -45,7 +45,7 @@ class Image
      */
     QList<QStringList> getFields(void) const;
 
-    /*! \brief Getting file path reccord by image name
+    /*! \brief Getting file path record by image name
      * \param  name   image name
      * \return Return QList on QStringList containing images.
      */
@@ -57,7 +57,7 @@ class Image
      */
     bool isExistsByName(const QString &name) const;
 
-    /*! \brief Add image reccord
+    /*! \brief Add image record
      * \param  name   image name
      * \param  path   image file path
      * \return If image exists -- returns true.

src/core/database/last_run_icon.cpp

@@ -165,4 +165,3 @@ bool Last_Run_Icon::addIcon(const QString &cmdargs,
 
     return true;
 }
-

src/core/database/last_run_icon.h

@@ -70,7 +70,7 @@ class Last_Run_Icon
                  const int nice=0,
                  const QString &lang="") const;
 
-    /*! \brief This function reurns list of recent launched icons.
+    /*! \brief This function returns list of recent launched icons.
      *
      * \return Return list of last launched icons.
      */

src/core/database/prefix.h

@@ -102,7 +102,7 @@ class Prefix
                    const QString &run_string="",
                    const QString &version_id="") const;
 
-    /*! \brief This function check is reccord exists by prefix name or not.
+    /*! \brief This function check is record exists by prefix name or not.
       *
       * \param  name    A prefix name value.
       * \return Return true if exists.

src/core/httpcore.cpp

@@ -81,7 +81,7 @@ void HttpCore::getAppDBXMLPage(QString host, short int port, QString page)
         request.setHeader(QNetworkRequest::UserAgentHeader, user_agent);
         http->get(request);
 #ifdef DEBUG
-        qDebug()<<"[ii] Reuested page is: "<<QUrl(url);
+        qDebug()<<"[ii] Requested page is: "<<QUrl(url);
 #endif
 
         this->xmlreply="";
@@ -148,4 +148,3 @@ void HttpCore::readResponseHeader(QNetworkReply* reply)
 
     emit(pageReaded());
 }
-

src/core/registry.h

@@ -56,7 +56,7 @@ class Registry: public QObject
       */
     explicit Registry(const QString &prefixPath);
 
-    /*! \brief Creates heade information for  exported reg file.
+    /*! \brief Creates header information for exported reg file.
       *
       * \return true on success.
       */
@@ -70,7 +70,7 @@ class Registry: public QObject
     /*! \brief Append set key to exported reg file.
       * \param path  Registry path
       * \param key   Registry key name
-      * \param value Keristry key value
+      * \param value Registry key value
       */
     void set(const QString &path,
              const QString &key,

src/core/xmlparser.cpp

@@ -449,6 +449,3 @@ void XmlParser::clear(){
 
 	return;
 }
-
-
-

src/freebsd/CMakeLists.txt

@@ -2,4 +2,3 @@ cmake_minimum_required(VERSION 2.8.0)
 
 install(FILES ${CMAKE_SOURCE_DIR}/src/freebsd/mount_image.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/share/q4wine/scripts PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
 install(FILES ${CMAKE_SOURCE_DIR}/src/freebsd/umount.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/share/q4wine/scripts PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
-

src/freebsd/mount_image.sh

@@ -15,7 +15,7 @@ fi
 
 $SUDO $MOUNT_BIN /dev/`$SUDO $MDCONFIG_BIN -f $MOUNT_IMAGE` $MOUNT_POINT
 
-if [ $? -ne 0 ]; then 
+if [ $? -ne 0 ]; then
 	echo "Some Errors occurred:( command: $SUDO $MOUNT_BIN /dev/`$SUDO $MDCONFIG_BIN -f $MOUNT_IMAGE` $MOUNT_POINT"
 	exit 255
 fi

src/freebsd/umount.sh

@@ -1,18 +1,18 @@
-#!/bin/sh 
+#!/bin/sh
 #
 # Script by Sergey V. Dyatko [ sergey.dyatko@gmail.com ]
 # License: GPL v3
 
 UMOUNT="/sbin/umount"
 SUDO=`which sudo`
 MOUNT_POINT=$1
-DEVNAME=`mount | grep ${MOUNT_POINT} | awk '{print $1}')`
+DEVNAME=`mount | grep ${MOUNT_POINT} | awk '{print $1}'`
 MDCONFIG_BIN="$(which mdconfig 2>&1)"
 
 if [ $# -lt 1 ]; then
-        echo "Usage: $0 MOUNT_POINT"
-        exit 255;
-fi 
+    echo "Usage: $0 MOUNT_POINT"
+    exit 255
+fi
 
 if [ ! -d ${MOUNT_POINT} ]; then
     echo "Error: Cannot get mount point directory."
@@ -45,7 +45,7 @@ case "${DEVNAME}" in
                 exit 255
             fi;;
      (*)        echo "${DEVNAME} does not match"
-    		exit 255;;
+            exit 255;;
 esac
- 
+
 exit 0

src/freebsd/umount_freebsd.sh

@@ -62,16 +62,16 @@ fi
 
 #Now it's time to umount device
 $1 $2
-if [ $? > 0 ]; then
-	echo "Error: \"$1 $2\" returns an a error."
+if [ $? -gt 0 ]; then
+	echo "Error: \"$1 $2\" returns an error."
 	exit 255
 fi
 
 #Now it's time to get: Is it md device or not? If yes -- use mdconfig to remove it.
 if [ "$device_name" =~ md* ]; then
 	$mdconfig -d -u$device_name
-	if [ $? > 0 ]; then
-		echo "Error: \"mdconfig -d -u$device_name\" returns an a error."
+	if [ $? -gt 0 ]; then
+		echo "Error: \"mdconfig -d -u$device_name\" returns an error."
 		exit 255
 	fi
 fi

src/icons/CMakeLists.txt

@@ -16,4 +16,3 @@ ELSE( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
     install(FILES q4wine-ambiance.svg DESTINATION ${PIXMAPS_UNITY_ENTRY_PATH}/scalable/apps RENAME q4wine.svg)
     ENDIF( RELEASE )
 ENDIF( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
-

src/man1/q4wine-cli.1

@@ -30,7 +30,7 @@ sets the current icon name
 .BR "\-cd, \-\-cdimage"
 sets the cd image name
 .TP
-.BR "\-b, \-\-binary"
+.BR "\-b,  \-\-binary"
 sets the path to Windows binary for execute with current prefix settings
 .TP
 .BR "\-k,  \-\-kill"

src/plugins/winetricks.cpp

@@ -237,7 +237,7 @@ void winetricks::downloadwinetricks () {
 
     QStringList args;
     if (!console_args.isEmpty()){
-        // If we have any conslope parametres, we gona preccess them one by one
+        // If we have any console parameters, we will process them one by one
         QStringList cons_args = console_args.split(" ");
         for (int i=0; i<cons_args.count(); i++){
             if (!cons_args.at(i).isEmpty())
@@ -403,6 +403,3 @@ bool winetricks::parse() {
 
     return true;
 }
-
-
-

src/q4wine-cli/q4wine-cli.cpp

@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
             Qcout<<QObject::tr("Wine process list for \"%1\" prefix").arg(_PREFIX)<<endl;
             path = db_prefix.getPath(_PREFIX);
         }
-        // Preccess QList items one by one
+        // Process QList items one by one
         Qcout<<" "<<qSetFieldWidth(8)<<left<<QObject::tr("PID")<<qSetFieldWidth(6)<<left<<QObject::tr("Nice")<<qSetFieldWidth(20)<<left<<QObject::tr("Name")<<QObject::tr("Prefix path")<<qSetFieldWidth(0)<<endl;
         for (int i = 0; i < result.size(); ++i) {
             if (_PREFIX.isEmpty()){

src/q4wine-gui/appsettings.cpp

@@ -64,7 +64,7 @@ AppSettings::AppSettings(QWidget * parent, Qt::WindowFlags f) : QDialog(parent,
 
     connect(comboProxyType, SIGNAL(currentIndexChanged(QString)), this, SLOT(comboProxyType_indexChanged(QString)));
 
-    //Installing event filters for get buttuns
+    //Installing event filters for get buttons
     cmdGetTarBin->installEventFilter(this);
     cmdGetMountBin->installEventFilter(this);
     cmdGetUmountBin->installEventFilter(this);

src/q4wine-gui/appsettings.h

@@ -68,4 +68,3 @@ class AppSettings : public QDialog, public Ui::AppSettings
 };
 
 #endif
-