fixed things i've broken by the merge conflict

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

QtMeshViewer/Source/MainWindow.cpp

@@ -171,14 +171,15 @@ void MainWindow::setupWidgets()
 
 void MainWindow::updateAssetTree(QString path)
 {
-	ui->fileListWidget->clear();
-	m_Paths.clear();
+
+	ui->fileTreeWidget->clear();
 	QDirIterator itterator(path, QStringList() << "*.msh" << "*.MSH" << "*.mesh" << "*.MESH",
 												  QDir::Files, QDirIterator::Subdirectories);
 
 	while (itterator.hasNext()) {
-		ui->fileListWidget->insertItem(0, new QListWidgetItem(itterator.fileName()));
-		m_Paths.prepend(itterator.fileInfo().absoluteFilePath());
+		QTreeWidgetItem* sub = new QTreeWidgetItem(ui->fileTreeWidget);
+		sub->setData(0, Qt::DisplayRole, itterator.fileName());
+		sub->setData(1, Qt::DisplayRole, itterator.fileInfo().absoluteFilePath());
 		itterator.next();
 	}
 }
@@ -247,10 +248,9 @@ void MainWindow::setupAssetLibrary()
 		updateAssetTree(ui->dirDropDownList->currentData().toString());
 }
 
-void MainWindow::on_fileListWidget_doubleClicked(const QModelIndex &index)
+void MainWindow::on_fileTreeWidget_doubleClicked()
 {
-	int slotVal = index.row();
-	QString clickedFile = m_Paths.at(slotVal);
+	QString clickedFile = ui->fileTreeWidget->currentItem()->text(1);
 	openFile(clickedFile);
 }