Remove redundant void

master
adrido 2018-08-18 16:18:59 +02:00
parent 999dabda15
commit 89a99b043e
7 changed files with 24 additions and 24 deletions

View File

@ -83,7 +83,7 @@ NodesTxtPage::NodesTxtPage(QWidget* parent)
layout->addLayout(hlayout); layout->addLayout(hlayout);
setLayout(layout); setLayout(layout);
} }
void NodesTxtPage::browse(void){ void NodesTxtPage::browse(){
QString fileName = QFileDialog::getOpenFileName(this, tr("Open nodes.txt File"), QString fileName = QFileDialog::getOpenFileName(this, tr("Open nodes.txt File"),
nodesTxtLineEdit->text(), nodesTxtLineEdit->text(),
tr("TXT File (*.txt)")); tr("TXT File (*.txt)"));
@ -124,7 +124,7 @@ TextureFoldersPage::TextureFoldersPage(QWidget* parent)
setLayout(vlayout); setLayout(vlayout);
} }
void TextureFoldersPage::add(void){ void TextureFoldersPage::add(){
QString folder = QFileDialog::getExistingDirectory(this,tr("Select texture folder")); QString folder = QFileDialog::getExistingDirectory(this,tr("Select texture folder"));
@ -143,15 +143,15 @@ void TextureFoldersPage::add(void){
emit completeChanged(); emit completeChanged();
} }
void TextureFoldersPage::rem(void){ void TextureFoldersPage::rem(){
qDeleteAll(inputDirs->selectedItems()); qDeleteAll(inputDirs->selectedItems());
emit completeChanged(); emit completeChanged();
} }
void TextureFoldersPage::chg(void){ void TextureFoldersPage::chg(){
//TODO: Implement me //TODO: Implement me
} }
bool TextureFoldersPage::isComplete(void) const bool TextureFoldersPage::isComplete() const
{ {
return inputDirs->count() >= 1; return inputDirs->count() >= 1;
} }
@ -180,7 +180,7 @@ OutputFilePage::OutputFilePage(QWidget* parent)
setLayout(layout); setLayout(layout);
} }
void OutputFilePage::browse(void){ void OutputFilePage::browse(){
QString fileName = QFileDialog::getSaveFileName(this, tr("Save colors.txt File"), QString fileName = QFileDialog::getSaveFileName(this, tr("Save colors.txt File"),
colorsTxtLineEdit->text(), colorsTxtLineEdit->text(),
tr("TXT File (*.txt)")); tr("TXT File (*.txt)"));
@ -220,11 +220,11 @@ void ConclusionPage::initializePage()
.arg(finishText)); .arg(finishText));
} }
bool ConclusionPage::isComplete(void) const { bool ConclusionPage::isComplete() const {
return generated; return generated;
} }
bool ConclusionPage::generate(void){ bool ConclusionPage::generate(){
MakeColors *makeColors = new MakeColors(); MakeColors *makeColors = new MakeColors();
QString fileNodesTxt = field("nodesTxt").toString(); QString fileNodesTxt = field("nodesTxt").toString();
QString fileColorsTxt = field("colorsTxt").toString(); QString fileColorsTxt = field("colorsTxt").toString();

View File

@ -116,7 +116,7 @@ void ConfigDialog::on_browseMapper_clicked()
} }
} }
QString ConfigSettings::getDefaultMapperExecutable(void) QString ConfigSettings::getDefaultMapperExecutable()
{ {
QStringList locations = getMapperExecutables(); QStringList locations = getMapperExecutables();
if (locations.empty()) return ""; if (locations.empty()) return "";
@ -142,7 +142,7 @@ void ConfigSettings::addMapperExecutablesToList(QStringList &existingList, QStri
} }
} }
QStringList ConfigSettings::getMapperExecutables(void) QStringList ConfigSettings::getMapperExecutables()
{ {
QStringList mapperLocations; QStringList mapperLocations;
QStringList moreLocations = ConfigSettings::predefinedMapperLocations; QStringList moreLocations = ConfigSettings::predefinedMapperLocations;

View File

@ -110,7 +110,7 @@ Geometry::Format Geometry::set(const QString &str)
return format; return format;
} }
void Geometry::setMax(void) void Geometry::setMax()
{ {
for (int i=0; i<2; i++) { for (int i=0; i<2; i++) {
center[i] = 0; center[i] = 0;
@ -120,7 +120,7 @@ void Geometry::setMax(void)
computeCorner1(); computeCorner1();
} }
bool Geometry::adjustCorners(void) bool Geometry::adjustCorners()
{ {
bool adjusted = false; bool adjusted = false;
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
@ -203,7 +203,7 @@ QString Geometry::getString(Geometry::Format format)
} }
void Geometry::computeCorner0(void) void Geometry::computeCorner0()
{ {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (dimension[i] < 0) if (dimension[i] < 0)
@ -213,7 +213,7 @@ void Geometry::computeCorner0(void)
} }
} }
void Geometry::computeCorner1(void) void Geometry::computeCorner1()
{ {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (dimension[i] < 0) if (dimension[i] < 0)
@ -223,7 +223,7 @@ void Geometry::computeCorner1(void)
} }
} }
void Geometry::computeCenter(void) void Geometry::computeCenter()
{ {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (corner[0][i] > corner[1][i]) if (corner[0][i] > corner[1][i])
@ -233,7 +233,7 @@ void Geometry::computeCenter(void)
} }
} }
void Geometry::computeDimensions(void) void Geometry::computeDimensions()
{ {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (corner[0][i] > corner[1][i]) if (corner[0][i] > corner[1][i])

View File

@ -92,7 +92,7 @@ bool GeometryWidget::set(const QString geomStr, Geometry::Format requestedFormat
return true; return true;
} }
QString GeometryWidget::getGeometry(void) const QString GeometryWidget::getGeometry() const
{ {
Geometry geometry; Geometry geometry;
Geometry::Format format = getFormat(); Geometry::Format format = getFormat();
@ -140,7 +140,7 @@ bool GeometryWidget::setFormat(Geometry::Format format)
return true; return true;
} }
Geometry::Format GeometryWidget::getFormat(void) const Geometry::Format GeometryWidget::getFormat() const
{ {
Geometry::Format format = static_cast<Geometry::Format>(ui->geometryStackedWidget->currentIndex()); Geometry::Format format = static_cast<Geometry::Format>(ui->geometryStackedWidget->currentIndex());
// Usage of '0' instead of a symbolic value is intentional. The currentIndex() should never be less than 0. // Usage of '0' instead of a symbolic value is intentional. The currentIndex() should never be less than 0.

View File

@ -144,7 +144,7 @@ void MainWindow::showEvent( QShowEvent* event ) {
} }
void MainWindow::finishUiInitialisation(void) void MainWindow::finishUiInitialisation()
{ {
ui->geometrymode_granularity_group->setId(ui->geometrymode_pixel, static_cast<int>(GeometryGranularity::pixel) ); ui->geometrymode_granularity_group->setId(ui->geometrymode_pixel, static_cast<int>(GeometryGranularity::pixel) );
ui->geometrymode_granularity_group->setId(ui->geometrymode_block, static_cast<int>(GeometryGranularity::block) ); ui->geometrymode_granularity_group->setId(ui->geometrymode_block, static_cast<int>(GeometryGranularity::block) );
@ -155,7 +155,7 @@ void MainWindow::finishUiInitialisation(void)
} }
// we create the language menu entries dynamically, dependent on the existing translations. // we create the language menu entries dynamically, dependent on the existing translations.
void MainWindow::createLanguageMenu(void) void MainWindow::createLanguageMenu()
{ {
QActionGroup* langGroup = new QActionGroup(ui->menuLanguage); QActionGroup* langGroup = new QActionGroup(ui->menuLanguage);
langGroup->setExclusive(true); langGroup->setExclusive(true);
@ -986,7 +986,7 @@ void MainWindow::on_actionPreferences_triggered()
} }
} }
void MainWindow::startColorsTxtAssistant(void) void MainWindow::startColorsTxtAssistant()
{ {
ColorsTxtWizard *wizard = new ColorsTxtWizard(this); ColorsTxtWizard *wizard = new ColorsTxtWizard(this);
wizard->exec(); wizard->exec();

View File

@ -196,7 +196,7 @@ bool MakeColors::writeColorsTxt(const QString &file)
return true; return true;
} }
void MakeColors::run(void) void MakeColors::run()
{ {
parseNodesTxt(fileNodesTxt); parseNodesTxt(fileNodesTxt);
emit maxProgressChanged(requiredColors.size()); emit maxProgressChanged(requiredColors.size());
@ -213,7 +213,7 @@ void MakeColors::run(void)
output("Done! :)",INFO); output("Done! :)",INFO);
} }
void MakeColors::startProcess(void) void MakeColors::startProcess()
{ {
output("Starting...",VERBOSE); output("Starting...",VERBOSE);

View File

@ -173,7 +173,7 @@ bool MinetestMapperExe::initHelp()
//this->options = options; //this->options = options;
return true; return true;
} }
void MinetestMapperExe::readStandardOutput(void) void MinetestMapperExe::readStandardOutput()
{ {
static const QRegularExpression re("([0-9]{1,3})(\\%)"); static const QRegularExpression re("([0-9]{1,3})(\\%)");
if(state == MappingStart || state == MappingProgress || state == MappingEnd) { if(state == MappingStart || state == MappingProgress || state == MappingEnd) {