Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 2 insertions, 2 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
index 2beea3e..3d1a9da 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
@@ -70,6 +70,7 @@ class GUI_API_EXPORT DbDialog : public QDialog
         DbPluginOption::CustomBrowseHandler customBrowseHandler = nullptr;
         bool disableTypeAutodetection = false;
         bool doAutoTest = false;
+        bool nameManuallyEdited = false;
 
         static const constexpr int ADDITIONAL_ROWS_BEGIN_INDEX = 1;
 
@@ -77,13 +78,12 @@ class GUI_API_EXPORT DbDialog : public QDialog
         void typeChanged(int index);
         void valueForNameGenerationChanged();
         void browseForFile();
-        void generateNameSwitched(bool checked);
         void fileChanged(const QString &arg1);
         void browseClicked();
         void testConnectionClicked();
         void propertyChanged();
         void dbTypeChanged(int index);
-        void nameModified(const QString &arg1);
+        void nameModified(const QString &value);
 
     public slots:
         void accept();