From 89a99b043e12664cfc15490557a1549b9febea4d Mon Sep 17 00:00:00 2001 From: adrido Date: Sat, 18 Aug 2018 16:18:59 +0200 Subject: [PATCH] Remove redundant void --- colorstxtwizard.cpp | 16 ++++++++-------- configdialog.cpp | 4 ++-- geometry.cpp | 12 ++++++------ geometrywidget.cpp | 4 ++-- mainwindow.cpp | 6 +++--- makecolors.cpp | 4 ++-- minetestmapperexe.cpp | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/colorstxtwizard.cpp b/colorstxtwizard.cpp index ed59e9e..4d85f73 100644 --- a/colorstxtwizard.cpp +++ b/colorstxtwizard.cpp @@ -83,7 +83,7 @@ NodesTxtPage::NodesTxtPage(QWidget* parent) layout->addLayout(hlayout); setLayout(layout); } -void NodesTxtPage::browse(void){ +void NodesTxtPage::browse(){ QString fileName = QFileDialog::getOpenFileName(this, tr("Open nodes.txt File"), nodesTxtLineEdit->text(), tr("TXT File (*.txt)")); @@ -124,7 +124,7 @@ TextureFoldersPage::TextureFoldersPage(QWidget* parent) setLayout(vlayout); } -void TextureFoldersPage::add(void){ +void TextureFoldersPage::add(){ QString folder = QFileDialog::getExistingDirectory(this,tr("Select texture folder")); @@ -143,15 +143,15 @@ void TextureFoldersPage::add(void){ emit completeChanged(); } -void TextureFoldersPage::rem(void){ +void TextureFoldersPage::rem(){ qDeleteAll(inputDirs->selectedItems()); emit completeChanged(); } -void TextureFoldersPage::chg(void){ +void TextureFoldersPage::chg(){ //TODO: Implement me } -bool TextureFoldersPage::isComplete(void) const +bool TextureFoldersPage::isComplete() const { return inputDirs->count() >= 1; } @@ -180,7 +180,7 @@ OutputFilePage::OutputFilePage(QWidget* parent) setLayout(layout); } -void OutputFilePage::browse(void){ +void OutputFilePage::browse(){ QString fileName = QFileDialog::getSaveFileName(this, tr("Save colors.txt File"), colorsTxtLineEdit->text(), tr("TXT File (*.txt)")); @@ -220,11 +220,11 @@ void ConclusionPage::initializePage() .arg(finishText)); } -bool ConclusionPage::isComplete(void) const { +bool ConclusionPage::isComplete() const { return generated; } -bool ConclusionPage::generate(void){ +bool ConclusionPage::generate(){ MakeColors *makeColors = new MakeColors(); QString fileNodesTxt = field("nodesTxt").toString(); QString fileColorsTxt = field("colorsTxt").toString(); diff --git a/configdialog.cpp b/configdialog.cpp index 8aa3419..6aa488e 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -116,7 +116,7 @@ void ConfigDialog::on_browseMapper_clicked() } } -QString ConfigSettings::getDefaultMapperExecutable(void) +QString ConfigSettings::getDefaultMapperExecutable() { QStringList locations = getMapperExecutables(); if (locations.empty()) return ""; @@ -142,7 +142,7 @@ void ConfigSettings::addMapperExecutablesToList(QStringList &existingList, QStri } } -QStringList ConfigSettings::getMapperExecutables(void) +QStringList ConfigSettings::getMapperExecutables() { QStringList mapperLocations; QStringList moreLocations = ConfigSettings::predefinedMapperLocations; diff --git a/geometry.cpp b/geometry.cpp index 84f877c..754b0a3 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -110,7 +110,7 @@ Geometry::Format Geometry::set(const QString &str) return format; } -void Geometry::setMax(void) +void Geometry::setMax() { for (int i=0; i<2; i++) { center[i] = 0; @@ -120,7 +120,7 @@ void Geometry::setMax(void) computeCorner1(); } -bool Geometry::adjustCorners(void) +bool Geometry::adjustCorners() { bool adjusted = false; 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++) { 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++) { 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++) { 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++) { if (corner[0][i] > corner[1][i]) diff --git a/geometrywidget.cpp b/geometrywidget.cpp index 8b81480..e3c8d73 100644 --- a/geometrywidget.cpp +++ b/geometrywidget.cpp @@ -92,7 +92,7 @@ bool GeometryWidget::set(const QString geomStr, Geometry::Format requestedFormat return true; } -QString GeometryWidget::getGeometry(void) const +QString GeometryWidget::getGeometry() const { Geometry geometry; Geometry::Format format = getFormat(); @@ -140,7 +140,7 @@ bool GeometryWidget::setFormat(Geometry::Format format) return true; } -Geometry::Format GeometryWidget::getFormat(void) const +Geometry::Format GeometryWidget::getFormat() const { Geometry::Format format = static_cast(ui->geometryStackedWidget->currentIndex()); // Usage of '0' instead of a symbolic value is intentional. The currentIndex() should never be less than 0. diff --git a/mainwindow.cpp b/mainwindow.cpp index 199ac5a..5f02b6d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -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(GeometryGranularity::pixel) ); ui->geometrymode_granularity_group->setId(ui->geometrymode_block, static_cast(GeometryGranularity::block) ); @@ -155,7 +155,7 @@ void MainWindow::finishUiInitialisation(void) } // 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); langGroup->setExclusive(true); @@ -986,7 +986,7 @@ void MainWindow::on_actionPreferences_triggered() } } -void MainWindow::startColorsTxtAssistant(void) +void MainWindow::startColorsTxtAssistant() { ColorsTxtWizard *wizard = new ColorsTxtWizard(this); wizard->exec(); diff --git a/makecolors.cpp b/makecolors.cpp index 3d3749f..bbd5c53 100644 --- a/makecolors.cpp +++ b/makecolors.cpp @@ -196,7 +196,7 @@ bool MakeColors::writeColorsTxt(const QString &file) return true; } -void MakeColors::run(void) +void MakeColors::run() { parseNodesTxt(fileNodesTxt); emit maxProgressChanged(requiredColors.size()); @@ -213,7 +213,7 @@ void MakeColors::run(void) output("Done! :)",INFO); } -void MakeColors::startProcess(void) +void MakeColors::startProcess() { output("Starting...",VERBOSE); diff --git a/minetestmapperexe.cpp b/minetestmapperexe.cpp index ab6bc52..627ca51 100644 --- a/minetestmapperexe.cpp +++ b/minetestmapperexe.cpp @@ -173,7 +173,7 @@ bool MinetestMapperExe::initHelp() //this->options = options; return true; } -void MinetestMapperExe::readStandardOutput(void) +void MinetestMapperExe::readStandardOutput() { static const QRegularExpression re("([0-9]{1,3})(\\%)"); if(state == MappingStart || state == MappingProgress || state == MappingEnd) {