From 6141263f45395f309737e8b4d413022839f6692a Mon Sep 17 00:00:00 2001 From: Maxim Stewart <1itdominator@gmail.com> Date: Sat, 17 Jun 2017 05:18:18 -0500 Subject: [PATCH] Edited open() function to be more descriptive. Set to openFileActual --- QtMeshViewer/Header/MainWindow.h | 2 +- QtMeshViewer/Source/MainWindow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QtMeshViewer/Header/MainWindow.h b/QtMeshViewer/Header/MainWindow.h index ab64d23..d5b970c 100644 --- a/QtMeshViewer/Header/MainWindow.h +++ b/QtMeshViewer/Header/MainWindow.h @@ -36,7 +36,7 @@ private: void setAsset(QString); void searchMeshFiles(QString path); void openFile(); - void open(QString); + void openFileActual(QString); void takeScreenShot(); void setDirList(); void aboutTool(); diff --git a/QtMeshViewer/Source/MainWindow.cpp b/QtMeshViewer/Source/MainWindow.cpp index 52cd349..f2ba6a5 100644 --- a/QtMeshViewer/Source/MainWindow.cpp +++ b/QtMeshViewer/Source/MainWindow.cpp @@ -210,10 +210,10 @@ void MainWindow::searchMeshFiles(QString path) void MainWindow::openFile() { QString fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Mesh (*.msh)"); - open(fileName); + openFileActual(fileName); } -void MainWindow::open(QString fileName) +void MainWindow::openFileActual(QString fileName) { if(!fileName.isEmpty()) emit loadFile(fileName); @@ -259,7 +259,7 @@ void MainWindow::resizeEvent(QResizeEvent * e) void MainWindow::on_fileListView_doubleClicked(const QModelIndex &index) { QString clickedFile = fmodel->fileInfo(index).absoluteFilePath(); - open(clickedFile); + openFileActual(clickedFile); } void MainWindow::on_dirDropDownList_currentTextChanged(const QString &arg1)