From 40eafa8adcd20d9bcc76fd81e99e4eca49ac909d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:48:07 +0000 Subject: [PATCH 01/17] spelling: associations --- tests/TestEntryModel.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/TestEntryModel.cpp b/tests/TestEntryModel.cpp index 3f956d7f..d5a16eba 100644 --- a/tests/TestEntryModel.cpp +++ b/tests/TestEntryModel.cpp @@ -236,15 +236,15 @@ void TestEntryModel::testAutoTypeAssociationsModel() QCOMPARE(model->rowCount(), 0); - AutoTypeAssociations* assocications = new AutoTypeAssociations(this); - model->setAutoTypeAssociations(assocications); + AutoTypeAssociations* associations = new AutoTypeAssociations(this); + model->setAutoTypeAssociations(associations); QCOMPARE(model->rowCount(), 0); AutoTypeAssociations::Association assoc; assoc.window = "1"; assoc.sequence = "2"; - assocications->add(assoc); + associations->add(assoc); QCOMPARE(model->rowCount(), 1); QCOMPARE(model->data(model->index(0, 0)).toString(), QString("1")); @@ -252,17 +252,17 @@ void TestEntryModel::testAutoTypeAssociationsModel() assoc.window = "3"; assoc.sequence = "4"; - assocications->update(0, assoc); + associations->update(0, assoc); QCOMPARE(model->data(model->index(0, 0)).toString(), QString("3")); QCOMPARE(model->data(model->index(0, 1)).toString(), QString("4")); - assocications->add(assoc); - assocications->remove(0); + associations->add(assoc); + associations->remove(0); QCOMPARE(model->rowCount(), 1); delete modelTest; delete model; - delete assocications; + delete associations; } void TestEntryModel::testProxyModel() From 569ea3ebdd1849b34c10ce61c00a5750592f1171 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:48:26 +0000 Subject: [PATCH 02/17] spelling: attachments --- src/core/Entry.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp index 629f5141..b2b06e7c 100644 --- a/src/core/Entry.cpp +++ b/src/core/Entry.cpp @@ -449,7 +449,7 @@ void Entry::truncateHistory() int histMaxSize = db->metadata()->historyMaxSize(); if (histMaxSize > -1) { int size = 0; - QSet foundAttachements = attachments()->values().toSet(); + QSet foundAttachments = attachments()->values().toSet(); QMutableListIterator i(m_history); i.toBack(); @@ -460,11 +460,11 @@ void Entry::truncateHistory() if (size <= histMaxSize) { size += historyItem->attributes()->attributesSize(); - const QSet newAttachments = historyItem->attachments()->values().toSet() - foundAttachements; + const QSet newAttachments = historyItem->attachments()->values().toSet() - foundAttachments; for (const QByteArray& attachment : newAttachments) { size += attachment.size(); } - foundAttachements += newAttachments; + foundAttachments += newAttachments; } if (size > histMaxSize) { From 6060f4145835d6eff419a5d596ba34b3db0a1062 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:48:39 +0000 Subject: [PATCH 03/17] spelling: available --- src/streams/qtiocompressor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/streams/qtiocompressor.cpp b/src/streams/qtiocompressor.cpp index be6ac5df..f8ef44ac 100644 --- a/src/streams/qtiocompressor.cpp +++ b/src/streams/qtiocompressor.cpp @@ -522,11 +522,11 @@ qint64 QtIOCompressor::readData(char *data, qint64 maxSize) // Read data if if the input buffer is empty. There could be data in the buffer // from a previous readData call. if (d->zlibStream.avail_in == 0) { - qint64 bytesAvalible = d->device->read(reinterpret_cast(d->buffer), d->bufferSize); + qint64 bytesAvailable = d->device->read(reinterpret_cast(d->buffer), d->bufferSize); d->zlibStream.next_in = d->buffer; - d->zlibStream.avail_in = bytesAvalible; + d->zlibStream.avail_in = bytesAvailable; - if (bytesAvalible == -1) { + if (bytesAvailable == -1) { d->state = QtIOCompressorPrivate::Error; setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error reading data from underlying device: ") + d->device->errorString()); return -1; @@ -534,9 +534,9 @@ qint64 QtIOCompressor::readData(char *data, qint64 maxSize) if (d->state != QtIOCompressorPrivate::InStream) { // If we are not in a stream and get 0 bytes, we are probably trying to read from an empty device. - if(bytesAvalible == 0) + if(bytesAvailable == 0) return 0; - else if (bytesAvalible > 0) + else if (bytesAvailable > 0) d->state = QtIOCompressorPrivate::InStream; } } From d988b9e6d2ae2024f53f926322a3e37c74c64f2f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:49:05 +0000 Subject: [PATCH 04/17] spelling: characters --- src/format/KeePass2XmlWriter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/format/KeePass2XmlWriter.cpp b/src/format/KeePass2XmlWriter.cpp index 6c92c4b3..f8dfa158 100644 --- a/src/format/KeePass2XmlWriter.cpp +++ b/src/format/KeePass2XmlWriter.cpp @@ -566,9 +566,9 @@ QString KeePass2XmlWriter::stripInvalidXml10Chars(QString str) // keep valid surrogate pair i--; } - else if ((uc < 0x20 && uc != 0x09 && uc != 0x0A && uc != 0x0D) // control chracters - || (uc >= 0x7F && uc <= 0x84) // control chracters, valid but discouraged by XML - || (uc >= 0x86 && uc <= 0x9F) // control chracters, valid but discouraged by XML + else if ((uc < 0x20 && uc != 0x09 && uc != 0x0A && uc != 0x0D) // control characters + || (uc >= 0x7F && uc <= 0x84) // control characters, valid but discouraged by XML + || (uc >= 0x86 && uc <= 0x9F) // control characters, valid but discouraged by XML || (uc > 0xFFFD) // noncharacter || ch.isLowSurrogate() // single low surrogate || ch.isHighSurrogate()) // single high surrogate From 53e0893b51683386c4a9cfdab3784a63c89cc06f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:50:19 +0000 Subject: [PATCH 05/17] spelling: correct --- src/keys/FileKey.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/keys/FileKey.cpp b/src/keys/FileKey.cpp index d399f545..d3cdfe04 100644 --- a/src/keys/FileKey.cpp +++ b/src/keys/FileKey.cpp @@ -190,18 +190,18 @@ bool FileKey::loadXml(QIODevice* device) bool FileKey::loadXmlMeta(QXmlStreamReader& xmlReader) { - bool corectVersion = false; + bool correctVersion = false; while (!xmlReader.error() && xmlReader.readNextStartElement()) { if (xmlReader.name() == "Version") { // TODO: error message about incompatible key file version if (xmlReader.readElementText() == "1.00") { - corectVersion = true; + correctVersion = true; } } } - return corectVersion; + return correctVersion; } QByteArray FileKey::loadXmlKey(QXmlStreamReader& xmlReader) From 3924f628b498810ab6606537569276072716cde7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:55:09 +0000 Subject: [PATCH 06/17] spelling: full --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 883f462e..3914049e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo Debug Debugfull Profile MinSizeRel." + "Choose the type of build, options are: None Debug Release RelWithDebInfo Debug DebugFull Profile MinSizeRel." FORCE) endif() From ca8ddd5f3907e0a1cefdb4a2d622d7211845ecef Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:56:06 +0000 Subject: [PATCH 07/17] spelling: decrypt --- src/crypto/Crypto.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp index 4669de69..d00be720 100644 --- a/src/crypto/Crypto.cpp +++ b/src/crypto/Crypto.cpp @@ -153,14 +153,14 @@ bool Crypto::testAes256Cbc() return false; } - SymmetricCipher aes256Descrypt(SymmetricCipher::Aes256, SymmetricCipher::Cbc, SymmetricCipher::Decrypt); - if (!aes256Descrypt.init(key, iv)) { - raiseError(aes256Descrypt.errorString()); + SymmetricCipher aes256Decrypt(SymmetricCipher::Aes256, SymmetricCipher::Cbc, SymmetricCipher::Decrypt); + if (!aes256Decrypt.init(key, iv)) { + raiseError(aes256Decrypt.errorString()); return false; } - QByteArray decryptedText = aes256Descrypt.process(cipherText, &ok); + QByteArray decryptedText = aes256Decrypt.process(cipherText, &ok); if (!ok) { - raiseError(aes256Descrypt.errorString()); + raiseError(aes256Decrypt.errorString()); return false; } if (decryptedText != plainText) { @@ -196,14 +196,14 @@ bool Crypto::testAes256Ecb() return false; } - SymmetricCipher aes256Descrypt(SymmetricCipher::Aes256, SymmetricCipher::Ecb, SymmetricCipher::Decrypt); - if (!aes256Descrypt.init(key, iv)) { - raiseError(aes256Descrypt.errorString()); + SymmetricCipher aes256Decrypt(SymmetricCipher::Aes256, SymmetricCipher::Ecb, SymmetricCipher::Decrypt); + if (!aes256Decrypt.init(key, iv)) { + raiseError(aes256Decrypt.errorString()); return false; } - QByteArray decryptedText = aes256Descrypt.process(cipherText, &ok); + QByteArray decryptedText = aes256Decrypt.process(cipherText, &ok); if (!ok) { - raiseError(aes256Descrypt.errorString()); + raiseError(aes256Decrypt.errorString()); return false; } if (decryptedText != plainText) { From 4ea6faae816729cb6b71c69a881263cdc6d2a152 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:58:51 +0000 Subject: [PATCH 08/17] spelling: executor --- src/autotype/test/AutoTypeTest.cpp | 8 ++++---- src/autotype/test/AutoTypeTest.h | 4 ++-- src/autotype/xcb/AutoTypeXCB.cpp | 8 ++++---- src/autotype/xcb/AutoTypeXCB.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/autotype/test/AutoTypeTest.cpp b/src/autotype/test/AutoTypeTest.cpp index 1ac815b0..0eaf7160 100644 --- a/src/autotype/test/AutoTypeTest.cpp +++ b/src/autotype/test/AutoTypeTest.cpp @@ -65,7 +65,7 @@ int AutoTypePlatformTest::platformEventFilter(void* event) AutoTypeExecutor* AutoTypePlatformTest::createExecutor() { - return new AutoTypeExecturorTest(this); + return new AutoTypeExecutorTest(this); } void AutoTypePlatformTest::setActiveWindowTitle(const QString& title) @@ -127,17 +127,17 @@ bool AutoTypePlatformTest::raiseOwnWindow() } #endif -AutoTypeExecturorTest::AutoTypeExecturorTest(AutoTypePlatformTest* platform) +AutoTypeExecutorTest::AutoTypeExecutorTest(AutoTypePlatformTest* platform) : m_platform(platform) { } -void AutoTypeExecturorTest::execChar(AutoTypeChar* action) +void AutoTypeExecutorTest::execChar(AutoTypeChar* action) { m_platform->addActionChar(action); } -void AutoTypeExecturorTest::execKey(AutoTypeKey* action) +void AutoTypeExecutorTest::execKey(AutoTypeKey* action) { m_platform->addActionKey(action); } diff --git a/src/autotype/test/AutoTypeTest.h b/src/autotype/test/AutoTypeTest.h index 33487778..4feaab94 100644 --- a/src/autotype/test/AutoTypeTest.h +++ b/src/autotype/test/AutoTypeTest.h @@ -69,10 +69,10 @@ private: QString m_actionChars; }; -class AutoTypeExecturorTest : public AutoTypeExecutor +class AutoTypeExecutorTest : public AutoTypeExecutor { public: - explicit AutoTypeExecturorTest(AutoTypePlatformTest* platform); + explicit AutoTypeExecutorTest(AutoTypePlatformTest* platform); void execChar(AutoTypeChar* action) override; void execKey(AutoTypeKey* action) override; diff --git a/src/autotype/xcb/AutoTypeXCB.cpp b/src/autotype/xcb/AutoTypeXCB.cpp index 23a211d3..2d93f367 100644 --- a/src/autotype/xcb/AutoTypeXCB.cpp +++ b/src/autotype/xcb/AutoTypeXCB.cpp @@ -247,7 +247,7 @@ int AutoTypePlatformX11::platformEventFilter(void* event) AutoTypeExecutor* AutoTypePlatformX11::createExecutor() { - return new AutoTypeExecturorX11(this); + return new AutoTypeExecutorX11(this); } QString AutoTypePlatformX11::windowTitle(Window window, bool useBlacklist) @@ -823,17 +823,17 @@ int AutoTypePlatformX11::MyErrorHandler(Display* my_dpy, XErrorEvent* event) } -AutoTypeExecturorX11::AutoTypeExecturorX11(AutoTypePlatformX11* platform) +AutoTypeExecutorX11::AutoTypeExecutorX11(AutoTypePlatformX11* platform) : m_platform(platform) { } -void AutoTypeExecturorX11::execChar(AutoTypeChar* action) +void AutoTypeExecutorX11::execChar(AutoTypeChar* action) { m_platform->SendKeyPressedEvent(m_platform->charToKeySym(action->character)); } -void AutoTypeExecturorX11::execKey(AutoTypeKey* action) +void AutoTypeExecutorX11::execKey(AutoTypeKey* action) { m_platform->SendKeyPressedEvent(m_platform->keyToKeySym(action->key)); } diff --git a/src/autotype/xcb/AutoTypeXCB.h b/src/autotype/xcb/AutoTypeXCB.h index 8adee770..bb33516b 100644 --- a/src/autotype/xcb/AutoTypeXCB.h +++ b/src/autotype/xcb/AutoTypeXCB.h @@ -119,10 +119,10 @@ private: bool m_loaded; }; -class AutoTypeExecturorX11 : public AutoTypeExecutor +class AutoTypeExecutorX11 : public AutoTypeExecutor { public: - explicit AutoTypeExecturorX11(AutoTypePlatformX11* platform); + explicit AutoTypeExecutorX11(AutoTypePlatformX11* platform); void execChar(AutoTypeChar* action) override; void execKey(AutoTypeKey* action) override; From b8c93b3572302cdf49aeb644c802109c639bdb13 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 03:59:57 +0000 Subject: [PATCH 09/17] spelling: finish --- src/streams/qtiocompressor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/streams/qtiocompressor.cpp b/src/streams/qtiocompressor.cpp index f8ef44ac..97955e47 100644 --- a/src/streams/qtiocompressor.cpp +++ b/src/streams/qtiocompressor.cpp @@ -135,7 +135,7 @@ void QtIOCompressorPrivate::flushZlib(int flushMode) if (!writeBytes(buffer, outputSize)) return; - // If the mode is Z_FNISH we must loop until we get Z_STREAM_END, + // If the mode is Z_FINISH we must loop until we get Z_STREAM_END, // else we loop as long as zlib is able to fill the output buffer. } while ((flushMode == Z_FINISH && status != Z_STREAM_END) || (flushMode != Z_FINISH && zlibStream.avail_out == 0)); From ce06fcdbe0091b29317a69963cc0ebf47296f2e1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 04:02:41 +0000 Subject: [PATCH 10/17] spelling: occurred --- src/autotype/xcb/AutoTypeXCB.cpp | 8 ++++---- src/autotype/xcb/AutoTypeXCB.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/autotype/xcb/AutoTypeXCB.cpp b/src/autotype/xcb/AutoTypeXCB.cpp index 2d93f367..f419875d 100644 --- a/src/autotype/xcb/AutoTypeXCB.cpp +++ b/src/autotype/xcb/AutoTypeXCB.cpp @@ -24,7 +24,7 @@ #include bool AutoTypePlatformX11::m_catchXErrors = false; -bool AutoTypePlatformX11::m_xErrorOccured = false; +bool AutoTypePlatformX11::m_xErrorOccurred = false; int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = nullptr; AutoTypePlatformX11::AutoTypePlatformX11() @@ -153,7 +153,7 @@ bool AutoTypePlatformX11::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifi GrabModeAsync, GrabModeAsync); stopCatchXErrors(); - if (!m_xErrorOccured) { + if (!m_xErrorOccurred) { m_currentGlobalKey = key; m_currentGlobalModifiers = modifiers; m_currentGlobalKeycode = keycode; @@ -556,7 +556,7 @@ void AutoTypePlatformX11::startCatchXErrors() Q_ASSERT(!m_catchXErrors); m_catchXErrors = true; - m_xErrorOccured = false; + m_xErrorOccurred = false; m_oldXErrorHandler = XSetErrorHandler(x11ErrorHandler); } @@ -575,7 +575,7 @@ int AutoTypePlatformX11::x11ErrorHandler(Display* display, XErrorEvent* error) Q_UNUSED(error) if (m_catchXErrors) { - m_xErrorOccured = true; + m_xErrorOccurred = true; } return 1; diff --git a/src/autotype/xcb/AutoTypeXCB.h b/src/autotype/xcb/AutoTypeXCB.h index bb33516b..26d1e810 100644 --- a/src/autotype/xcb/AutoTypeXCB.h +++ b/src/autotype/xcb/AutoTypeXCB.h @@ -100,7 +100,7 @@ private: uint m_currentGlobalNativeModifiers; int m_modifierMask; static bool m_catchXErrors; - static bool m_xErrorOccured; + static bool m_xErrorOccurred; static int (*m_oldXErrorHandler)(Display*, XErrorEvent*); static const int m_unicodeToKeysymLen; From 341ff3de37e0bb092f810676120943c80cf6234e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 04:04:42 +0000 Subject: [PATCH 11/17] spelling: recycle --- src/gui/DatabaseWidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 1ecbb18a..985374c4 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -333,8 +333,8 @@ void DatabaseWidget::deleteEntries() selectedEntries.append(m_entryView->entryFromIndex(index)); } - bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), selectedEntries.first()); - if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) { + bool inRecycleBin = Tools::hasChild(m_db->metadata()->recycleBin(), selectedEntries.first()); + if (inRecycleBin || !m_db->metadata()->recycleBinEnabled()) { QMessageBox::StandardButton result; if (selected.size() == 1) { @@ -525,10 +525,10 @@ void DatabaseWidget::deleteGroup() return; } - bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), currentGroup); + bool inRecycleBin = Tools::hasChild(m_db->metadata()->recycleBin(), currentGroup); bool isRecycleBin = (currentGroup == m_db->metadata()->recycleBin()); bool isRecycleBinSubgroup = Tools::hasChild(currentGroup, m_db->metadata()->recycleBin()); - if (inRecylceBin || isRecycleBin || isRecycleBinSubgroup || !m_db->metadata()->recycleBinEnabled()) { + if (inRecycleBin || isRecycleBin || isRecycleBinSubgroup || !m_db->metadata()->recycleBinEnabled()) { QMessageBox::StandardButton result = MessageBox::question( this, tr("Delete group?"), tr("Do you really want to delete the group \"%1\" for good?") From d1793d9bcf519d99cd1d3d04aef1433743362bb3 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Sat, 14 Jan 2017 21:09:59 +0200 Subject: [PATCH 12/17] Ask PR authors to remove lines that don't apply instead of changing emoji (#159) * Ask user to remove lines that don't apply instead of changing emoji * Replace KeePassXR with KeePassXC * Add help text how to find KeePassXC version [skip ci] * Combine documentation requirements into one [skip ci] --- .github/ISSUE_TEMPLATE.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 5ad51c74..1a3f1a06 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -26,7 +26,7 @@ ## Your Environment -* KeePassXR version/commit used: +* KeePassXC version/commit used: (can be found under Help -> About) * Qt version (e.g. Qt 5.3): * Compiler (e.g. Clang++3.6.0): * Operating System and version: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 51436aad..c83ca4e5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ - + ## Description @@ -15,21 +15,19 @@ ## Screenshots (if appropriate): ## Types of changes - - - -- :negative_squared_cross_mark: Bug fix (non-breaking change which fixes an issue) -- :negative_squared_cross_mark: New feature (non-breaking change which adds functionality) -- :negative_squared_cross_mark: Breaking change (fix or feature that would cause existing functionality to change) + + +- ✅ Bug fix (non-breaking change which fixes an issue) +- ✅ New feature (non-breaking change which adds functionality) +- ✅ Breaking change (fix or feature that would cause existing functionality to change) ## Checklist: - - - - -- :negative_squared_cross_mark: I have read the **CONTRIBUTING** document. [REQUIRED] -- :negative_squared_cross_mark: My code follows the code style of this project. [REQUIRED] -- :negative_squared_cross_mark: All new and existing tests passed. [REQUIRED] -- :negative_squared_cross_mark: My change requires a change to the documentation. -- :negative_squared_cross_mark: I have updated the documentation accordingly. -- :negative_squared_cross_mark: I have added tests to cover my changes. + + + + +- ✅ I have read the **CONTRIBUTING** document. **[REQUIRED]** +- ✅ My code follows the code style of this project. **[REQUIRED]** +- ✅ All new and existing tests passed. **[REQUIRED]** +- ✅ My change requires a change to the documentation and I have updated it accordingly. +- ✅ I have added tests to cover my changes. From 084a1dd7d247d7a4ee6a5bae6a378d98314405c1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 04:15:33 +0000 Subject: [PATCH 13/17] spelling: whose --- src/core/SignalMultiplexer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/SignalMultiplexer.cpp b/src/core/SignalMultiplexer.cpp index 7b5fab93..0f99b8e6 100644 --- a/src/core/SignalMultiplexer.cpp +++ b/src/core/SignalMultiplexer.cpp @@ -36,7 +36,7 @@ QObject* SignalMultiplexer::currentObject() const void SignalMultiplexer::setCurrentObject(QObject* object) { - // remove all Connections from the list whoes senders/receivers have been deleted + // remove all Connections from the list whose senders/receivers have been deleted QMutableListIterator i = m_connections; while (i.hasNext()) { const Connection& con = i.next(); From 2ad7c5c6759dd88e051e09bf8f7b865f4ebe0a8d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 04:13:27 +0000 Subject: [PATCH 14/17] spelling: toggle --- src/gui/entry/EditEntryWidget.cpp | 8 ++++---- src/gui/entry/EditEntryWidgetMain.ui | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 344a329f..d9ba5bd8 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -90,7 +90,7 @@ void EditEntryWidget::setupMain() m_mainUi->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), m_mainUi->passwordEdit, SLOT(setShowPassword(bool))); - connect(m_mainUi->tooglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); + connect(m_mainUi->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit); connect(m_mainUi->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString))); @@ -299,8 +299,8 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->expireCheck->setEnabled(!m_history); m_mainUi->expireDatePicker->setReadOnly(m_history); m_mainUi->notesEdit->setReadOnly(m_history); - m_mainUi->tooglePasswordGeneratorButton->setChecked(false); - m_mainUi->tooglePasswordGeneratorButton->setDisabled(m_history); + m_mainUi->togglePasswordGeneratorButton->setChecked(false); + m_mainUi->togglePasswordGeneratorButton->setDisabled(m_history); m_mainUi->passwordGenerator->reset(); m_advancedUi->addAttachmentButton->setEnabled(!m_history); updateAttachmentButtonsEnabled(m_advancedUi->attachmentsView->currentIndex()); @@ -529,7 +529,7 @@ void EditEntryWidget::setGeneratedPassword(const QString& password) m_mainUi->passwordEdit->setText(password); m_mainUi->passwordRepeatEdit->setText(password); - m_mainUi->tooglePasswordGeneratorButton->setChecked(false); + m_mainUi->togglePasswordGeneratorButton->setChecked(false); } void EditEntryWidget::insertAttribute() diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index ebf32425..083f1c03 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -76,7 +76,7 @@ - + Generate @@ -166,7 +166,7 @@ passwordEdit passwordRepeatEdit togglePasswordButton - tooglePasswordGeneratorButton + togglePasswordGeneratorButton urlEdit expireCheck expireDatePicker From 10f03795f92d5748e6be69b242e7ac8fd0698ec0 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 04:12:57 +0000 Subject: [PATCH 15/17] spelling: transform --- src/format/KeePass2Reader.cpp | 4 ++-- src/format/KeePass2Reader.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index b45cefa6..1371aaa6 100644 --- a/src/format/KeePass2Reader.cpp +++ b/src/format/KeePass2Reader.cpp @@ -295,7 +295,7 @@ bool KeePass2Reader::readHeaderField() break; case KeePass2::TransformRounds: - setTansformRounds(fieldData); + setTransformRounds(fieldData); break; case KeePass2::EncryptionIV: @@ -376,7 +376,7 @@ void KeePass2Reader::setTransformSeed(const QByteArray& data) } } -void KeePass2Reader::setTansformRounds(const QByteArray& data) +void KeePass2Reader::setTransformRounds(const QByteArray& data) { if (data.size() != 8) { raiseError("Invalid transform rounds size"); diff --git a/src/format/KeePass2Reader.h b/src/format/KeePass2Reader.h index 827e671c..f8b96253 100644 --- a/src/format/KeePass2Reader.h +++ b/src/format/KeePass2Reader.h @@ -48,7 +48,7 @@ private: void setCompressionFlags(const QByteArray& data); void setMasterSeed(const QByteArray& data); void setTransformSeed(const QByteArray& data); - void setTansformRounds(const QByteArray& data); + void setTransformRounds(const QByteArray& data); void setEncryptionIV(const QByteArray& data); void setProtectedStreamKey(const QByteArray& data); void setStreamStartBytes(const QByteArray& data); From af8e7701066da4ddbef1a1ab69fcabc3cbeefb40 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 2 Dec 2016 04:12:25 +0000 Subject: [PATCH 16/17] spelling: successfully --- src/format/KeePass2XmlReader.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp index f7067259..dfb03bd0 100644 --- a/src/format/KeePass2XmlReader.cpp +++ b/src/format/KeePass2XmlReader.cpp @@ -178,7 +178,7 @@ bool KeePass2XmlReader::parseKeePassFile() Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile"); bool rootElementFound = false; - bool rootParsedSuccesfully = false; + bool rootParsedSuccessfully = false; while (!m_xml.error() && m_xml.readNextStartElement()) { if (m_xml.name() == "Meta") { @@ -186,11 +186,11 @@ bool KeePass2XmlReader::parseKeePassFile() } else if (m_xml.name() == "Root") { if (rootElementFound) { - rootParsedSuccesfully = false; + rootParsedSuccessfully = false; raiseError("Multiple root elements"); } else { - rootParsedSuccesfully = parseRoot(); + rootParsedSuccessfully = parseRoot(); rootElementFound = true; } } @@ -199,7 +199,7 @@ bool KeePass2XmlReader::parseKeePassFile() } } - return rootParsedSuccesfully; + return rootParsedSuccessfully; } void KeePass2XmlReader::parseMeta() @@ -458,12 +458,12 @@ bool KeePass2XmlReader::parseRoot() Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root"); bool groupElementFound = false; - bool groupParsedSuccesfully = false; + bool groupParsedSuccessfully = false; while (!m_xml.error() && m_xml.readNextStartElement()) { if (m_xml.name() == "Group") { if (groupElementFound) { - groupParsedSuccesfully = false; + groupParsedSuccessfully = false; raiseError("Multiple group elements"); continue; } @@ -473,7 +473,7 @@ bool KeePass2XmlReader::parseRoot() Group* oldRoot = m_db->rootGroup(); m_db->setRootGroup(rootGroup); delete oldRoot; - groupParsedSuccesfully = true; + groupParsedSuccessfully = true; } groupElementFound = true; @@ -486,7 +486,7 @@ bool KeePass2XmlReader::parseRoot() } } - return groupParsedSuccesfully; + return groupParsedSuccessfully; } Group* KeePass2XmlReader::parseGroup() From ea9f313416a56232ab6aaec651638a15066e89a9 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Sat, 14 Jan 2017 20:33:27 +0100 Subject: [PATCH 17/17] Fix GUI test --- tests/gui/TestGui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index 01f16524..babab8ab 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -328,7 +328,7 @@ void TestGui::testEntryEntropy() QTest::keyClicks(titleEdit, "test"); // Open the password generator - QToolButton* generatorButton = editEntryWidget->findChild("tooglePasswordGeneratorButton"); + QToolButton* generatorButton = editEntryWidget->findChild("togglePasswordGeneratorButton"); QTest::mouseClick(generatorButton, Qt::LeftButton); // Type in some password