Merge branch 'develop'

1 files changed, 8 insertions, 2 deletions

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 6715acbb..36562563 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -22,6 +22,7 @@
 #include "logic/net/LoginTask.h"
 #include "logic/BaseInstance.h"
 
+class QToolButton;
 class LabeledToolButton;
 class QLabel;
 class InstanceProxyModel;
@@ -51,13 +52,16 @@ public:
 
 	void checkSetDefaultJava();
 
-private slots:
+private
+slots:
 	void onCatToggled(bool);
 
 	void on_actionAbout_triggered();
 
 	void on_actionAddInstance_triggered();
 
+	void on_actionCopyInstance_triggered();
+
 	void on_actionChangeInstGroup_triggered();
 
 	void on_actionChangeInstIcon_triggered();
@@ -122,7 +126,8 @@ private slots:
 	void assetsFailed();
 	void assetsFinished();
 
-public slots:
+public
+slots:
 	void instanceActivated(QModelIndex);
 
 	void instanceChanged(const QModelIndex &current, const QModelIndex &previous);
@@ -146,6 +151,7 @@ private:
 	ConsoleWindow *console;
 	OneSixAssets *assets_downloader;
 	LabeledToolButton *renameButton;
+	QToolButton *changeIconButton;
 
 	BaseInstance *m_selectedInstance;