Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 4 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/db/db.h b/SQLiteStudio3/coreSQLiteStudio/db/db.h
index 7d10a05..e11a844 100644
--- a/SQLiteStudio3/coreSQLiteStudio/db/db.h
+++ b/SQLiteStudio3/coreSQLiteStudio/db/db.h
@@ -501,7 +501,8 @@ class API_EXPORT Db : public QObject, public Interruptable
          * @brief Attaches given database to this database.
          * @param otherDb Other registered database object.
          * @param silent If true, no errors or warnings will be reported to the NotifyManager (they will still appear in logs).
-         * @return Name of the attached database (it's not the symbolic name of the other database, it's a name you would use in <tt>ATTACH 'name'</tt> statement).
+         * @return Name of the attached database (it's not the symbolic name of the other database, it's a name you would use in <tt>ATTACH 'name'</tt> statement),
+         * or null string if error occurred.
          *
          * This is convinent method to attach other registered databases to this database. It generates attached database name, so it doesn't conflict
          * with other - already attached - database names, attaches the database with that name and returns that name to you, so you can refer to it in queries.
@@ -583,7 +584,8 @@ class API_EXPORT Db : public QObject, public Interruptable
          * @return Database type label.
          *
          * The database type label is used on UI to tell user what database it is (SQLite 3, SQLite 2, Encrypted SQLite 3, etc).
-         * This is defined by DbPlugin.
+         * This is usually the same as DbPlugin::getTitle(), but getTitle() is used in list of plugins in configuration dialog,
+         * while getTypeLabel() is used on databases list.
          */
         virtual QString getTypeLabel() = 0;