mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
spelling correction, fixed typos
This commit is contained in:
parent
e41bf008e9
commit
3fca61dc24
@ -69,7 +69,7 @@ public:
|
|||||||
* Sets group as the root group and takes ownership of it.
|
* Sets group as the root group and takes ownership of it.
|
||||||
* Warning: Be careful when calling this method as it doesn't
|
* Warning: Be careful when calling this method as it doesn't
|
||||||
* emit any notifications so e.g. models aren't updated.
|
* emit any notifications so e.g. models aren't updated.
|
||||||
* The caller is responsible for cleaning up the pervious
|
* The caller is responsible for cleaning up the previous
|
||||||
root group.
|
root group.
|
||||||
*/
|
*/
|
||||||
void setRootGroup(Group* group);
|
void setRootGroup(Group* group);
|
||||||
|
@ -699,7 +699,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
|
|||||||
int iconId = readNumber();
|
int iconId = readNumber();
|
||||||
if (iconId < 0) {
|
if (iconId < 0) {
|
||||||
if (m_strictMode) {
|
if (m_strictMode) {
|
||||||
raiseError("Invalud entry icon number");
|
raiseError("Invalid entry icon number");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -862,7 +862,7 @@ QPair<QString, QString> KeePass2XmlReader::parseEntryBinary(Entry* entry)
|
|||||||
m_xml.skipCurrentElement();
|
m_xml.skipCurrentElement();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// format compatbility
|
// format compatibility
|
||||||
value = readBinary();
|
value = readBinary();
|
||||||
bool isProtected = attr.hasAttribute("Protected")
|
bool isProtected = attr.hasAttribute("Protected")
|
||||||
&& (attr.value("Protected") == "True");
|
&& (attr.value("Protected") == "True");
|
||||||
|
@ -563,7 +563,7 @@ void DatabaseTabWidget::lockDatabases()
|
|||||||
QMessageBox::StandardButton result =
|
QMessageBox::StandardButton result =
|
||||||
MessageBox::question(
|
MessageBox::question(
|
||||||
this, tr("Lock database"),
|
this, tr("Lock database"),
|
||||||
tr("This database has never been saved.\nYou can save the dabatase or stop locking it."),
|
tr("This database has never been saved.\nYou can save the database or stop locking it."),
|
||||||
QMessageBox::Save | QMessageBox::Cancel, QMessageBox::Cancel);
|
QMessageBox::Save | QMessageBox::Cancel, QMessageBox::Cancel);
|
||||||
if (result == QMessageBox::Save) {
|
if (result == QMessageBox::Save) {
|
||||||
if (!saveDatabase(db)) {
|
if (!saveDatabase(db)) {
|
||||||
|
@ -147,7 +147,7 @@ void QtIOCompressorPrivate::flushZlib(int flushMode)
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
\internal
|
\internal
|
||||||
Writes outputSize bytes from buffer to the inderlying device.
|
Writes outputSize bytes from buffer to the underlying device.
|
||||||
*/
|
*/
|
||||||
bool QtIOCompressorPrivate::writeBytes(ZlibByte *buffer, ZlibSize outputSize)
|
bool QtIOCompressorPrivate::writeBytes(ZlibByte *buffer, ZlibSize outputSize)
|
||||||
{
|
{
|
||||||
@ -192,7 +192,7 @@ void QtIOCompressorPrivate::setZlibError(const QString &errorMessage, int zlibEr
|
|||||||
A QtIOCompressor object is constructed with a pointer to an
|
A QtIOCompressor object is constructed with a pointer to an
|
||||||
underlying QIODevice. Data written to the QtIOCompressor object
|
underlying QIODevice. Data written to the QtIOCompressor object
|
||||||
will be compressed before it is written to the underlying
|
will be compressed before it is written to the underlying
|
||||||
QIODevice. Similary, if you read from the QtIOCompressor object,
|
QIODevice. Similarly, if you read from the QtIOCompressor object,
|
||||||
the data will be read from the underlying device and then
|
the data will be read from the underlying device and then
|
||||||
decompressed.
|
decompressed.
|
||||||
|
|
||||||
@ -251,14 +251,14 @@ void QtIOCompressorPrivate::setZlibError(const QString &errorMessage, int zlibEr
|
|||||||
|
|
||||||
\a bufferSize specifies the size of the internal buffer used when reading from and writing to the
|
\a bufferSize specifies the size of the internal buffer used when reading from and writing to the
|
||||||
underlying device. The default value is 65KB. Using a larger value allows for faster compression and
|
underlying device. The default value is 65KB. Using a larger value allows for faster compression and
|
||||||
deompression at the expense of memory usage.
|
decompression at the expense of memory usage.
|
||||||
*/
|
*/
|
||||||
QtIOCompressor::QtIOCompressor(QIODevice *device, int compressionLevel, int bufferSize)
|
QtIOCompressor::QtIOCompressor(QIODevice *device, int compressionLevel, int bufferSize)
|
||||||
:d_ptr(new QtIOCompressorPrivate(this, device, compressionLevel, bufferSize))
|
:d_ptr(new QtIOCompressorPrivate(this, device, compressionLevel, bufferSize))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Destroys the QtIOCompressor, closing it if neccesary.
|
Destroys the QtIOCompressor, closing it if necessary.
|
||||||
*/
|
*/
|
||||||
QtIOCompressor::~QtIOCompressor()
|
QtIOCompressor::~QtIOCompressor()
|
||||||
{
|
{
|
||||||
@ -313,12 +313,12 @@ bool QtIOCompressor::isSequential() const
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
Opens the QtIOCompressor in \a mode. Only ReadOnly and WriteOnly is supported.
|
Opens the QtIOCompressor in \a mode. Only ReadOnly and WriteOnly is supported.
|
||||||
This functon will return false if you try to open in other modes.
|
This function will return false if you try to open in other modes.
|
||||||
|
|
||||||
If the underlying device is not opened, this function will open it in a suitable mode. If this happens
|
If the underlying device is not opened, this function will open it in a suitable mode. If this happens
|
||||||
the device will also be closed when close() is called.
|
the device will also be closed when close() is called.
|
||||||
|
|
||||||
If the underlying device is already opened, its openmode must be compatable with \a mode.
|
If the underlying device is already opened, its openmode must be compatible with \a mode.
|
||||||
|
|
||||||
Returns true on success, false on error.
|
Returns true on success, false on error.
|
||||||
|
|
||||||
@ -513,7 +513,7 @@ qint64 QtIOCompressor::readData(char *data, qint64 maxSize)
|
|||||||
if (d->state == QtIOCompressorPrivate::Error)
|
if (d->state == QtIOCompressorPrivate::Error)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
// We are ging to try to fill the data buffer
|
// We are going to try to fill the data buffer
|
||||||
d->zlibStream.next_out = reinterpret_cast<ZlibByte *>(data);
|
d->zlibStream.next_out = reinterpret_cast<ZlibByte *>(data);
|
||||||
d->zlibStream.avail_out = maxSize;
|
d->zlibStream.avail_out = maxSize;
|
||||||
|
|
||||||
@ -550,7 +550,7 @@ qint64 QtIOCompressor::readData(char *data, qint64 maxSize)
|
|||||||
d->state = QtIOCompressorPrivate::Error;
|
d->state = QtIOCompressorPrivate::Error;
|
||||||
d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when decompressing: "), status);
|
d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when decompressing: "), status);
|
||||||
return -1;
|
return -1;
|
||||||
case Z_BUF_ERROR: // No more input and zlib can not privide more output - Not an error, we can try to read again when we have more input.
|
case Z_BUF_ERROR: // No more input and zlib can not provide more output - Not an error, we can try to read again when we have more input.
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
// Loop util data buffer is full or we reach the end of the input stream.
|
// Loop util data buffer is full or we reach the end of the input stream.
|
||||||
|
Loading…
Reference in New Issue
Block a user