diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
| commit | e571839e140139a6a819077e94cf8cc01c13b29f (patch) | |
| tree | 8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h | |
| parent | 407eac41f46936e3f346bb5a964a682e578b4237 (diff) | |
| parent | 89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM 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>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h index c92fa2c..ee97e87 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h @@ -89,8 +89,8 @@ class GUI_API_EXPORT DbTreeModel : public QStandardItemModel static bool confirmReferencedTables(const QStringList& tables); static bool resolveNameConflict(QString& nameInConflict); - static bool confirmConversion(const QList<QPair<QString,QString>>& diffs); - static bool confirmConversionErrors(const QHash<QString, QSet<QString> >& errors); + static bool confirmConversion(const QList<QPair<QString, QString>>& diffs); + static bool confirmConversionErrors(const QHash<QString, QSet<QString>>& errors); static const QString toolTipTableTmp; static const QString toolTipHdrRowTmp; |