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, 4 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
index d8738f1..f44af4f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
@@ -118,8 +118,8 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         QString getTable() const;
         Db* getDb() const;
         bool handleInitialFocus();
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
         void useCurrentTableAsBaseForNew();
         Db* getAssociatedDb() const;
 
@@ -193,7 +193,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         void checkIfTriggerDeleted(const QString& object);
         void refreshStructure();
         void commitStructure(bool skipWarning = false);
-        void changesSuccessfullyCommited();
+        void changesSuccessfullyCommitted();
         void changesFailedToCommit(int errorCode, const QString& errorText);
         void rollbackStructure();
         void resetAutoincrement();
@@ -237,6 +237,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         void nextTab();
         void prevTab();
         void updateTabsOrder();
+        void updateFont();
 
     public slots:
         void updateIndexes();