mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
Fix minor typos (#10124)
This commit is contained in:
parent
681a0f5638
commit
9e119230d4
@ -79,7 +79,7 @@
|
|||||||
- Browser: Revert code causing connection problems [#8665]
|
- Browser: Revert code causing connection problems [#8665]
|
||||||
- Browser: Fix socket file symbolic link on Linux [#8656]
|
- Browser: Fix socket file symbolic link on Linux [#8656]
|
||||||
- Flatpak: Fix launching browser proxy service [#8680]
|
- Flatpak: Fix launching browser proxy service [#8680]
|
||||||
- SSH Agent: Fix paegent support on Windows [#8619]
|
- SSH Agent: Fix pageant support on Windows [#8619]
|
||||||
|
|
||||||
## 2.7.3 (2022-10-23)
|
## 2.7.3 (2022-10-23)
|
||||||
|
|
||||||
|
@ -310,7 +310,7 @@ if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
|
|||||||
check_add_gcc_compiler_flag("-Wshadow-compatible-local")
|
check_add_gcc_compiler_flag("-Wshadow-compatible-local")
|
||||||
check_add_gcc_compiler_flag("-Wshadow-local")
|
check_add_gcc_compiler_flag("-Wshadow-local")
|
||||||
add_gcc_compiler_flags("-Werror")
|
add_gcc_compiler_flags("-Werror")
|
||||||
# This is needed since compiling aginst Botan3 requires compiling against C++20
|
# This is needed since compiling against Botan3 requires compiling against C++20
|
||||||
if(WITH_XC_BOTAN3)
|
if(WITH_XC_BOTAN3)
|
||||||
add_gcc_compiler_cxxflags("-Wno-error=deprecated-enum-enum-conversion -Wno-error=deprecated")
|
add_gcc_compiler_cxxflags("-Wno-error=deprecated-enum-enum-conversion -Wno-error=deprecated")
|
||||||
endif()
|
endif()
|
||||||
|
@ -126,7 +126,7 @@
|
|||||||
<li>Browser: Revert code causing connection problems [#8665]</li>
|
<li>Browser: Revert code causing connection problems [#8665]</li>
|
||||||
<li>Browser: Fix socket file symbolic link on Linux [#8656]</li>
|
<li>Browser: Fix socket file symbolic link on Linux [#8656]</li>
|
||||||
<li>Flatpak: Fix launching browser proxy service [#8680]</li>
|
<li>Flatpak: Fix launching browser proxy service [#8680]</li>
|
||||||
<li>SSH Agent: Fix paegent support on Windows [#8619]</li>
|
<li>SSH Agent: Fix pageant support on Windows [#8619]</li>
|
||||||
</ul>
|
</ul>
|
||||||
</description>
|
</description>
|
||||||
</release>
|
</release>
|
||||||
|
@ -6450,7 +6450,7 @@ Do you want to overwrite it?</source>
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Toggle password visibilty using Control + H. Open the password generator using Control + G.</source>
|
<source>Toggle password visibility using Control + H. Open the password generator using Control + G.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
@ -1549,7 +1549,7 @@ bool EntryData::equals(const EntryData& other, CompareItemOptions options) const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (totpSettings.isNull() != other.totpSettings.isNull()) {
|
} else if (totpSettings.isNull() != other.totpSettings.isNull()) {
|
||||||
// The existance of TOTP has changed between these entries
|
// The existence of TOTP has changed between these entries
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (::compare(excludeFromReports, other.excludeFromReports, options) != 0) {
|
if (::compare(excludeFromReports, other.excludeFromReports, options) != 0) {
|
||||||
|
@ -279,7 +279,7 @@ int Metadata::autosaveDelayMin() const
|
|||||||
// data is not set yet, use default
|
// data is not set yet, use default
|
||||||
return Metadata::DefaultAutosaveDelayMin;
|
return Metadata::DefaultAutosaveDelayMin;
|
||||||
}
|
}
|
||||||
bool ok; // check for QString to int op failuer
|
bool ok; // check for QString to int op failure
|
||||||
int autosaveDelayMin = autosaveDelayMinStr.toInt(&ok);
|
int autosaveDelayMin = autosaveDelayMinStr.toInt(&ok);
|
||||||
Q_ASSERT(ok);
|
Q_ASSERT(ok);
|
||||||
return autosaveDelayMin;
|
return autosaveDelayMin;
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="passwordEdit">
|
<widget class="QLineEdit" name="passwordEdit">
|
||||||
<property name="accessibleDescription">
|
<property name="accessibleDescription">
|
||||||
<string>Toggle password visibilty using Control + H. Open the password generator using Control + G.</string>
|
<string>Toggle password visibility using Control + H. Open the password generator using Control + G.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -593,7 +593,7 @@ namespace Phantom
|
|||||||
} else {
|
} else {
|
||||||
// Remove the oldest guy from the cache. Remember that because we may
|
// Remove the oldest guy from the cache. Remember that because we may
|
||||||
// re-enter QStyle functions multiple times when drawing or calculating
|
// re-enter QStyle functions multiple times when drawing or calculating
|
||||||
// something, we may have to load several swaitches derived from
|
// something, we may have to load several switches derived from
|
||||||
// different QPalettes on different stack frames at the same time. But as
|
// different QPalettes on different stack frames at the same time. But as
|
||||||
// an extra cost-savings measure, we'll check and see if something else
|
// an extra cost-savings measure, we'll check and see if something else
|
||||||
// has a reference to the removed guy. If there aren't any references to
|
// has a reference to the removed guy. If there aren't any references to
|
||||||
@ -2770,7 +2770,7 @@ void BaseStyle::drawControl(ControlElement element,
|
|||||||
// that when it is resolved against the device, this font will win. This
|
// that when it is resolved against the device, this font will win. This
|
||||||
// is mainly to handle cases where someone sets the font on the window
|
// is mainly to handle cases where someone sets the font on the window
|
||||||
// and then the combo inherits it and passes it onward. At that point the
|
// and then the combo inherits it and passes it onward. At that point the
|
||||||
// resolve mask is very, very weak. This makes it stonger.
|
// resolve mask is very, very weak. This makes it stronger.
|
||||||
#if 0
|
#if 0
|
||||||
QFont font = menuItem->font;
|
QFont font = menuItem->font;
|
||||||
font.setPointSizeF(QFontInfo(menuItem->font).pointSizeF());
|
font.setPointSizeF(QFontInfo(menuItem->font).pointSizeF());
|
||||||
|
@ -109,7 +109,7 @@ namespace Phantom
|
|||||||
return (1.0 - a) * x + a * y;
|
return (1.0 - a) * x + a * y;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Linearly interpolate two QColors after trasnforming them to linear color
|
// Linearly interpolate two QColors after transforming them to linear color
|
||||||
// space, treating the QColor values as if they were in sRGB space. The
|
// space, treating the QColor values as if they were in sRGB space. The
|
||||||
// returned QColor is converted back to sRGB space.
|
// returned QColor is converted back to sRGB space.
|
||||||
QColor lerpQColor(const QColor& x, const QColor& y, qreal a);
|
QColor lerpQColor(const QColor& x, const QColor& y, qreal a);
|
||||||
|
@ -53,7 +53,7 @@ namespace
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// We could do more sophisticated **** trying to point the reference to the next in-scope reference
|
// We could do more sophisticated **** trying to point the reference to the next in-scope reference
|
||||||
// but those cases with high propability constructed examples and very rare in real usage
|
// but those cases with high probability constructed examples and very rare in real usage
|
||||||
const auto* sourceReference = sourceDb->rootGroup()->findEntryByUuid(targetEntry->uuid());
|
const auto* sourceReference = sourceDb->rootGroup()->findEntryByUuid(targetEntry->uuid());
|
||||||
const auto resolvedValue = sourceReference->resolveMultiplePlaceholders(standardValue);
|
const auto resolvedValue = sourceReference->resolveMultiplePlaceholders(standardValue);
|
||||||
targetEntry->setUpdateTimeinfo(false);
|
targetEntry->setUpdateTimeinfo(false);
|
||||||
|
@ -364,7 +364,7 @@ void TestEntrySearcher::testSkipProtected()
|
|||||||
m_entrySearcher.search("_testProtected:apple _testAttribute:testE1 _testAttribute:testE2", m_rootGroup);
|
m_entrySearcher.search("_testProtected:apple _testAttribute:testE1 _testAttribute:testE2", m_rootGroup);
|
||||||
QCOMPARE(m_searchResult, {});
|
QCOMPARE(m_searchResult, {});
|
||||||
|
|
||||||
// also move the protected term around to execurise the short-circut logic
|
// also move the protected term around to exercise the short-circuit logic
|
||||||
m_searchResult = m_entrySearcher.search("_testAttribute:testE2 _testProtected:apple", m_rootGroup);
|
m_searchResult = m_entrySearcher.search("_testAttribute:testE2 _testProtected:apple", m_rootGroup);
|
||||||
QCOMPARE(m_searchResult, expectE2);
|
QCOMPARE(m_searchResult, expectE2);
|
||||||
m_searchResult = m_entrySearcher.search("_testAttribute:testE1 _testProtected:apple", m_rootGroup);
|
m_searchResult = m_entrySearcher.search("_testAttribute:testE1 _testProtected:apple", m_rootGroup);
|
||||||
|
@ -533,7 +533,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap<QString, QUuid>
|
|||||||
// newer deletion in source forces deletion
|
// newer deletion in source forces deletion
|
||||||
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
|
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
|
||||||
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
|
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
|
||||||
// newer change in source privents deletion
|
// newer change in source prevents deletion
|
||||||
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
|
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
|
||||||
QVERIFY(!db->containsDeletedObject(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
|
QVERIFY(!db->containsDeletedObject(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
|
||||||
// newer deletion in target forces deletion
|
// newer deletion in target forces deletion
|
||||||
@ -549,7 +549,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap<QString, QUuid>
|
|||||||
QVERIFY(db->containsDeletedObject(identifiers["GroupDeletedInSourceAfterEntryUpdatedInTarget"]));
|
QVERIFY(db->containsDeletedObject(identifiers["GroupDeletedInSourceAfterEntryUpdatedInTarget"]));
|
||||||
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
|
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
|
||||||
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
|
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
|
||||||
// newer change in source privents deletion
|
// newer change in source prevents deletion
|
||||||
QVERIFY(mergedRootGroup->findGroupByUuid(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
|
QVERIFY(mergedRootGroup->findGroupByUuid(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
|
||||||
QVERIFY(!db->containsDeletedObject(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
|
QVERIFY(!db->containsDeletedObject(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
|
||||||
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeEntryUpdatedInSource"]));
|
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeEntryUpdatedInSource"]));
|
||||||
@ -890,7 +890,7 @@ void TestMerge::testUpdateEntryDifferentLocation()
|
|||||||
QCOMPARE(entryDestinationMerged->username(), QString("username"));
|
QCOMPARE(entryDestinationMerged->username(), QString("username"));
|
||||||
QCOMPARE(entryDestinationMerged->group()->name(), QString("group3"));
|
QCOMPARE(entryDestinationMerged->group()->name(), QString("group3"));
|
||||||
QCOMPARE(uuidBeforeSyncing, entryDestinationMerged->uuid());
|
QCOMPARE(uuidBeforeSyncing, entryDestinationMerged->uuid());
|
||||||
// default merge strategie is KeepNewer - therefore the older location is used!
|
// default merge strategy is KeepNewer - therefore the older location is used!
|
||||||
QCOMPARE(entryDestinationMerged->timeInfo().locationChanged(), sourceLocationChanged);
|
QCOMPARE(entryDestinationMerged->timeInfo().locationChanged(), sourceLocationChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user