aboutsummaryrefslogtreecommitdiffstats
path: root/SQLiteStudio3/coreSQLiteStudio/db/db.h
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2015-02-22 14:06:29 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2015-02-22 14:06:29 -0500
commit306d6d3ca9c9ad774d19135681a7f9805f77035f (patch)
treea3e36ac2cc769162c30a1bcc33e126f7a4f4ccea /SQLiteStudio3/coreSQLiteStudio/db/db.h
parent016003905ca0e8e459e3dc33e786beda8ec92f45 (diff)
Imported Upstream version 3.0.3upstream/3.0.3
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/db/db.h')
-rw-r--r--SQLiteStudio3/coreSQLiteStudio/db/db.h6
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;