diff --git a/colorstxtwizard.h b/colorstxtwizard.h index 6314ebe..4d2f86a 100644 --- a/colorstxtwizard.h +++ b/colorstxtwizard.h @@ -53,7 +53,7 @@ class TextureFoldersPage : public QWizardPage public: TextureFoldersPage(QWidget *parent = nullptr); - bool isComplete(void) const; + bool isComplete() const; private slots: void add(); void rem(); @@ -87,7 +87,7 @@ class ConclusionPage : public QWizardPage public: ConclusionPage(QWidget *parent = nullptr); - bool isComplete(void) const override; + bool isComplete() const override; protected: void initializePage() override; diff --git a/configdialog.h b/configdialog.h index 9bd31b8..f2cad34 100644 --- a/configdialog.h +++ b/configdialog.h @@ -16,13 +16,13 @@ struct ConfigSettings { QString mapperPath; - static QStringList getMapperExecutables(void); - static QString getDefaultMapperExecutable(void); + static QStringList getMapperExecutables(); + static QString getDefaultMapperExecutable(); static const QString defaultMapperExecutableName; static QStringList predefinedMapperLocations; private: - struct InitStatics { InitStatics(void); }; + struct InitStatics { InitStatics(); }; static const InitStatics initStatics; friend struct InitStatics; diff --git a/drawmapfigure.h b/drawmapfigure.h index 7dad7a3..d124e8f 100644 --- a/drawmapfigure.h +++ b/drawmapfigure.h @@ -44,12 +44,12 @@ public: QObject(parent), geometry(geometry), color(color) { } //DrawMapFigure(const DrawMapFigure &f) {} - bool requiresPoint(void) const; - bool requiresGeometry(void) const; - bool requiresText(void) const; + bool requiresPoint() const; + bool requiresGeometry() const; + bool requiresText() const; - QString getString(void) const; - QStringList getSplittedString(void) const; + QString getString() const; + QStringList getSplittedString() const; bool getUseImageCoordinates() const; int getFigureIndex() const; diff --git a/drawmapfiguretablemodel.h b/drawmapfiguretablemodel.h index d12385d..d966f6b 100644 --- a/drawmapfiguretablemodel.h +++ b/drawmapfiguretablemodel.h @@ -38,8 +38,8 @@ public: bool removeRows(int position, int count, const QModelIndex &parent = QModelIndex()) override; bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; - QStringList getStringList(void) const; - QStringList getArguments(void) const; + QStringList getStringList() const; + QStringList getArguments() const; void insertStringList(const QStringList &other); private: diff --git a/geometry.h b/geometry.h index dd67faf..8bd70ab 100644 --- a/geometry.h +++ b/geometry.h @@ -32,13 +32,13 @@ public: int dimension[2]; int corner[2][2]; - Geometry(void) { setMax(); } + Geometry() { setMax(); } Geometry(const char *s) { set(s); } Geometry(const QString &s) { set(s); } // Geometry(const Geometry &g); Geometry::Format set(const QString &str); - void setMax(void); + void setMax(); void setCenterDimensions(int cx, int cy, int dx, int dy); void setCornerDimensions(int cx, int cy, int dx, int dy); void setCorners(int c0x, int c0y, int c1x, int c1y); @@ -49,11 +49,11 @@ private: static const QRegularExpression centerDimension; static const QRegularExpression cornerDimension; static const QRegularExpression cornerDimensionAlternate; - bool adjustCorners(void); + bool adjustCorners(); void computeCorner0(void); - void computeCorner1(void); + void computeCorner1(); void computeCenter(void); // Depends dimensions to be correct ! - void computeDimensions(void); + void computeDimensions(); Format format = FormatNone; }; diff --git a/geometrywidget.h b/geometrywidget.h index 79d47cc..858be2e 100644 --- a/geometrywidget.h +++ b/geometrywidget.h @@ -24,13 +24,13 @@ public: ~GeometryWidget(); bool set(const QString& geomStr, Geometry::Format format = Geometry::FormatUnknown); //{ return set(geomStr.toStdString().c_str(), format); } - bool setDefault(void) { return set(""); } + bool setDefault() { return set(""); } bool setFormat(int i) { return setFormat(static_cast(i)); } bool setFormat(Geometry::Format format); bool setFormat(QString formatStr) { return setFormat(Geometry::formatId(formatStr)); } - Geometry::Format getFormat(void) const; - QString getFormatStr(void) { return Geometry::formatName(getFormat()); } - QString getGeometry(void) const; + Geometry::Format getFormat() const; + QString getFormatStr() { return Geometry::formatName(getFormat()); } + QString getGeometry() const; private slots: void on_geometryFormat_currentIndexChanged(int index); @@ -55,7 +55,7 @@ private: QSpinBox *m_ui_C0D_dimension[2]; QSpinBox *m_ui_C01_corner[2][2]; signals: - void editingFinished(void); + void editingFinished(); }; diff --git a/mainwindow.h b/mainwindow.h index da2d128..0fda78c 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -73,7 +73,7 @@ private slots: QString getOutputFileName(); void on_button_generate_clicked(); void readError(const QString &str); - void mapperInitialized(void); + void mapperInitialized(); void mapperFinisched(int exit); void error(QProcess::ProcessError error); void createProfilesMenu(); @@ -149,10 +149,10 @@ private: #endif ConfigSettings currentSettings; - void finishUiInitialisation(void); + void finishUiInitialisation(); // creates the language menu dynamically from the content of m_langPath - void createLanguageMenu(void); + void createLanguageMenu(); Translator *translator; // contains the translations for this application QString currentProfile; //contains the name of current loaded profile diff --git a/minetestmapperexe.h b/minetestmapperexe.h index 89146b9..c5e1b1d 100644 --- a/minetestmapperexe.h +++ b/minetestmapperexe.h @@ -39,18 +39,18 @@ public: MappingEnd // Writing image... }; - QStringList getSupportedBackends(void) const; + QStringList getSupportedBackends() const; bool init(); bool startMapping(const QStringList &arguments); bool isValid() const; - bool isMinetestMapper(void) const; + bool isMinetestMapper() const; - QString getVersion(void) const; + QString getVersion() const; - Tree getTree(void) const; - QString getTreeString(void) const; + Tree getTree() const; + QString getTreeString() const; void setExecutableFile(const QString &program); QString getMinetestMapperExecutableFile() const; @@ -88,8 +88,8 @@ public slots: void cancel() const; private slots: void finished(int exitCode, QProcess::ExitStatus exitStatus); - void readStandardOutput(void); - void readStandardError(void); + void readStandardOutput(); + void readStandardError(); void errorOccured(QProcess::ProcessError error); private: void finishInitialization(void);