From 89214766d8e3e7b8dd749a1fa18a5b9727f5010d Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 14 Dec 2014 08:24:26 -0500 Subject: Imported Upstream version 3.0.0 --- SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp') diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp index 8a71a10..281510f 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp @@ -1152,7 +1152,7 @@ void DbTreeModel::moveOrCopyDbObjects(const QList& srcItems, DbTree bool DbTreeModel::confirmReferencedTables(const QStringList& tables) { QMessageBox::StandardButton result = QMessageBox::question(MAINWINDOW, tr("Referenced tables"), - tr("Do you want to include following referenced tables as well:\n%1").arg(tables.join(", "))); + tr("Do you want to include following referenced tables as well:\n%1").arg(tables.join(", "))); return result == QMessageBox::Yes; } @@ -1180,7 +1180,7 @@ bool DbTreeModel::confirmConversion(const QList >& diffs return dialog.exec() == QDialog::Accepted; } -bool DbTreeModel::confirmConversionErrors(const QHash>& errors) +bool DbTreeModel::confirmConversionErrors(const QHash >& errors) { ErrorsConfirmDialog dialog(MAINWINDOW); dialog.setTopLabel(tr("Following error occurred while converting SQL statements to the target SQLite version:")); @@ -1188,6 +1188,7 @@ bool DbTreeModel::confirmConversionErrors(const QHash>& er dialog.setErrors(errors); return dialog.exec() == QDialog::Accepted; } + bool DbTreeModel::getIgnoreDbLoadedSignal() const { return ignoreDbLoadedSignal; -- cgit v1.2.3