From kde-commits Mon Oct 31 23:39:57 2016 From: Jaroslaw Staniek Date: Mon, 31 Oct 2016 23:39:57 +0000 To: kde-commits Subject: [kdb/3.0] src: GIT_SILENT fix typos (silent) Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=147795720827144 Git commit 6edd1a84633ed60748be8787a2d67999432d5e5f by Jaroslaw Staniek. Committed on 31/10/2016 at 23:37. Pushed by staniek into branch '3.0'. GIT_SILENT fix typos M +1 -1 src/KDbCursor.h M +3 -2 src/KDbEscapedString.h M +1 -1 src/KDbQuerySchema.h M +1 -1 src/drivers/sqlite/SqliteConnection_p.h M +1 -1 src/drivers/sqlite/icu/icu.cpp M +1 -1 src/sql/KDbSqlString.h http://commits.kde.org/kdb/6edd1a84633ed60748be8787a2d67999432d5e5f diff --git a/src/KDbCursor.h b/src/KDbCursor.h index af0e5bc..85e1dab 100644 --- a/src/KDbCursor.h +++ b/src/KDbCursor.h @@ -173,7 +173,7 @@ public: bool containsRecordIdInfo() const; = /*! @return a value stored in column number @a i (counting from 0). - Is has unspecified behavior if the cursor is not at valid record. + It has unspecified behavior if the cursor is not at valid record. Note for driver developers: If @a i is >=3D than m_fieldCount, null QVariant value should be retu= rned. To return a value typically you can use a pointer to internal structu= re diff --git a/src/KDbEscapedString.h b/src/KDbEscapedString.h index ca202ed..897ca16 100644 --- a/src/KDbEscapedString.h +++ b/src/KDbEscapedString.h @@ -58,8 +58,9 @@ public: //! @return invalid escaped string. static inline KDbEscapedString invalid() { return KDbEscapedString(fal= se); } = - //! @return true is the string valid. Valid string means that the esca= ping process has finished - //! successfully; it does not mean that the statement itself parses or= executed without errors. + //! @return true if the string is valid. Valid string means that the e= scaping process + //! has finished successfully. It does not mean that the statement its= elf parses + //! or can be executed without errors. inline bool isValid() const { return m_valid; } = inline QByteArray toByteArray() const { return static_cast(*this); } diff --git a/src/KDbQuerySchema.h b/src/KDbQuerySchema.h index 59910be..1d6391b 100644 --- a/src/KDbQuerySchema.h +++ b/src/KDbQuerySchema.h @@ -437,7 +437,7 @@ public: int tablePositionForAlias(const QString& name) const; = /*! @return position (within the FROM section) of table @a tableName. - -1 is returend if there's no such table declared in the FROM section. + -1 is returned if there's no such table declared in the FROM section. @see tablePositions() */ int tablePosition(const QString& tableName) const; diff --git a/src/drivers/sqlite/SqliteConnection_p.h b/src/drivers/sqlite/S= qliteConnection_p.h index f4e6a14..e3618db 100644 --- a/src/drivers/sqlite/SqliteConnection_p.h +++ b/src/drivers/sqlite/SqliteConnection_p.h @@ -36,7 +36,7 @@ public: explicit SqliteConnectionInternal(KDbConnection *connection); virtual ~SqliteConnectionInternal(); = - //! @return true is loading extensions is enabled + //! @return true if loading extensions is enabled bool extensionsLoadingEnabled() const; = //! Sets loading extensions flag to @a set diff --git a/src/drivers/sqlite/icu/icu.cpp b/src/drivers/sqlite/icu/icu.cpp index a43487e..7f78375 100644 --- a/src/drivers/sqlite/icu/icu.cpp +++ b/src/drivers/sqlite/icu/icu.cpp @@ -232,7 +232,7 @@ static void icuRegexpDelete(void *p){ ** Implementation of SQLite REGEXP operator. This scalar function takes ** two arguments. The first is a regular expression pattern to compile ** the second is a string to match against that pattern. If either -** argument is an SQL NULL, then NULL Is returned. Otherwise, the result +** argument is an SQL NULL, then NULL is returned. Otherwise, the result ** is 1 if the string matches the pattern, or 0 otherwise. ** ** SQLite maps the regexp() function to the regexp() operator such diff --git a/src/sql/KDbSqlString.h b/src/sql/KDbSqlString.h index 4f57f0c..61e7216 100644 --- a/src/sql/KDbSqlString.h +++ b/src/sql/KDbSqlString.h @@ -38,7 +38,7 @@ public: //! Creates string object from raw string @a s, of specified length inline KDbSqlString(const char *s, quint64 len) : string(s), length(le= n) {} = - //! @return true is this string value is empty. Here, NULL values are = considered empty too. + //! @return true if this string value is empty. Here, NULL values are = considered empty too. inline bool isEmpty() const { return !string || length =3D=3D 0; } = //! @return string value converted to bytea array