From 406768bf120cfda1ca689073f385d86e6d57002d Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 19 Feb 2014 13:13:17 -0800 Subject: [PATCH] Code style fixes --- interface/src/Application.cpp | 2 +- interface/src/ImportDialog.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3e30d5bfb4..bdffcd1dec 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2128,7 +2128,7 @@ void Application::updateMouseVoxels(float deltaTime, float& distance, BoxFace& f PerformanceWarning warn(showWarnings, "Application::updateMouseVoxels()"); _mouseVoxel.s = 0.0f; - bool wasInitialized = _mouseVoxelScaleInitialized ; + bool wasInitialized = _mouseVoxelScaleInitialized; if (Menu::getInstance()->isVoxelModeActionChecked() && (fabs(_myAvatar->getVelocity().x) + fabs(_myAvatar->getVelocity().y) + diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp index 192e7fbf86..0911f7c184 100644 --- a/interface/src/ImportDialog.cpp +++ b/interface/src/ImportDialog.cpp @@ -21,7 +21,6 @@ const QString PLACE_BUTTON_NAME = QObject::tr("Place voxels"); const QString IMPORT_INFO = QObject::tr("Import %1 as voxels"); const QString CANCEL_BUTTON_NAME = QObject::tr("Cancel"); - const QString DOWNLOAD_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); const int SHORT_FILE_EXTENSION = 4; const int SECOND_INDEX_LETTER = 1; @@ -167,7 +166,7 @@ void ImportDialog::accept() { void ImportDialog::saveCurrentFile(QString filename) { _currentFile = QFileInfo(filename).isFile() ? filename : ""; } -#include + void ImportDialog::setLayout() { QGridLayout* gridLayout = (QGridLayout*) layout(); gridLayout->addWidget(&_progressBar, 2, 0, 2, 1); @@ -225,7 +224,6 @@ void ImportDialog::setLayout() { widget->setAttribute(Qt::WA_MacShowFocusRect, false); switchToResourcesParentIfRequired(); - QIcon icon = QIcon("resources/icons/backButton.svg"); QPushButton* button = (QPushButton*) findChild("backButton"); //button->setIcon(icon); @@ -233,8 +231,6 @@ void ImportDialog::setLayout() { button = (QPushButton*) findChild("forwardButton"); button = (QPushButton*) findChild("toParentButton"); - - QFile styleSheet("resources/styles/import_dialog.qss"); if (styleSheet.open(QIODevice::ReadOnly)) { setStyleSheet(styleSheet.readAll());