Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM 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>"

1 files changed, 5 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
index b368c08..60b8dd5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
@@ -83,6 +83,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
             REFRESH_SCHEMAS,
             REFRESH_SCHEMA,
             CREATE_SIMILAR_TABLE,
+            RESET_AUTOINCREMENT,
             _separator // Never use it directly, it's just for menu setup
         };
 
@@ -107,6 +108,8 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void setSelectedItem(DbTreeItem* item);
         bool isMimeDataValidForItem(const QMimeData* mimeData, const DbTreeItem* item);
         QToolBar* getToolBar(int toolbar) const;
+        Db* getSelectedDb();
+        Db* getSelectedOpenDb();
 
         static bool isItemDraggable(const DbTreeItem* item);
 
@@ -116,8 +119,6 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
 
     private:
         void setActionEnabled(int action, bool enabled);
-        Db* getSelectedDb();
-        Db* getSelectedOpenDb();
         TableWindow* openTable(DbTreeItem* item);
         TableWindow* openTable(Db* db, const QString& database, const QString& table);
         TableWindow* newTable(DbTreeItem* item);
@@ -147,6 +148,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void refreshSchema(Db* db);
         void refreshSchemas();
         void interrupt();
+        void updateActionsForCurrent();
 
     private slots:
         void copy();
@@ -184,6 +186,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void vacuumDb();
         void integrityCheck();
         void createSimilarTable();
+        void resetAutoincrement();
         void addColumn(DbTreeItem* item);
         void editColumn(DbTreeItem* item);
         void delColumn(DbTreeItem* item);
@@ -191,7 +194,6 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void deleteSelected();
         void deleteItems(const QList<DbTreeItem*>& itemsToDelete);
         void refreshSchema();
-        void updateActionsForCurrent();
         void dbConnected(Db* db);
         void dbDisconnected(Db* db);
         void updateDbIcon(Db* db);