Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:29:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Code style fixes

Browse source
This commit is contained in:
Atlante45 2014-02-19 13:13:17 -08:00
parent 919891d73c
commit 406768bf12
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -2128,7 +2128,7 @@ void Application::updateMouseVoxels(float deltaTime, float& distance, BoxFace& f
PerformanceWarning warn(showWarnings, "Application::updateMouseVoxels()"); PerformanceWarning warn(showWarnings, "Application::updateMouseVoxels()");
_mouseVoxel.s = 0.0f; _mouseVoxel.s = 0.0f;
bool wasInitialized = _mouseVoxelScaleInitialized ; bool wasInitialized = _mouseVoxelScaleInitialized;
if (Menu::getInstance()->isVoxelModeActionChecked() && if (Menu::getInstance()->isVoxelModeActionChecked() &&
(fabs(_myAvatar->getVelocity().x) + (fabs(_myAvatar->getVelocity().x) +
fabs(_myAvatar->getVelocity().y) + fabs(_myAvatar->getVelocity().y) +

6
interface/src/ImportDialog.cpp
View file

@ -21,7 +21,6 @@ const QString PLACE_BUTTON_NAME = QObject::tr("Place voxels");
const QString IMPORT_INFO = QObject::tr("<b>Import</b> %1 as voxels"); const QString IMPORT_INFO = QObject::tr("<b>Import</b> %1 as voxels");
const QString CANCEL_BUTTON_NAME = QObject::tr("Cancel"); const QString CANCEL_BUTTON_NAME = QObject::tr("Cancel");
const QString DOWNLOAD_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); const QString DOWNLOAD_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
const int SHORT_FILE_EXTENSION = 4; const int SHORT_FILE_EXTENSION = 4;
const int SECOND_INDEX_LETTER = 1; const int SECOND_INDEX_LETTER = 1;
@ -167,7 +166,7 @@ void ImportDialog::accept() {
void ImportDialog::saveCurrentFile(QString filename) { void ImportDialog::saveCurrentFile(QString filename) {
_currentFile = QFileInfo(filename).isFile() ? filename : ""; _currentFile = QFileInfo(filename).isFile() ? filename : "";
} }
#include <iostream>
void ImportDialog::setLayout() { void ImportDialog::setLayout() {
QGridLayout* gridLayout = (QGridLayout*) layout(); QGridLayout* gridLayout = (QGridLayout*) layout();
gridLayout->addWidget(&_progressBar, 2, 0, 2, 1); gridLayout->addWidget(&_progressBar, 2, 0, 2, 1);
@ -225,7 +224,6 @@ void ImportDialog::setLayout() {
widget->setAttribute(Qt::WA_MacShowFocusRect, false); widget->setAttribute(Qt::WA_MacShowFocusRect, false);
switchToResourcesParentIfRequired(); switchToResourcesParentIfRequired();
QIcon icon = QIcon("resources/icons/backButton.svg"); QIcon icon = QIcon("resources/icons/backButton.svg");
QPushButton* button = (QPushButton*) findChild<QWidget*>("backButton"); QPushButton* button = (QPushButton*) findChild<QWidget*>("backButton");
//button->setIcon(icon); //button->setIcon(icon);
@ -233,8 +231,6 @@ void ImportDialog::setLayout() {
button = (QPushButton*) findChild<QWidget*>("forwardButton"); button = (QPushButton*) findChild<QWidget*>("forwardButton");
button = (QPushButton*) findChild<QWidget*>("toParentButton"); button = (QPushButton*) findChild<QWidget*>("toParentButton");
QFile styleSheet("resources/styles/import_dialog.qss"); QFile styleSheet("resources/styles/import_dialog.qss");
if (styleSheet.open(QIODevice::ReadOnly)) { if (styleSheet.open(QIODevice::ReadOnly)) {
setStyleSheet(styleSheet.readAll()); setStyleSheet(styleSheet.readAll());