Modernize: remove redundant void

master
Unknown 2019-03-29 17:27:24 +01:00
parent a990d042ae
commit 9b7ce549de
8 changed files with 32 additions and 32 deletions

View File

@ -53,7 +53,7 @@ class TextureFoldersPage : public QWizardPage
public: public:
TextureFoldersPage(QWidget *parent = nullptr); TextureFoldersPage(QWidget *parent = nullptr);
bool isComplete(void) const; bool isComplete() const;
private slots: private slots:
void add(); void add();
void rem(); void rem();
@ -87,7 +87,7 @@ class ConclusionPage : public QWizardPage
public: public:
ConclusionPage(QWidget *parent = nullptr); ConclusionPage(QWidget *parent = nullptr);
bool isComplete(void) const override; bool isComplete() const override;
protected: protected:
void initializePage() override; void initializePage() override;

View File

@ -16,13 +16,13 @@ struct ConfigSettings
{ {
QString mapperPath; QString mapperPath;
static QStringList getMapperExecutables(void); static QStringList getMapperExecutables();
static QString getDefaultMapperExecutable(void); static QString getDefaultMapperExecutable();
static const QString defaultMapperExecutableName; static const QString defaultMapperExecutableName;
static QStringList predefinedMapperLocations; static QStringList predefinedMapperLocations;
private: private:
struct InitStatics { InitStatics(void); }; struct InitStatics { InitStatics(); };
static const InitStatics initStatics; static const InitStatics initStatics;
friend struct InitStatics; friend struct InitStatics;

View File

@ -44,12 +44,12 @@ public:
QObject(parent), geometry(geometry), color(color) { } QObject(parent), geometry(geometry), color(color) { }
//DrawMapFigure(const DrawMapFigure &f) {} //DrawMapFigure(const DrawMapFigure &f) {}
bool requiresPoint(void) const; bool requiresPoint() const;
bool requiresGeometry(void) const; bool requiresGeometry() const;
bool requiresText(void) const; bool requiresText() const;
QString getString(void) const; QString getString() const;
QStringList getSplittedString(void) const; QStringList getSplittedString() const;
bool getUseImageCoordinates() const; bool getUseImageCoordinates() const;
int getFigureIndex() const; int getFigureIndex() const;

View File

@ -38,8 +38,8 @@ public:
bool removeRows(int position, int count, const QModelIndex &parent = QModelIndex()) override; bool removeRows(int position, int count, const QModelIndex &parent = QModelIndex()) override;
bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override;
QStringList getStringList(void) const; QStringList getStringList() const;
QStringList getArguments(void) const; QStringList getArguments() const;
void insertStringList(const QStringList &other); void insertStringList(const QStringList &other);
private: private:

View File

@ -32,13 +32,13 @@ public:
int dimension[2]; int dimension[2];
int corner[2][2]; int corner[2][2];
Geometry(void) { setMax(); } Geometry() { setMax(); }
Geometry(const char *s) { set(s); } Geometry(const char *s) { set(s); }
Geometry(const QString &s) { set(s); } Geometry(const QString &s) { set(s); }
// Geometry(const Geometry &g); // Geometry(const Geometry &g);
Geometry::Format set(const QString &str); Geometry::Format set(const QString &str);
void setMax(void); void setMax();
void setCenterDimensions(int cx, int cy, int dx, int dy); void setCenterDimensions(int cx, int cy, int dx, int dy);
void setCornerDimensions(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); void setCorners(int c0x, int c0y, int c1x, int c1y);
@ -49,11 +49,11 @@ private:
static const QRegularExpression centerDimension; static const QRegularExpression centerDimension;
static const QRegularExpression cornerDimension; static const QRegularExpression cornerDimension;
static const QRegularExpression cornerDimensionAlternate; static const QRegularExpression cornerDimensionAlternate;
bool adjustCorners(void); bool adjustCorners();
void computeCorner0(void); void computeCorner0(void);
void computeCorner1(void); void computeCorner1();
void computeCenter(void); // Depends dimensions to be correct ! void computeCenter(void); // Depends dimensions to be correct !
void computeDimensions(void); void computeDimensions();
Format format = FormatNone; Format format = FormatNone;
}; };

View File

@ -24,13 +24,13 @@ public:
~GeometryWidget(); ~GeometryWidget();
bool set(const QString& geomStr, Geometry::Format format = Geometry::FormatUnknown); //{ return set(geomStr.toStdString().c_str(), format); } 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<Geometry::Format>(i)); } bool setFormat(int i) { return setFormat(static_cast<Geometry::Format>(i)); }
bool setFormat(Geometry::Format format); bool setFormat(Geometry::Format format);
bool setFormat(QString formatStr) { return setFormat(Geometry::formatId(formatStr)); } bool setFormat(QString formatStr) { return setFormat(Geometry::formatId(formatStr)); }
Geometry::Format getFormat(void) const; Geometry::Format getFormat() const;
QString getFormatStr(void) { return Geometry::formatName(getFormat()); } QString getFormatStr() { return Geometry::formatName(getFormat()); }
QString getGeometry(void) const; QString getGeometry() const;
private slots: private slots:
void on_geometryFormat_currentIndexChanged(int index); void on_geometryFormat_currentIndexChanged(int index);
@ -55,7 +55,7 @@ private:
QSpinBox *m_ui_C0D_dimension[2]; QSpinBox *m_ui_C0D_dimension[2];
QSpinBox *m_ui_C01_corner[2][2]; QSpinBox *m_ui_C01_corner[2][2];
signals: signals:
void editingFinished(void); void editingFinished();
}; };

View File

@ -73,7 +73,7 @@ private slots:
QString getOutputFileName(); QString getOutputFileName();
void on_button_generate_clicked(); void on_button_generate_clicked();
void readError(const QString &str); void readError(const QString &str);
void mapperInitialized(void); void mapperInitialized();
void mapperFinisched(int exit); void mapperFinisched(int exit);
void error(QProcess::ProcessError error); void error(QProcess::ProcessError error);
void createProfilesMenu(); void createProfilesMenu();
@ -149,10 +149,10 @@ private:
#endif #endif
ConfigSettings currentSettings; ConfigSettings currentSettings;
void finishUiInitialisation(void); void finishUiInitialisation();
// creates the language menu dynamically from the content of m_langPath // creates the language menu dynamically from the content of m_langPath
void createLanguageMenu(void); void createLanguageMenu();
Translator *translator; // contains the translations for this application Translator *translator; // contains the translations for this application
QString currentProfile; //contains the name of current loaded profile QString currentProfile; //contains the name of current loaded profile

View File

@ -39,18 +39,18 @@ public:
MappingEnd // Writing image... MappingEnd // Writing image...
}; };
QStringList getSupportedBackends(void) const; QStringList getSupportedBackends() const;
bool init(); bool init();
bool startMapping(const QStringList &arguments); bool startMapping(const QStringList &arguments);
bool isValid() const; bool isValid() const;
bool isMinetestMapper(void) const; bool isMinetestMapper() const;
QString getVersion(void) const; QString getVersion() const;
Tree getTree(void) const; Tree getTree() const;
QString getTreeString(void) const; QString getTreeString() const;
void setExecutableFile(const QString &program); void setExecutableFile(const QString &program);
QString getMinetestMapperExecutableFile() const; QString getMinetestMapperExecutableFile() const;
@ -88,8 +88,8 @@ public slots:
void cancel() const; void cancel() const;
private slots: private slots:
void finished(int exitCode, QProcess::ExitStatus exitStatus); void finished(int exitCode, QProcess::ExitStatus exitStatus);
void readStandardOutput(void); void readStandardOutput();
void readStandardError(void); void readStandardError();
void errorOccured(QProcess::ProcessError error); void errorOccured(QProcess::ProcessError error);
private: private:
void finishInitialization(void); void finishInitialization(void);