fixed things i've broken by the merge conflict

2017-06-20 11:58:03 +02:00
parent 68387fe7a7
commit 54b87b5de7
2 changed files with 8 additions and 9 deletions
--- a/QtMeshViewer/Header/MainWindow.h
+++ b/QtMeshViewer/Header/MainWindow.h
@@ -26,7 +26,6 @@ private:

 	FileInfoWindow* m_infoWindow;
 	QStringList m_filters;
-	QStringList m_Paths;

 // functions
 private:
@@ -48,7 +47,7 @@ public slots:
 // private slots
 private slots:
 	void setupAssetLibrary();
-	void on_fileListWidget_doubleClicked(const QModelIndex &index);
+	void on_fileTreeWidget_doubleClicked();
 	void on_dirDropDownList_currentTextChanged(const QString &arg1);

 // signals