Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-18 11:08:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #161 from keepassxreboot/migrate/191-spelling

Browse source 
KeePassX PR Migration: #191 Spelling (missing commits)
This commit is contained in:
Janek Bevendorff 2017-01-14 21:41:25 +02:00 • committed by GitHub
commit b4b47ec8fd
7 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/SignalMultiplexer.cpp
View file

@ -36,7 +36,7 @@ QObject* SignalMultiplexer::currentObject() const
void SignalMultiplexer::setCurrentObject(QObject* object) 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<Connection> i = m_connections; QMutableListIterator<Connection> i = m_connections;
while (i.hasNext()) { while (i.hasNext()) {
const Connection& con = i.next(); const Connection& con = i.next();

4
src/format/KeePass2Reader.cpp
View file

@ -295,7 +295,7 @@ bool KeePass2Reader::readHeaderField()
break; break;
case KeePass2::TransformRounds: case KeePass2::TransformRounds:
setTansformRounds(fieldData); setTransformRounds(fieldData);
break; break;
case KeePass2::EncryptionIV: 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) { if (data.size() != 8) {
raiseError("Invalid transform rounds size"); raiseError("Invalid transform rounds size");

2
src/format/KeePass2Reader.h
View file

@ -48,7 +48,7 @@ private:
void setCompressionFlags(const QByteArray& data); void setCompressionFlags(const QByteArray& data);
void setMasterSeed(const QByteArray& data); void setMasterSeed(const QByteArray& data);
void setTransformSeed(const QByteArray& data); void setTransformSeed(const QByteArray& data);
void setTansformRounds(const QByteArray& data); void setTransformRounds(const QByteArray& data);
void setEncryptionIV(const QByteArray& data); void setEncryptionIV(const QByteArray& data);
void setProtectedStreamKey(const QByteArray& data); void setProtectedStreamKey(const QByteArray& data);
void setStreamStartBytes(const QByteArray& data); void setStreamStartBytes(const QByteArray& data);

16
src/format/KeePass2XmlReader.cpp
View file

@ -178,7 +178,7 @@ bool KeePass2XmlReader::parseKeePassFile()
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile"); Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile");
bool rootElementFound = false; bool rootElementFound = false;
bool rootParsedSuccesfully = false; bool rootParsedSuccessfully = false;
while (!m_xml.error() && m_xml.readNextStartElement()) { while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Meta") { if (m_xml.name() == "Meta") {
@ -186,11 +186,11 @@ bool KeePass2XmlReader::parseKeePassFile()
} }
else if (m_xml.name() == "Root") { else if (m_xml.name() == "Root") {
if (rootElementFound) { if (rootElementFound) {
rootParsedSuccesfully = false; rootParsedSuccessfully = false;
raiseError("Multiple root elements"); raiseError("Multiple root elements");
} }
else { else {
rootParsedSuccesfully = parseRoot(); rootParsedSuccessfully = parseRoot();
rootElementFound = true; rootElementFound = true;
} }
} }
@ -199,7 +199,7 @@ bool KeePass2XmlReader::parseKeePassFile()
} }
} }
return rootParsedSuccesfully; return rootParsedSuccessfully;
} }
void KeePass2XmlReader::parseMeta() void KeePass2XmlReader::parseMeta()
@ -458,12 +458,12 @@ bool KeePass2XmlReader::parseRoot()
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root"); Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root");
bool groupElementFound = false; bool groupElementFound = false;
bool groupParsedSuccesfully = false; bool groupParsedSuccessfully = false;
while (!m_xml.error() && m_xml.readNextStartElement()) { while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Group") { if (m_xml.name() == "Group") {
if (groupElementFound) { if (groupElementFound) {
groupParsedSuccesfully = false; groupParsedSuccessfully = false;
raiseError("Multiple group elements"); raiseError("Multiple group elements");
continue; continue;
} }
@ -473,7 +473,7 @@ bool KeePass2XmlReader::parseRoot()
Group* oldRoot = m_db->rootGroup(); Group* oldRoot = m_db->rootGroup();
m_db->setRootGroup(rootGroup); m_db->setRootGroup(rootGroup);
delete oldRoot; delete oldRoot;
groupParsedSuccesfully = true; groupParsedSuccessfully = true;
} }
groupElementFound = true; groupElementFound = true;
@ -486,7 +486,7 @@ bool KeePass2XmlReader::parseRoot()
} }
} }
return groupParsedSuccesfully; return groupParsedSuccessfully;
} }
Group* KeePass2XmlReader::parseGroup() Group* KeePass2XmlReader::parseGroup()

8
src/gui/entry/EditEntryWidget.cpp
View file

@ -90,7 +90,7 @@ void EditEntryWidget::setupMain()
m_mainUi->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); 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->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))); connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool)));
m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit); m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit);
connect(m_mainUi->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString))); 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->expireCheck->setEnabled(!m_history);
m_mainUi->expireDatePicker->setReadOnly(m_history); m_mainUi->expireDatePicker->setReadOnly(m_history);
m_mainUi->notesEdit->setReadOnly(m_history); m_mainUi->notesEdit->setReadOnly(m_history);
m_mainUi->tooglePasswordGeneratorButton->setChecked(false); m_mainUi->togglePasswordGeneratorButton->setChecked(false);
m_mainUi->tooglePasswordGeneratorButton->setDisabled(m_history); m_mainUi->togglePasswordGeneratorButton->setDisabled(m_history);
m_mainUi->passwordGenerator->reset(); m_mainUi->passwordGenerator->reset();
m_advancedUi->addAttachmentButton->setEnabled(!m_history); m_advancedUi->addAttachmentButton->setEnabled(!m_history);
updateAttachmentButtonsEnabled(m_advancedUi->attachmentsView->currentIndex()); updateAttachmentButtonsEnabled(m_advancedUi->attachmentsView->currentIndex());
@ -529,7 +529,7 @@ void EditEntryWidget::setGeneratedPassword(const QString& password)
m_mainUi->passwordEdit->setText(password); m_mainUi->passwordEdit->setText(password);
m_mainUi->passwordRepeatEdit->setText(password); m_mainUi->passwordRepeatEdit->setText(password);
m_mainUi->tooglePasswordGeneratorButton->setChecked(false); m_mainUi->togglePasswordGeneratorButton->setChecked(false);
} }
void EditEntryWidget::insertAttribute() void EditEntryWidget::insertAttribute()

4
src/gui/entry/EditEntryWidgetMain.ui
View file

@ -76,7 +76,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="tooglePasswordGeneratorButton"> <widget class="QToolButton" name="togglePasswordGeneratorButton">
<property name="text"> <property name="text">
<string>Generate</string> <string>Generate</string>
</property> </property>
@ -166,7 +166,7 @@
<tabstop>passwordEdit</tabstop> <tabstop>passwordEdit</tabstop>
<tabstop>passwordRepeatEdit</tabstop> <tabstop>passwordRepeatEdit</tabstop>
<tabstop>togglePasswordButton</tabstop> <tabstop>togglePasswordButton</tabstop>
<tabstop>tooglePasswordGeneratorButton</tabstop> <tabstop>togglePasswordGeneratorButton</tabstop>
<tabstop>urlEdit</tabstop> <tabstop>urlEdit</tabstop>
<tabstop>expireCheck</tabstop> <tabstop>expireCheck</tabstop>
<tabstop>expireDatePicker</tabstop> <tabstop>expireDatePicker</tabstop>

2
tests/gui/TestGui.cpp
View file

@ -328,7 +328,7 @@ void TestGui::testEntryEntropy()
QTest::keyClicks(titleEdit, "test"); QTest::keyClicks(titleEdit, "test");
// Open the password generator // Open the password generator
QToolButton* generatorButton = editEntryWidget->findChild<QToolButton*>("tooglePasswordGeneratorButton"); QToolButton* generatorButton = editEntryWidget->findChild<QToolButton*>("togglePasswordGeneratorButton");
QTest::mouseClick(generatorButton, Qt::LeftButton); QTest::mouseClick(generatorButton, Qt::LeftButton);
// Type in some password // Type in some password