diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ if(DIGIKAMSC_CHECKOUT_DOC) message(STATUS "Extract documentation translation files from git repositories. Please wait, it can take a while...") - message(STATUS "NOTE: (u) want mean uncomplete translations files, which will be removed from compilation.") + message(STATUS "NOTE: (u) want mean incomplete translations files, which will be removed from compilation.") execute_process(COMMAND ${RUBY_EXECUTABLE} "${CMAKE_SOURCE_DIR}/project/release/fetch_l10n_doc.rb" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") diff --git a/Mainpage.dox b/Mainpage.dox --- a/Mainpage.dox +++ b/Mainpage.dox @@ -78,7 +78,7 @@ |│ │ │ ├── enhance | All enhance item plugins | |│ │ │ ├── filters | All filter item plugins | |│ │ │ ├── metadata | All metadata edit plugins | -|│ │ │ └── transform | All tranform item plugins | +|│ │ │ └── transform | All transform item plugins | |│ │ ├── editor | All Image Editor plugins | |│ │ │ ├── colors | All color adjustments plugins | |│ │ │ ├── decorate | All decorate item plugins | @@ -104,7 +104,7 @@ |│ │ │ ├── haar | The similarity low level algorithms to compute image finger-prints | |│ │ │ ├── history | The item history classes for the database | |│ │ │ ├── item | The database item classes, including containers, lister, and scanner | -|│ │ │ ├── models | The databse model classes | +|│ │ │ ├── models | The database model classes | |│ │ │ ├── server | The Mysql internal server | |│ │ │ ├── similaritydb | The similarity database | |│ │ │ ├── tags | The database tags management classes | @@ -141,10 +141,10 @@ |│ │ ├── dplugins | All shared dplugins classes are hosted here | |│ │ │ ├── core | Low level classes for plugins definitions | |│ │ │ ├── iface | Low level classes for host interface definitions | -|│ │ │ ├── setup | Classes to setup plugins in configuration pannel | +|│ │ │ ├── setup | Classes to setup plugins in configuration panel | |│ │ │ ├── webservices | Common classes for Webservices tools | |│ │ │ └── widgets | Common widget sfor plugins | -|│ │ ├── dtrash | digiKam trash manager full independant of desktop trash | +|│ │ ├── dtrash | digiKam trash manager full independent of desktop trash | |│ │ ├── facesengine | Face detection and recognition engine + Faces database implementations | |│ │ │ ├── alignment-congealing | Face alignment based on congealing method | |│ │ │ ├── alignment-flandmark | Face alignment based on flandmark method | @@ -177,9 +177,9 @@ |│ │ ├── template | Metadata template support | |│ │ ├── threadimageio | Classes to process thumbs and preview extraction including video support| |│ │ ├── threads | Classes to manage and chain threads using multi-core | -|│ │ ├── timeadjust | Common classes time adjustements tools | +|│ │ ├── timeadjust | Common classes time adjustments tools | |│ │ ├── transitionmngr | Frames transitions manager | -|│ │ ├── versionmanager | Classes to manage versionning operations | +|│ │ ├── versionmanager | Classes to manage versioning operations | |│ │ ├── video | Classes to play with video contents | |│ │ └── widgets | To host plenty of widgets used everywhere | |│ │ ├── colors | Colors relevant views | @@ -232,7 +232,7 @@ |│ │ ├── manager | The multi-core manager to run tools in background | |│ │ ├── tools | All BQM tools classed by functions | |│ │ └── views | The BQM internal views | -|│ ├── searchwindow | The powerfull advanced search tool | +|│ ├── searchwindow | The powerful advanced search tool | |│ ├── setup | All digiKam setup panel, with few ones shared with Showfoto | |│ │ ├── album | Album configuration views | |│ │ ├── camera | Camera configuration views | @@ -316,7 +316,7 @@ | libtiff | X | >= 4.0 | http://www.remotesensing.org/libtiff | For DImg image loader | | | libpng | X | >= 1.6 | http://www.libpng.org/pub/png/libpng.html | For DImg image loader | | | libjpeg | X | >= 6b | http://www.ijg.org | jpeglib >= 8.0 hightly recommended for RawEngine | | -| libboost | X | >= 1.55.0 | http://www.boost.org/doc/libs | For Versionning support | | +| libboost | X | >= 1.55.0 | http://www.boost.org/doc/libs | For Versioning support | | | liblcms | X | >= 2.x | http://www.littlecms.com | For Color Management support | | | libexpat | X | >= 2.1.0 | http://expat.sourceforge.net | For DNG converter | | | libexiv2 | X | >= 0.27.0 | http://www.exiv2.org | Metadata low level management. | | @@ -495,7 +495,7 @@ The same applies for all binaries in /your/root/directory/bin/ -If your shell is bash, you can edit your \b .bashrc file (in $HOME) and add the follwing alias: +If your shell is bash, you can edit your \b .bashrc file (in $HOME) and add the following alias: \code DIGIKAMROOT="/your/root/directory" @@ -529,11 +529,11 @@ \subsection digiKamloggincat Logging Categories in digiKam -All loggin categories are listed in \ref digikam_debug.cpp source code. +All logging categories are listed in \ref digikam_debug.cpp source code. \subsection moreaboutloggincat Further Reading - For more details see the Qt framework documentation about loggin categories available at this url: + For more details see the Qt framework documentation about logging categories available at this url: https://doc.qt.io/qt-5/qloggingcategory.html#details \section cmakecompilrules Cmake compilation rules @@ -574,7 +574,7 @@ The libjpeg- folders are all included, so we need to delete them all and include the correct one only: \code - # This macro will set all paths which do not containt libjpeg- + # This macro will set all paths which do not contain libjpeg- # We will add later the directory we need FOREACH(var ${DK_LOCAL_INCLUDES_RAW}) @@ -931,7 +931,7 @@ > quit \endcode -Post this backtrace at the right place (Bugzilla or developement mailing list) for investigations by developers. +Post this backtrace at the right place (Bugzilla or development mailing list) for investigations by developers. For Windows users, take a look on this tutorial : @@ -1080,7 +1080,7 @@ git checkout -b development/dplugins \endcode -Example to delete the local 'dplugins' developement branch: +Example to delete the local 'dplugins' development branch: \code git checkout master @@ -1101,7 +1101,7 @@ \subsection gitbranches Sync a Branch With Master From Git Repository -It typical to use a dedicated developement branch in Git to keep the +It typical to use a dedicated development branch in Git to keep the master code stable for production. To synchronize branches with master, use these commands in your local branch checkout: diff --git a/bootstrap.mxe b/bootstrap.mxe --- a/bootstrap.mxe +++ b/bootstrap.mxe @@ -67,7 +67,7 @@ echo "Installing to $MXE_BUILDROOT for target $MXE_BUILD_TARGETS with build mode $BUILD_TYPE and configure options $OPTIONS" -# Pathes rules +# Path rules ORIG_PATH="$PATH" export PATH=$MXE_BUILDROOT/usr/bin:$MXE_INSTALL_PREFIX/qt5/bin:$PATH diff --git a/core/app/date/dpopupframe.h b/core/app/date/dpopupframe.h --- a/core/app/date/dpopupframe.h +++ b/core/app/date/dpopupframe.h @@ -41,7 +41,7 @@ public: /** - * The contructor. Creates a dialog without buttons. + * The constructor. Creates a dialog without buttons. */ explicit DPopupFrame(QWidget* const parent = nullptr); diff --git a/core/app/views/utils/slideshowbuilder.h b/core/app/views/utils/slideshowbuilder.h --- a/core/app/views/utils/slideshowbuilder.h +++ b/core/app/views/utils/slideshowbuilder.h @@ -40,11 +40,11 @@ public: - /** Contructor to work on image list + /** Constructor to work on image list */ explicit SlideShowBuilder(const ItemInfoList& infoList); - /** Contructor to work on recursive mode from album + /** Constructor to work on recursive mode from album */ explicit SlideShowBuilder(Album* const album); diff --git a/core/cmake/modules/MacroBoolTo01.cmake b/core/cmake/modules/MacroBoolTo01.cmake --- a/core/cmake/modules/MacroBoolTo01.cmake +++ b/core/cmake/modules/MacroBoolTo01.cmake @@ -1,6 +1,6 @@ # MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN ) # This macro evaluates its first argument -# and sets all the given vaiables either to 0 or 1 +# and sets all the given variables either to 0 or 1 # depending on the value of the first one # # Copyright (c) 2006, Alexander Neundorf, diff --git a/core/cmake/modules/MacroJPEG.cmake b/core/cmake/modules/MacroJPEG.cmake --- a/core/cmake/modules/MacroJPEG.cmake +++ b/core/cmake/modules/MacroJPEG.cmake @@ -47,19 +47,19 @@ if(_CompileResult) - # Compile successfuly. It's not libjpeg 90. We check previous version. + # Compile successfully. It's not libjpeg 90. We check previous version. CompileToCheckVersion(80 _CompileResult) if(_CompileResult) - # Compile successfuly. It's not libjpeg 90. We check previous version. + # Compile successfully. It's not libjpeg 90. We check previous version. CompileToCheckVersion(70 _CompileResult) if(_CompileResult) - # Compile successfuly. It's not libjpeg 70. + # Compile successfully. It's not libjpeg 70. set(JPEG_LIB_VERSION 62) else() diff --git a/core/data/database/mysql-global.conf b/core/data/database/mysql-global.conf --- a/core/data/database/mysql-global.conf +++ b/core/data/database/mysql-global.conf @@ -32,7 +32,7 @@ ### SKIP FEATURES SETTINGS #################################### -# Be able to be connected to databse without a password +# Be able to be connected to database without a password skip_grant_tables # No remote access to database diff --git a/core/data/scripts/digitaglinktree/digitaglinktree b/core/data/scripts/digitaglinktree/digitaglinktree --- a/core/data/scripts/digitaglinktree/digitaglinktree +++ b/core/data/scripts/digitaglinktree/digitaglinktree @@ -23,7 +23,7 @@ # 1.1->1.2: # Support for hierarchical tags was added. The script can either create # a hierarchical directory structure for these tags (default) or treat them -# as tags beeing on the same level resulting in a flat dir structure (-f) +# as tags being on the same level resulting in a flat dir structure (-f) # # 1.2->1.3 # Added support for multiple tags assigned to one photo. Up to now only @@ -367,7 +367,7 @@ # directory buth neverless # refImages contains also data about photos in this album. But since it is # not cloned, the cloned root # does not exits and so the photo therin does - # not exist. Thats what we check here. + # not exist. That's what we check here. next if( ! -r "${photoRootDir}$path/$image" ); $count++; @@ -601,7 +601,7 @@ # directory buth neverless # refImages contains also data about photos in this album. But since it is # not cloned, the cloned root # does not exits and so the photo therin does - # not exist. Thats what we check here. + # not exist. That's what we check here. next if( ! -r "${photoRootDir}$path/$image" ); $count++; @@ -981,7 +981,7 @@ foreach $i (keys(%albumRoots)) { # print "Album roots -> $i:", $albumRoots{$i}, ", ", $opt_r, "\n"; # Extract data needed from database - # Interprete -r as base for all albums + # Interpret -r as base for all albums $albumRoots{$i}="$opt_r$albumRoots{$i}"; $ret+=getTaggedImages(\%images, $database, $albumRoots{$i}, $i, \%paths, \%pathNames, $vers, $tage, $tagi); diff --git a/core/data/scripts/digitaglinktree/digitaglinktree.1 b/core/data/scripts/digitaglinktree/digitaglinktree.1 --- a/core/data/scripts/digitaglinktree/digitaglinktree.1 +++ b/core/data/scripts/digitaglinktree/digitaglinktree.1 @@ -39,14 +39,14 @@ by changing directory to the folder with the tags name created by this script. This allows you e.g. to run JAlbum a photo album software that needs to find the pictures to be put into a web album in the filesystem because JAlbum cannot -access digikams virtual folders directly. +access digikam's virtual folders directly. -The second way of calling this script is the so called archive-mode by setting +The second way of calling this script is the so called archive-mode by setting option -A \fIarchiveDir\fR. Archive mode is thought for people who want to archive tagged photos -independently of digikams root directories and the photos therein. This way you +independently of digikam's root directories and the photos therein. This way you can put your photos and their tag structure in eg. a tar archive and send it to a friend, who can look at the photos via their tag structure. In this mode the script creates the directory given as parameter to -A and in this directory two @@ -93,22 +93,22 @@ The Tags subdirectory will contain links to the files in the Photos directory. This way you have one archive directory that is completely self contained. You can tar it, send it to a friend or just put it somewhere -for archivel or backup purposes. Usually only those photos will be archived that +for archival or backup purposes. Usually only those photos will be archived that have a digikam tag set on them. By using option -C however you can perform a -complete archive. See -C for more infos. +complete archive. See -C for more info. .TP \fB \-d \fIdatabase\fR \fIdatabase\fR is the complete path including the filename to digikams photo database which -usually can be found in digikams root directory. The files name is usually +usually can be found in digikam's root directory. The files name is usually digikam.db . .TP \fB \-r \fIrootdir\fR \fIrootdir\fR denotes the digikam base directory containing all your photos if you are using digikam in a version before 0.10. If you are using digikam 0.10 or newer you must not -use this option. If you do it anyway you will see a hint that the option given will be ignored because -digikams version 0.10 database contains the root directories of all albums defined in digikam. +use this option. If you do it anyway you will see a hint that the option given will be ignored because +digikam's version 0.10 database contains the root directories of all albums defined in digikam. .TP \fB \-C\fR @@ -124,7 +124,7 @@ By default the script will try to create relative symbolic links from the directory \fItaglinkdir\fR set by option -l to the photo files under \fIrootdir\fR given by option -r. Using this option will result in absolute symbolic -links beeing created instead of relative ones. +links being created instead of relative ones. .TP \fB \-H \fR @@ -136,10 +136,10 @@ .TP \fB \-f \fR -In digikam photos can have hierachical tags (tags that have subtags). In this case -digitaglinktree would by default add a directory for the tag and a subdirectory for -each of the subtags of this tag. By setting \fB \-f \fR a subtag is treated like a -regular tag just as its parent tag so digitaglinktree will create all subdirectories +In digikam photos can have hierarchical tags (tags that have subtags). In this case +digitaglinktree would by default add a directory for the tag and a subdirectory for +each of the subtags of this tag. By setting \fB \-f \fR a subtag is treated like a +regular tag just as its parent tag so digitaglinktree will create all subdirectories for tags and subtags at the same level independent of the tag - subtag hierarchy. .TP @@ -216,12 +216,12 @@ digiTagLinktree -l /home/user/tags -d /home/user/photos/digikam.db -In this example digikams photo root denoted by -r is /home/user/photos. +In this example, digikam's photo root denoted by -r is /home/user/photos. Option -l /home/user/tags -tells the script that all the subdirectories and symbolic links will be placed in -the directory /home/user/tags. The folder was chosen so that the tags-directory is not under digikams photo root. You may put the tags folder inside digikams photoroot but this is not the preferred method. -Because the link directory contains only links this tag structure does hardly need any additional space on your harddisk. +tells the script that all the subdirectories and symbolic links will be placed in +the directory /home/user/tags. The folder was chosen so that the tags-directory is not under digikam's photo root. You may put the tags folder inside digikam's photoroot but this is not the preferred method. +Because the link directory contains only links this tag structure does hardly need any additional space on your harddisk. digiTagLinktree -r /home/user/photos -l /home/user/tags -d /home/user/photos/digikam.db diff --git a/core/dplugins/generic/metadata/geolocationedit/kmlexport/geodataparser.cpp b/core/dplugins/generic/metadata/geolocationedit/kmlexport/geodataparser.cpp --- a/core/dplugins/generic/metadata/geolocationedit/kmlexport/geodataparser.cpp +++ b/core/dplugins/generic/metadata/geolocationedit/kmlexport/geodataparser.cpp @@ -63,7 +63,7 @@ bool interpolate, int interpolationDstTime, GeoDataContainer* const gpsData) { - // GPS device are sync in time by satelite using GMT time. + // GPS device are sync in time by satellite using GMT time. QDateTime cameraGMTDateTime = photoDateTime.addSecs(secondsOffset*(-1)); if (offsetContainsTimeZone) diff --git a/core/dplugins/generic/tools/htmlgallery/themes/elegant/template.xsl b/core/dplugins/generic/tools/htmlgallery/themes/elegant/template.xsl --- a/core/dplugins/generic/tools/htmlgallery/themes/elegant/template.xsl +++ b/core/dplugins/generic/tools/htmlgallery/themes/elegant/template.xsl @@ -35,7 +35,7 @@ doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" /> - + diff --git a/core/dplugins/generic/tools/htmlgallery/themes/simplerounded/template.xsl b/core/dplugins/generic/tools/htmlgallery/themes/simplerounded/template.xsl --- a/core/dplugins/generic/tools/htmlgallery/themes/simplerounded/template.xsl +++ b/core/dplugins/generic/tools/htmlgallery/themes/simplerounded/template.xsl @@ -317,11 +317,11 @@ - - + + - + diff --git a/core/dplugins/generic/tools/htmlgallery/themes/vanilla/template.xsl b/core/dplugins/generic/tools/htmlgallery/themes/vanilla/template.xsl --- a/core/dplugins/generic/tools/htmlgallery/themes/vanilla/template.xsl +++ b/core/dplugins/generic/tools/htmlgallery/themes/vanilla/template.xsl @@ -37,7 +37,7 @@ doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" /> - + diff --git a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptHttp.cpp b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptHttp.cpp --- a/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptHttp.cpp +++ b/core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/Core/NptHttp.cpp @@ -325,7 +325,7 @@ class NPT_HttpEntityBodyInputStream : public NPT_InputStream { public: - // constructor and desctructor + // constructor and destructor NPT_HttpEntityBodyInputStream(NPT_BufferedInputStreamReference& source, NPT_LargeSize size, bool size_is_known, diff --git a/core/dplugins/generic/view/glviewer/glviewerwidget.cpp b/core/dplugins/generic/view/glviewer/glviewerwidget.cpp --- a/core/dplugins/generic/view/glviewer/glviewerwidget.cpp +++ b/core/dplugins/generic/view/glviewer/glviewerwidget.cpp @@ -235,7 +235,7 @@ showFullScreen(); // krazy:exclude=qmethods - // let the cursor dissapear after 2sec of inactivity + // let the cursor disappear after 2sec of inactivity connect(&d->timerMouseMove, SIGNAL(timeout()), this, SLOT(slotTimeoutMouseMove())); @@ -512,7 +512,7 @@ update(); break; - // toggle temorarily between "show next image" and "zoom" on mousewheel change + // toggle temporarily between "show next image" and "zoom" on mousewheel change case Qt::Key_Control: if (d->wheelAction == GLViewerWidget::Private::zoomImage) { diff --git a/core/dplugins/generic/webservices/imageshack/imageshacktalker.cpp b/core/dplugins/generic/webservices/imageshack/imageshacktalker.cpp --- a/core/dplugins/generic/webservices/imageshack/imageshacktalker.cpp +++ b/core/dplugins/generic/webservices/imageshack/imageshacktalker.cpp @@ -551,7 +551,7 @@ if (rootElem.isNull() || rootElem.tagName() != QLatin1String("gallery")) { - // TODO error cheking + // TODO error checking } else { diff --git a/core/dplugins/generic/webservices/rajce/rajcetalker.cpp b/core/dplugins/generic/webservices/rajce/rajcetalker.cpp --- a/core/dplugins/generic/webservices/rajce/rajcetalker.cpp +++ b/core/dplugins/generic/webservices/rajce/rajcetalker.cpp @@ -166,7 +166,7 @@ // Only dequeue the command after the above signal has been // emitted so that the users can queue other commands // without them being started straight away in the enqueue - // method which would happen if the command was dequed + // method which would happen if the command was dequeued // before the signal and the signal was emitted in the same // thread (which is the case (always?)). d->commandQueue.dequeue(); diff --git a/core/dplugins/generic/webservices/twitter/twittertalker.cpp b/core/dplugins/generic/webservices/twitter/twittertalker.cpp --- a/core/dplugins/generic/webservices/twitter/twittertalker.cpp +++ b/core/dplugins/generic/webservices/twitter/twittertalker.cpp @@ -594,7 +594,7 @@ { /* * The endpoint below allows to get more than just account name (e.g. profile avatar, links to tweets posted, etc.) - * Look at debug message printed to console for futher ideas and exploitation + * Look at debug message printed to console for further ideas and exploitation */ QUrl url(QLatin1String("https://api.twitter.com/1.1/account/verify_credentials.json")); diff --git a/core/dplugins/generic/webservices/yandexfotki/yfwindow.cpp b/core/dplugins/generic/webservices/yandexfotki/yfwindow.cpp --- a/core/dplugins/generic/webservices/yandexfotki/yfwindow.cpp +++ b/core/dplugins/generic/webservices/yandexfotki/yfwindow.cpp @@ -483,7 +483,7 @@ { DItemInfo info(d->iface->itemInfo(url)); - // check if photo alredy uploaded + // check if photo already uploaded int oldPhotoId = -1; diff --git a/core/libs/album/widgets/albumselectors.h b/core/libs/album/widgets/albumselectors.h --- a/core/libs/album/widgets/albumselectors.h +++ b/core/libs/album/widgets/albumselectors.h @@ -50,7 +50,7 @@ public: - /** Default Contructor. 'label' is front text of label which title widget. 'configName' is name used to store + /** Default Constructor. 'label' is front text of label which title widget. 'configName' is name used to store * Albums configuration in settings file. 'parent' is parent widget. */ explicit AlbumSelectors(const QString& label, const QString& configName, QWidget* const parent = nullptr, AlbumType albumType = All); diff --git a/core/libs/database/collection/collectionmanager_location.cpp b/core/libs/database/collection/collectionmanager_location.cpp --- a/core/libs/database/collection/collectionmanager_location.cpp +++ b/core/libs/database/collection/collectionmanager_location.cpp @@ -559,7 +559,7 @@ ChangingDB db(d); CoreDbAccess().db()->migrateAlbumRoot(albumLoc->id(), identifier); - // update local structur + // update local structure albumLoc->identifier = identifier; locker.unlock(); diff --git a/core/libs/database/engine/dbenginesqlquery.h b/core/libs/database/engine/dbenginesqlquery.h --- a/core/libs/database/engine/dbenginesqlquery.h +++ b/core/libs/database/engine/dbenginesqlquery.h @@ -4,7 +4,7 @@ * https://www.digikam.org * * Date : 2009-09-27 - * Description : Databse engine SQL query + * Description : Database engine SQL query * * Copyright (C) 2009-2010 by Holger Foerster * diff --git a/core/libs/database/engine/dbenginesqlquery.cpp b/core/libs/database/engine/dbenginesqlquery.cpp --- a/core/libs/database/engine/dbenginesqlquery.cpp +++ b/core/libs/database/engine/dbenginesqlquery.cpp @@ -4,7 +4,7 @@ * https://www.digikam.org * * Date : 2009-09-27 - * Description : Databse engine SQL query + * Description : Database engine SQL query * * Copyright (C) 2009-2010 by Holger Foerster * diff --git a/core/libs/database/history/itemhistorygraph_boost.h b/core/libs/database/history/itemhistorygraph_boost.h --- a/core/libs/database/history/itemhistorygraph_boost.h +++ b/core/libs/database/history/itemhistorygraph_boost.h @@ -448,7 +448,7 @@ } /** - * Accessing vertices and egdes + * Accessing vertices and edges */ const GraphContainer& getGraph() const { diff --git a/core/libs/database/history/itemhistorygraphmodel.cpp b/core/libs/database/history/itemhistorygraphmodel.cpp --- a/core/libs/database/history/itemhistorygraphmodel.cpp +++ b/core/libs/database/history/itemhistorygraphmodel.cpp @@ -475,7 +475,7 @@ } /* - // Any other egdes off the main path? + // Any other edges off the main path? QList branches = graph().adjacentVertices(v, HistoryGraph::EdgesToLeaf); QList subgraph; diff --git a/core/libs/database/item/containers/itemgps.cpp b/core/libs/database/item/containers/itemgps.cpp --- a/core/libs/database/item/containers/itemgps.cpp +++ b/core/libs/database/item/containers/itemgps.cpp @@ -66,7 +66,7 @@ return true; } - // If item do not have any GPS data in databse, we will try to load + // If item do not have any GPS data in database, we will try to load // it from file using standard implementation from GPSItemContainer. return GPSItemContainer::loadImageData(); diff --git a/core/libs/database/item/containers/itemposition.h b/core/libs/database/item/containers/itemposition.h --- a/core/libs/database/item/containers/itemposition.h +++ b/core/libs/database/item/containers/itemposition.h @@ -157,7 +157,7 @@ /** * Apply all changes made to this object. - * (Also called from desctructor) + * (Also called from destructor) */ void apply(); diff --git a/core/libs/database/similaritydb/similaritydb.h b/core/libs/database/similaritydb/similaritydb.h --- a/core/libs/database/similaritydb/similaritydb.h +++ b/core/libs/database/similaritydb/similaritydb.h @@ -62,7 +62,7 @@ public: /** - * Set the database seting entry given by keyword to the given value. + * Set the database setting entry given by keyword to the given value. * @param keyword The keyword, i.e. setting name. * @param value The value. * @return True, if the value was set and false, else.. diff --git a/core/libs/dimg/dimg.cpp b/core/libs/dimg/dimg.cpp --- a/core/libs/dimg/dimg.cpp +++ b/core/libs/dimg/dimg.cpp @@ -5,7 +5,7 @@ * * Date : 2005-06-14 * Description : digiKam 8/16 bits image management API. - * Contructors and destructor. + * Constructors and destructor. * * Copyright (C) 2005 by Renchi Raju * Copyright (C) 2005-2019 by Gilles Caulier diff --git a/core/libs/dimg/filters/README b/core/libs/dimg/filters/README --- a/core/libs/dimg/filters/README +++ b/core/libs/dimg/filters/README @@ -1,6 +1,6 @@ auto : Auto Color Correction. bw : Black and White. -bcg : Brighness / Contrast / Gamma. +bcg : Brightness / Contrast / Gamma. cb : Color Balance Correction. curves : Histogram Curves Correction. decorate : Decorative Effects. diff --git a/core/libs/dimg/filters/bw/mixerfilter.h b/core/libs/dimg/filters/bw/mixerfilter.h --- a/core/libs/dimg/filters/bw/mixerfilter.h +++ b/core/libs/dimg/filters/bw/mixerfilter.h @@ -4,7 +4,7 @@ * https://www.digikam.org * * Date : 2005-24-01 - * Description : Chanels mixer filter + * Description : Channels mixer filter * * Copyright (C) 2005-2019 by Gilles Caulier * Copyright (C) 2010 by Martin Klapetek diff --git a/core/libs/dimg/filters/bw/mixerfilter.cpp b/core/libs/dimg/filters/bw/mixerfilter.cpp --- a/core/libs/dimg/filters/bw/mixerfilter.cpp +++ b/core/libs/dimg/filters/bw/mixerfilter.cpp @@ -4,7 +4,7 @@ * https://www.digikam.org * * Date : 2005-24-01 - * Description : Chanels mixer filter + * Description : Channels mixer filter * * Copyright (C) 2005-2019 by Gilles Caulier * Copyright (C) 2010 by Martin Klapetek diff --git a/core/libs/dimg/filters/dimgthreadedanalyser.h b/core/libs/dimg/filters/dimgthreadedanalyser.h --- a/core/libs/dimg/filters/dimgthreadedanalyser.h +++ b/core/libs/dimg/filters/dimgthreadedanalyser.h @@ -58,7 +58,7 @@ private: - // NOTE: Versionning is not supported in this class + // NOTE: Versioning is not supported in this class FilterAction filterAction() override { diff --git a/core/libs/dimg/filters/dimgthreadedfilter.cpp b/core/libs/dimg/filters/dimgthreadedfilter.cpp --- a/core/libs/dimg/filters/dimgthreadedfilter.cpp +++ b/core/libs/dimg/filters/dimgthreadedfilter.cpp @@ -199,7 +199,7 @@ { QDateTime now = QDateTime::currentDateTime(); filterImage(); - //qCDebug(DIGIKAM_DIMG_LOG) << m_name << ":: excecution time : " << now.msecsTo(QDateTime::currentDateTime()) << " ms"; + //qCDebug(DIGIKAM_DIMG_LOG) << m_name << ":: execution time : " << now.msecsTo(QDateTime::currentDateTime()) << " ms"; } catch (std::bad_alloc& ex) { diff --git a/core/libs/dimg/filters/fx/raindropfilter.cpp b/core/libs/dimg/filters/fx/raindropfilter.cpp --- a/core/libs/dimg/filters/fx/raindropfilter.cpp +++ b/core/libs/dimg/filters/fx/raindropfilter.cpp @@ -191,7 +191,7 @@ * progressMax => Max. value for progress bar (can be different if using clipping area). * * Theory => This functions does several math's functions and the engine - * is simple to undestand, but a little hard to implement. A + * is simple to understand, but a little hard to implement. A * control will indicate if there is or not a raindrop in that * area, if not, a fisheye effect with a random size (max=MaxDropSize) * will be applied, after this, a shadow will be applied too. diff --git a/core/libs/dimg/filters/greycstoration/cimg/CImg.h b/core/libs/dimg/filters/greycstoration/cimg/CImg.h --- a/core/libs/dimg/filters/greycstoration/cimg/CImg.h +++ b/core/libs/dimg/filters/greycstoration/cimg/CImg.h @@ -2692,7 +2692,7 @@ const unsigned int keyPADDIV = 87U; #else - // Define unknow keycodes when no display are available. + // Define unknown keycodes when no display are available. // (should rarely be used then !). // const unsigned int keyESC = 1U; diff --git a/core/libs/dimg/filters/greycstoration/greycstorationfilter.h b/core/libs/dimg/filters/greycstoration/greycstorationfilter.h --- a/core/libs/dimg/filters/greycstoration/greycstorationfilter.h +++ b/core/libs/dimg/filters/greycstoration/greycstorationfilter.h @@ -160,13 +160,13 @@ public: - /** Contructor without argument. Before to use it, + /** Constructor without argument. Before to use it, you need to call in order: setSettings(), setMode(), optionally setInPaintingMask(), setOriginalImage(), and necessary setup() at end. */ explicit GreycstorationFilter(QObject* const parent=nullptr); - /** Contructor with all arguments. Ready to use. + /** Constructor with all arguments. Ready to use. */ GreycstorationFilter(DImg* const orgImage, const GreycstorationContainer& settings, diff --git a/core/libs/dimg/filters/icc/icctransform.h b/core/libs/dimg/filters/icc/icctransform.h --- a/core/libs/dimg/filters/icc/icctransform.h +++ b/core/libs/dimg/filters/icc/icctransform.h @@ -74,7 +74,7 @@ /// Apply this transform to the QImage. This has only basic functionality. bool apply(QImage& qimage); - /// Closes the transform, not the profiles. Called at desctruction. + /// Closes the transform, not the profiles. Called at destruction. void close(); /** diff --git a/core/libs/dimg/filters/imgqsort/imagequalitycontainer.h b/core/libs/dimg/filters/imgqsort/imagequalitycontainer.h --- a/core/libs/dimg/filters/imgqsort/imagequalitycontainer.h +++ b/core/libs/dimg/filters/imgqsort/imagequalitycontainer.h @@ -52,7 +52,7 @@ public: - bool enableSorter; /// Global quality dectection enabler/disabler. + bool enableSorter; /// Global quality detection enabler/disabler. bool detectBlur; /// Enable image blur detection. bool detectNoise; /// Enable image noise detection. diff --git a/core/libs/dimg/filters/nr/nrfilter.h b/core/libs/dimg/filters/nr/nrfilter.h --- a/core/libs/dimg/filters/nr/nrfilter.h +++ b/core/libs/dimg/filters/nr/nrfilter.h @@ -49,7 +49,7 @@ public: - /** Separated values per chanel + /** Separated values per channel */ double thresholds[3]; // Y, Cb, Cr thresholds. double softness[3]; // Y, Cb, Cr softness. diff --git a/core/libs/dngwriter/dngwriter.cpp b/core/libs/dngwriter/dngwriter.cpp --- a/core/libs/dngwriter/dngwriter.cpp +++ b/core/libs/dngwriter/dngwriter.cpp @@ -1306,7 +1306,7 @@ catch (...) { - qCDebug(DIGIKAM_GENERAL_LOG) << "DNGWriter: DNG SDK exception code unknow" ; + qCDebug(DIGIKAM_GENERAL_LOG) << "DNGWriter: DNG SDK exception code unknown" ; return DNGSDKINTERNALERROR; } diff --git a/core/libs/dplugins/core/dplugin.h b/core/libs/dplugins/core/dplugin.h --- a/core/libs/dplugins/core/dplugin.h +++ b/core/libs/dplugins/core/dplugin.h @@ -155,7 +155,7 @@ /** * @brief Returns the unique internal identification property of the plugin. - * Must be formated as "org.kde.digikam.plugin._PLUGIN_TYPE_._NAME_OF_PLUGIN_". + * Must be formatted as "org.kde.digikam.plugin._PLUGIN_TYPE_._NAME_OF_PLUGIN_". * Examples: "org.kde.digikam.plugin.generic.Calendar" * "org.kde.digikam.plugin.editor.AdjustCurvesTool" * "org.kde.digikam.plugin.bqm.NoiseReduction" @@ -164,7 +164,7 @@ /** * @brief Returns the unique top level internal identification property of the plugin interface. - * Must be formated as "org.kde.digikam._NAME_OF_INTERFACE_/_VERSION_". + * Must be formatted as "org.kde.digikam._NAME_OF_INTERFACE_/_VERSION_". * Examples: "org.kde.digikam.DPluginGeneric/1.1.0" * "org.kde.digikam.DPluginEditor/1.1.0" * "org.kde.digikam.DPluginBqm/1.1.0" diff --git a/core/libs/dplugins/iface/dinfointerface.h b/core/libs/dplugins/iface/dinfointerface.h --- a/core/libs/dplugins/iface/dinfointerface.h +++ b/core/libs/dplugins/iface/dinfointerface.h @@ -134,7 +134,7 @@ // ----------------------------------------------------------------- /** DItemInfo is a class to get item information from host application (Showfoto or digiKam) - * The interface is re-implemented in host and depend how item infromation must be retrieved (from a database or by file metadata). + * The interface is re-implemented in host and depend how item information must be retrieved (from a database or by file metadata). * The easy way to use this container is given below: * * // READ INFO FROM HOST --------------------------------------------- diff --git a/core/libs/dplugins/setup/dpluginloader_p.h b/core/libs/dplugins/setup/dpluginloader_p.h --- a/core/libs/dplugins/setup/dpluginloader_p.h +++ b/core/libs/dplugins/setup/dpluginloader_p.h @@ -61,6 +61,6 @@ QStringList whitelist; }; -} // namepace Digikam +} // namespace Digikam #endif // DIGIKAM_DPLUGIN_LOADER_P_H diff --git a/core/libs/dplugins/setup/dpluginloader_p.cpp b/core/libs/dplugins/setup/dpluginloader_p.cpp --- a/core/libs/dplugins/setup/dpluginloader_p.cpp +++ b/core/libs/dplugins/setup/dpluginloader_p.cpp @@ -208,4 +208,4 @@ qCDebug(DIGIKAM_GENERAL_LOG) << Q_FUNC_INFO << "Time elapsed:" << t.elapsed() << "ms"; } -} // namepace Digikam +} // namespace Digikam diff --git a/core/libs/dtrash/dtrashitemmodel.h b/core/libs/dtrash/dtrashitemmodel.h --- a/core/libs/dtrash/dtrashitemmodel.h +++ b/core/libs/dtrash/dtrashitemmodel.h @@ -70,7 +70,7 @@ DTrashItemInfo itemForIndex(const QModelIndex& index); /** - * @brief returns DTrashItemInfoList for gived indexes in model + * @brief returns DTrashItemInfoList for given indexes in model */ DTrashItemInfoList itemsForIndexes(const QList& indexes); diff --git a/core/libs/metadataengine/dmetadata/dmetadata_faces.cpp b/core/libs/metadataengine/dmetadata/dmetadata_faces.cpp --- a/core/libs/metadataengine/dmetadata/dmetadata_faces.cpp +++ b/core/libs/metadataengine/dmetadata/dmetadata_faces.cpp @@ -227,7 +227,7 @@ ok &= setXmpTagString(areahTagKey.arg(i).toLatin1().constData(), QString::number(h), MetaEngine::NormalTag); - qCDebug(DIGIKAM_METAENGINE_LOG) << " => set heigh:" << ok; + qCDebug(DIGIKAM_METAENGINE_LOG) << " => set height:" << ok; // Set stArea:unit inside Area structure as normalized ok &= setXmpTagString(areanormTagKey.arg(i).toLatin1().constData(), diff --git a/core/libs/metadataengine/dmetadata/geodetictools.cpp b/core/libs/metadataengine/dmetadata/geodetictools.cpp --- a/core/libs/metadataengine/dmetadata/geodetictools.cpp +++ b/core/libs/metadataengine/dmetadata/geodetictools.cpp @@ -6,7 +6,7 @@ * Date : 2008-05-05 * Description : Geodetic tools based from an implementation written by * Daniele Franzoni and Martin Desruisseaux from - * GeoTools Project Managment Committee (PMC), http://geotools.org + * GeoTools Project Management Committee (PMC), http://geotools.org * * Copyright (C) 2008-2011 by Marcel Wiesweg * diff --git a/core/libs/metadataengine/engine/metaengine.h b/core/libs/metadataengine/engine/metaengine.h --- a/core/libs/metadataengine/engine/metaengine.h +++ b/core/libs/metadataengine/engine/metaengine.h @@ -153,7 +153,7 @@ explicit MetaEngine(const MetaEngineData& data); /** - * Contructor to Load Metadata from item file. + * Constructor to Load Metadata from item file. */ explicit MetaEngine(const QString& filePath); @@ -209,7 +209,7 @@ void setData(const MetaEngineData& data); /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a byte array. - * Return true if metadata have been loaded successfully from item data. + * Return true if metadata has been loaded successfully from item data. */ bool loadFromData(const QByteArray& imgData); @@ -316,22 +316,22 @@ static bool hasSidecar(const QString& path); /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a picture (JPEG, RAW, TIFF, PNG, - * DNG, etc...). Return true if metadata have been loaded successfully from file. + * DNG, etc...). Return true if metadata has been loaded successfully from file. */ virtual bool load(const QString& filePath); /** Load metadata from a sidecar file and merge. - * Return true if metadata have been loaded successfully from file. + * Return true if metadata has been loaded successfully from file. */ bool loadFromSidecarAndMerge(const QString& filePath); /** Save all metadata to a file. This one can be different than original picture to perform - * transfert operation Return true if metadata have been saved into file. + * transfer operation. Return true if metadata has been saved into file. */ bool save(const QString& filePath, bool setVersion = false) const; /** The same than save() method, but it apply on current item. Return true if metadata - * have been saved into file. + * has been saved into file. */ bool applyChanges(bool setVersion = false) const; @@ -342,7 +342,7 @@ //@{ /** Set Program name and program version in Exif and Iptc Metadata. Return true if information - * have been changed in metadata. + * has been changed in metadata. */ bool setItemProgramId(const QString& program, const QString& version) const; @@ -351,7 +351,7 @@ */ QSize getItemDimensions() const; - /** Set the size of item in pixels in Exif tags. Return true if size have been changed + /** Set the size of item in pixels in Exif tags. Return true if size has been changed * in metadata. */ bool setItemDimensions(const QSize& size) const; @@ -362,7 +362,7 @@ MetaEngine::ImageOrientation getItemOrientation() const; /** Set the Exif orientation tag of item. See ImageOrientation values for details - * Return true if orientation have been changed in metadata. + * Return true if orientation has been changed in metadata. */ bool setItemOrientation(ImageOrientation orientation) const; @@ -372,7 +372,7 @@ MetaEngine::ImageColorWorkSpace getItemColorWorkSpace() const; /** Set the Exif color-space tag of item. See ImageColorWorkSpace values for details - * Return true if work-space have been changed in metadata. + * Return true if work-space has been changed in metadata. */ bool setItemColorWorkSpace(ImageColorWorkSpace workspace) const; @@ -399,7 +399,7 @@ /** Set the Iptc preview image. The thumbnail item must have the right size before (64Kb max * with JPEG file, else 256Kb). Look Iptc specification for details. Return true if preview - * have been changed in metadata. + * has been changed in metadata. * Re-implement this method if you want to use another item file format than JPEG to * save preview. */ @@ -436,7 +436,7 @@ QString getCommentsDecoded() const; /** Set the Comments data using a Qt byte array. Return true if Comments metadata - * have been changed in memory. + * has been changed in memory. */ bool setComments(const QByteArray& data) const; @@ -482,7 +482,7 @@ QByteArray getExifEncoded(bool addExifHeader=false) const; /** Set the Exif data using a Qt byte array. Return true if Exif metadata - * have been changed in memory. + * has been changed in memory. */ bool setExif(const QByteArray& data) const; @@ -498,7 +498,7 @@ bool rotateExifQImage(QImage& image, ImageOrientation orientation) const; /** Set the Exif Thumbnail image. The thumbnail image must have the right dimensions before. - * Look Exif specification for details. Return true if thumbnail have been changed in metadata. + * Look Exif specification for details. Return true if thumbnail has been changed in metadata. */ bool setExifThumbnail(const QImage& thumb) const; @@ -652,7 +652,7 @@ QByteArray getIptc(bool addIrbHeader=false) const; /** Set the Iptc data using a Qt byte array. Return true if Iptc metadata - * have been changed in memory. + * has been changed in memory. */ bool setIptc(const QByteArray& data) const; @@ -784,7 +784,7 @@ QByteArray getXmp() const; /** Set the Xmp data using a Qt byte array. Return true if Xmp metadata - * have been changed in memory. + * has been changed in memory. */ bool setXmp(const QByteArray& data) const; @@ -1005,17 +1005,17 @@ */ bool getGPSAltitude(double* const altitude) const; - /** Set all GPS location information into item. Return true if all information have been + /** Set all GPS location information into item. Return true if all information has been * changed in metadata. */ bool setGPSInfo(const double altitude, const double latitude, const double longitude); - /** Set all GPS location information into item. Return true if all information have been + /** Set all GPS location information into item. Return true if all information has been * changed in metadata. If you do not want altitude to be set, pass a null pointer. */ bool setGPSInfo(const double* const altitude, const double latitude, const double longitude); - /** Set all GPS location information into item. Return true if all information have been + /** Set all GPS location information into item. Return true if all information has been * changed in metadata. */ bool setGPSInfo(const double altitude, const QString& latitude, const QString& longitude); diff --git a/core/libs/models/abstractalbummodel.h b/core/libs/models/abstractalbummodel.h --- a/core/libs/models/abstractalbummodel.h +++ b/core/libs/models/abstractalbummodel.h @@ -272,7 +272,7 @@ protected: /** - * Call this method in children class contructors to init signal/slots connections. + * Call this method in children class constructors to init signal/slots connections. */ void setup(); diff --git a/core/libs/tags/engine/taggingactionfactory.h b/core/libs/tags/engine/taggingactionfactory.h --- a/core/libs/tags/engine/taggingactionfactory.h +++ b/core/libs/tags/engine/taggingactionfactory.h @@ -71,7 +71,7 @@ void setParentTag(int parentTagId); int parentTagId() const; - // Allows to filter the scope of suggested tags. Pass an implementation of ConstraintInterface (reamins in your ownership). + // Allows to filter the scope of suggested tags. Pass an implementation of ConstraintInterface (remains in your ownership). // actions() will then only suggest to assign tags for which matches() is true void setConstraintInterface(ConstraintInterface* const iface); ConstraintInterface* constraintInterface() const; diff --git a/core/libs/tags/engine/tagmodificationhelper.h b/core/libs/tags/engine/tagmodificationhelper.h --- a/core/libs/tags/engine/tagmodificationhelper.h +++ b/core/libs/tags/engine/tagmodificationhelper.h @@ -58,7 +58,7 @@ * Constructor. * * @param parent parent for qt parent child mechanism - * @param dialogParent paret widget for dialogs displayed by this object + * @param dialogParent parent widget for dialogs displayed by this object */ explicit TagModificationHelper(QObject* const parent, QWidget* const dialogParent); diff --git a/core/libs/tags/widgets/tagspopupmenu.cpp b/core/libs/tags/widgets/tagspopupmenu.cpp --- a/core/libs/tags/widgets/tagspopupmenu.cpp +++ b/core/libs/tags/widgets/tagspopupmenu.cpp @@ -230,7 +230,7 @@ // if (mouseDown) option->state |= QStyle::State_Sunken; // We have a special case here: menu items which are checked are not selectable, - // it is an "Assign Tags" menu. To signal this, we change the pallette. + // it is an "Assign Tags" menu. To signal this, we change the palette. // But only if there is no submenu... if (m_action->isChecked() && !m_action->menu()) { diff --git a/core/libs/threads/actionthreadbase.h b/core/libs/threads/actionthreadbase.h --- a/core/libs/threads/actionthreadbase.h +++ b/core/libs/threads/actionthreadbase.h @@ -107,7 +107,7 @@ int maximumNumberOfThreads() const; /** Reset maximum number of threads used to parallelize collection of job processing to max core detected on computer. - * This method is called in contructor. + * This method is called in constructor. */ void defaultMaximumNumberOfThreads(); diff --git a/core/libs/widgets/files/dfileselector.cpp b/core/libs/widgets/files/dfileselector.cpp --- a/core/libs/widgets/files/dfileselector.cpp +++ b/core/libs/widgets/files/dfileselector.cpp @@ -115,7 +115,7 @@ return; } - // Never pass a parent to File Dialog, else dupplicate dialogs will be shown + // Never pass a parent to File Dialog, else duplicate dialogs will be shown DFileDialog* const fileDlg = new DFileDialog; fileDlg->setDirectory(QFileInfo(fileDlgPath()).filePath()); diff --git a/core/libs/widgets/itemview/dcategorizedview.cpp b/core/libs/widgets/itemview/dcategorizedview.cpp --- a/core/libs/widgets/itemview/dcategorizedview.cpp +++ b/core/libs/widgets/itemview/dcategorizedview.cpp @@ -1084,7 +1084,7 @@ bottom = tmp; } - // if the rect are on differnet lines, expand + // if the rect are on different lines, expand if (top.top() != bottom.top()) { // top rectangle diff --git a/core/libs/widgets/itemview/itemviewhoverbutton.h b/core/libs/widgets/itemview/itemviewhoverbutton.h --- a/core/libs/widgets/itemview/itemviewhoverbutton.h +++ b/core/libs/widgets/itemview/itemviewhoverbutton.h @@ -58,7 +58,7 @@ protected: /** - * to call in children class contructors to init signal/slot connections. + * to call in children class constructors to init signal/slot connections. */ void setup(); diff --git a/core/libs/widgets/metadata/countryselector.cpp b/core/libs/widgets/metadata/countryselector.cpp --- a/core/libs/widgets/metadata/countryselector.cpp +++ b/core/libs/widgets/metadata/countryselector.cpp @@ -335,7 +335,7 @@ void CountrySelector::setCountry(const QString& countryCode) { - // NOTE: if countryCode is empty or do not matches code map, unknow is selected from the list. + // NOTE: if countryCode is empty or do not matches code map, unknown is selected from the list. int id = count()-1; @@ -355,7 +355,7 @@ bool CountrySelector::country(QString& countryCode, QString& countryName) const { - // Unknow is selected ? + // Unknown is selected ? if (currentIndex() == count()-1) return false; diff --git a/core/libs/widgets/metadata/metadatawidget.h b/core/libs/widgets/metadata/metadatawidget.h --- a/core/libs/widgets/metadata/metadatawidget.h +++ b/core/libs/widgets/metadata/metadatawidget.h @@ -119,7 +119,7 @@ protected: /** - * Call this method in children class contructors to init signal/slots connections. + * Call this method in children class constructors to init signal/slots connections. */ void setup(); diff --git a/core/tests/dngwriter/dnginfo.cpp b/core/tests/dngwriter/dnginfo.cpp --- a/core/tests/dngwriter/dnginfo.cpp +++ b/core/tests/dngwriter/dnginfo.cpp @@ -176,7 +176,7 @@ catch (...) { - qDebug() << "DNGWriter: DNG SDK exception code unknow" ; + qDebug() << "DNGWriter: DNG SDK exception code unknown" ; return -1; } } diff --git a/core/tests/geolocation/editor/test_rgparsing.cpp b/core/tests/geolocation/editor/test_rgparsing.cpp --- a/core/tests/geolocation/editor/test_rgparsing.cpp +++ b/core/tests/geolocation/editor/test_rgparsing.cpp @@ -161,7 +161,7 @@ // - some fields are missing (no country) // * simply deletes {Country} // - invalid field names - // * if we have {Contry} or {bla} it deletes the etiquette + // * if we have {Country} or {bla} it deletes the etiquette // - how do we handle these cases in the UI? // * now that we have makeTagString separate, these are handled same in tests and UI } diff --git a/core/utilities/fuzzysearch/sketchwidget.cpp b/core/utilities/fuzzysearch/sketchwidget.cpp --- a/core/utilities/fuzzysearch/sketchwidget.cpp +++ b/core/utilities/fuzzysearch/sketchwidget.cpp @@ -90,8 +90,8 @@ void startDrawEvent(const QPoint& pos) { // Remove all draw events from history map which are upper than current index. - // If user redo actions and make new draw events, theses one will be queued at - // end of history and will replace removed items. + // If user redo actions and makes new draw events, these will be queued at the + // end of the history and will replace removed items. for (int i = drawEventList.count() - 1 ; i > eventIndex ; --i) { drawEventList.removeAt(i); diff --git a/core/utilities/geolocation/geoiface/correlator/track_correlator_thread.cpp b/core/utilities/geolocation/geoiface/correlator/track_correlator_thread.cpp --- a/core/utilities/geolocation/geoiface/correlator/track_correlator_thread.cpp +++ b/core/utilities/geolocation/geoiface/correlator/track_correlator_thread.cpp @@ -72,7 +72,7 @@ return; } - // GPS device are sync in time by satelite using GMT time. + // GPS device are sync in time by satellite using GMT time. QDateTime itemDateTime = it->dateTime.addSecs(options.secondsOffset); itemDateTime.setTimeZone(QTimeZone(options.timeZoneOffset)); diff --git a/core/utilities/geolocation/geoiface/tiles/abstractmarkertiler.h b/core/utilities/geolocation/geoiface/tiles/abstractmarkertiler.h --- a/core/utilities/geolocation/geoiface/tiles/abstractmarkertiler.h +++ b/core/utilities/geolocation/geoiface/tiles/abstractmarkertiler.h @@ -194,7 +194,7 @@ protected: /** - * @brief Only used to safely delete all tiles in the desctructor + * @brief Only used to safely delete all tiles in the destructor */ void clear(); diff --git a/core/utilities/import/backend/camiteminfo.h b/core/utilities/import/backend/camiteminfo.h --- a/core/utilities/import/backend/camiteminfo.h +++ b/core/utilities/import/backend/camiteminfo.h @@ -51,7 +51,7 @@ enum DownloadStatus { - DownloadUnknown = -1, // Donwload state is unknown + DownloadUnknown = -1, // Download state is unknown DownloadedNo = 0, // Is not yet downloaded on computer DownloadedYes = 1, // Is already downloaded on computer DownloadFailed = 2, // Download is failed or have been aborted by user diff --git a/core/utilities/import/backend/gpcamera.h b/core/utilities/import/backend/gpcamera.h --- a/core/utilities/import/backend/gpcamera.h +++ b/core/utilities/import/backend/gpcamera.h @@ -92,7 +92,7 @@ private: - /** Run getItemInfo implementation whithout to be wrapped into GPhoto context + /** Run getItemInfo implementation without to be wrapped into GPhoto context */ void getItemInfoInternal(const QString& folder, const QString& itemName, CamItemInfo& info, bool useMetadata); diff --git a/core/utilities/maintenance/newitemsfinder.cpp b/core/utilities/maintenance/newitemsfinder.cpp --- a/core/utilities/maintenance/newitemsfinder.cpp +++ b/core/utilities/maintenance/newitemsfinder.cpp @@ -71,7 +71,7 @@ d->mode = mode; - // Common conections to ScanController + // Common connections to ScanController connect(ScanController::instance(), SIGNAL(collectionScanStarted(QString)), this, SLOT(slotScanStarted(QString))); @@ -187,14 +187,14 @@ void NewItemsFinder::slotPartialScanDone(const QString& path) { - // Check if path scanned is included in planed list. + // Check if path scanned is included in planned list. if (d->foldersToScan.contains(path) && !d->foldersScanned.contains(path)) { d->foldersScanned.append(path); d->foldersScanned.sort(); - // Check if all planed scanning is done + // Check if all planned scanning is done if (d->foldersScanned == d->foldersToScan) { slotDone(); diff --git a/core/utilities/searchwindow/searchmodificationhelper.h b/core/utilities/searchwindow/searchmodificationhelper.h --- a/core/utilities/searchwindow/searchmodificationhelper.h +++ b/core/utilities/searchwindow/searchmodificationhelper.h @@ -65,7 +65,7 @@ * Constructor. * * @param parent parent for qt parent child mechanism - * @param dialogParent paret widget for dialogs displayed by this object + * @param dialogParent parent widget for dialogs displayed by this object */ SearchModificationHelper(QObject* const parent, QWidget* const dialogParent); diff --git a/core/utilities/setup/editor/setupeditor.cpp b/core/utilities/setup/editor/setupeditor.cpp --- a/core/utilities/setup/editor/setupeditor.cpp +++ b/core/utilities/setup/editor/setupeditor.cpp @@ -104,7 +104,7 @@ void SetupEditor::readSettings() { - // Nothing todo. All is already processed in widget contructors + // Nothing todo. All is already processed in widget constructors } } // namespace Digikam diff --git a/gits b/gits --- a/gits +++ b/gits @@ -2641,7 +2641,7 @@ Also see --eval-args for an options to support standard shell `cmd` and $VARIABLE expansion where it might otherwise be quoted. Run the -following commmands to see the difference: +following commands to see the difference: diff --git a/project/bundles/mxe/data/releasenotes.html b/project/bundles/mxe/data/releasenotes.html --- a/project/bundles/mxe/data/releasenotes.html +++ b/project/bundles/mxe/data/releasenotes.html @@ -60,7 +60,7 @@ NOTE: when a dysfunction is discovered please get a backtrace of debug statements generated by digiKam while running. Not like under Linux, these information are printed on a system console only visible with a dedicated application named DebugView. -You can donwload this tool at this url. +You can download this tool at this url. Thanks in advance for your support.