From 3fca61dc243a9bf7b2e088f3b4c7476c48d88312 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 6 May 2015 19:38:43 +0300 Subject: [PATCH] spelling correction, fixed typos --- src/core/Database.h | 2 +- src/format/KeePass2XmlReader.cpp | 4 ++-- src/gui/DatabaseTabWidget.cpp | 2 +- src/streams/qtiocompressor.cpp | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/Database.h b/src/core/Database.h index 0ee9a9659..3e0c675df 100644 --- a/src/core/Database.h +++ b/src/core/Database.h @@ -69,7 +69,7 @@ public: * Sets group as the root group and takes ownership of it. * Warning: Be careful when calling this method as it doesn't * 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. */ void setRootGroup(Group* group); diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp index d1737d52a..a5ceb2186 100644 --- a/src/format/KeePass2XmlReader.cpp +++ b/src/format/KeePass2XmlReader.cpp @@ -699,7 +699,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history) int iconId = readNumber(); if (iconId < 0) { if (m_strictMode) { - raiseError("Invalud entry icon number"); + raiseError("Invalid entry icon number"); } } else { @@ -862,7 +862,7 @@ QPair KeePass2XmlReader::parseEntryBinary(Entry* entry) m_xml.skipCurrentElement(); } else { - // format compatbility + // format compatibility value = readBinary(); bool isProtected = attr.hasAttribute("Protected") && (attr.value("Protected") == "True"); diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index db9e034a7..f55269fd5 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -563,7 +563,7 @@ void DatabaseTabWidget::lockDatabases() QMessageBox::StandardButton result = MessageBox::question( 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); if (result == QMessageBox::Save) { if (!saveDatabase(db)) { diff --git a/src/streams/qtiocompressor.cpp b/src/streams/qtiocompressor.cpp index 5d815297a..be6ac5dfd 100644 --- a/src/streams/qtiocompressor.cpp +++ b/src/streams/qtiocompressor.cpp @@ -147,7 +147,7 @@ void QtIOCompressorPrivate::flushZlib(int flushMode) /*! \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) { @@ -192,7 +192,7 @@ void QtIOCompressorPrivate::setZlibError(const QString &errorMessage, int zlibEr A QtIOCompressor object is constructed with a pointer to an underlying QIODevice. Data written to the QtIOCompressor object 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 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 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) :d_ptr(new QtIOCompressorPrivate(this, device, compressionLevel, bufferSize)) {} /*! - Destroys the QtIOCompressor, closing it if neccesary. + Destroys the QtIOCompressor, closing it if necessary. */ QtIOCompressor::~QtIOCompressor() { @@ -313,12 +313,12 @@ bool QtIOCompressor::isSequential() const /*! 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 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. @@ -513,7 +513,7 @@ qint64 QtIOCompressor::readData(char *data, qint64 maxSize) if (d->state == QtIOCompressorPrivate::Error) 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(data); d->zlibStream.avail_out = maxSize; @@ -550,7 +550,7 @@ qint64 QtIOCompressor::readData(char *data, qint64 maxSize) d->state = QtIOCompressorPrivate::Error; d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when decompressing: "), status); 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; } // Loop util data buffer is full or we reach the end of the input stream.