diff --git a/colorlineedit.h b/colorlineedit.h index 0a58318..c2b7bf0 100644 --- a/colorlineedit.h +++ b/colorlineedit.h @@ -9,7 +9,7 @@ class ColorLineEdit : public QLineEdit { Q_OBJECT public: - explicit ColorLineEdit(QWidget *parent = NULL); + explicit ColorLineEdit(QWidget *parent = nullptr); public slots: void selectColor(); diff --git a/colorstxtwizard.h b/colorstxtwizard.h index 0cebcf8..6314ebe 100644 --- a/colorstxtwizard.h +++ b/colorstxtwizard.h @@ -16,7 +16,7 @@ class ColorsTxtWizard : public QWizard Q_OBJECT public: - ColorsTxtWizard(QWidget *parent = 0); + ColorsTxtWizard(QWidget *parent = nullptr); void setNodesTxtFilePath(const QString &nodesTxtFilePath); }; @@ -25,7 +25,7 @@ class IntroPage : public QWizardPage Q_OBJECT public: - IntroPage(QWidget *parent = 0); + IntroPage(QWidget *parent = nullptr); private: QLabel *label; @@ -36,7 +36,7 @@ class NodesTxtPage : public QWizardPage Q_OBJECT public: - NodesTxtPage(QWidget *parent = 0); + NodesTxtPage(QWidget *parent = nullptr); private slots: void browse(); @@ -51,7 +51,7 @@ class TextureFoldersPage : public QWizardPage Q_OBJECT public: - TextureFoldersPage(QWidget *parent = 0); + TextureFoldersPage(QWidget *parent = nullptr); bool isComplete(void) const; private slots: @@ -71,7 +71,7 @@ class OutputFilePage : public QWizardPage Q_OBJECT public: - OutputFilePage(QWidget *parent = 0); + OutputFilePage(QWidget *parent = nullptr); private slots: void browse(); @@ -85,7 +85,7 @@ class ConclusionPage : public QWizardPage Q_OBJECT public: - ConclusionPage(QWidget *parent = 0); + ConclusionPage(QWidget *parent = nullptr); bool isComplete(void) const override; protected: diff --git a/configdialog.h b/configdialog.h index 3453996..9bd31b8 100644 --- a/configdialog.h +++ b/configdialog.h @@ -34,7 +34,7 @@ class ConfigDialog : public QDialog Q_OBJECT public: - explicit ConfigDialog(const ConfigSettings &settings, MainWindow *app, QWidget *parent = 0); + explicit ConfigDialog(const ConfigSettings &settings, MainWindow *app, QWidget *parent = nullptr); ~ConfigDialog(); ConfigSettings getSettings() const; diff --git a/drawmapfigure.h b/drawmapfigure.h index 5345b77..7dad7a3 100644 --- a/drawmapfigure.h +++ b/drawmapfigure.h @@ -26,21 +26,21 @@ public: }; Q_ENUM(Figure) - explicit DrawMapFigure(QObject *parent = 0); + explicit DrawMapFigure(QObject *parent = nullptr); /** * @brief DrawMapFigure * @param str QString to convert to DrawMapFigure * @param parent */ - explicit DrawMapFigure(const QString &str, QObject *parent = 0); + explicit DrawMapFigure(const QString &str, QObject *parent = nullptr); - explicit DrawMapFigure(QColor color, QObject *parent = 0) : + explicit DrawMapFigure(QColor color, QObject *parent = nullptr) : QObject(parent), color(color) { } - explicit DrawMapFigure(QPoint point, QColor color, QObject *parent = 0) : + explicit DrawMapFigure(QPoint point, QColor color, QObject *parent = nullptr) : QObject(parent), point(point), color(color) {} - explicit DrawMapFigure(Geometry *geometry, QColor color, QObject *parent = 0) : + explicit DrawMapFigure(Geometry *geometry, QColor color, QObject *parent = nullptr) : QObject(parent), geometry(geometry), color(color) { } //DrawMapFigure(const DrawMapFigure &f) {} diff --git a/drawmapfiguretablemodel.h b/drawmapfiguretablemodel.h index b9c88ce..d12385d 100644 --- a/drawmapfiguretablemodel.h +++ b/drawmapfiguretablemodel.h @@ -11,7 +11,7 @@ class DrawMapFigureTableModel : public QAbstractTableModel Q_OBJECT public: - explicit DrawMapFigureTableModel(QObject *parent = 0); + explicit DrawMapFigureTableModel(QObject *parent = nullptr); // Header: QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; diff --git a/figuredelegate.h b/figuredelegate.h index 30f42f0..783ffc5 100644 --- a/figuredelegate.h +++ b/figuredelegate.h @@ -15,7 +15,7 @@ class FigureDelegate : public QStyledItemDelegate Q_OBJECT public: - FigureDelegate(QObject *parent = 0); + FigureDelegate(QObject *parent = nullptr); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; diff --git a/geometrywidget.h b/geometrywidget.h index a76d3fe..79d47cc 100644 --- a/geometrywidget.h +++ b/geometrywidget.h @@ -20,7 +20,7 @@ class GeometryWidget : public QWidget Q_PROPERTY(QString geometry READ getGeometry WRITE set NOTIFY editingFinished USER true) public: - explicit GeometryWidget(QWidget *parent = 0); + explicit GeometryWidget(QWidget *parent = nullptr); ~GeometryWidget(); bool set(const QString& geomStr, Geometry::Format format = Geometry::FormatUnknown); //{ return set(geomStr.toStdString().c_str(), format); } diff --git a/mainwindow.h b/mainwindow.h index fb6d14d..da2d128 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -37,7 +37,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(Translator *translator, QWidget *parent = 0); + explicit MainWindow(Translator *translator, QWidget *parent = nullptr); ~MainWindow(); enum class GeometryGranularity { diff --git a/minetestmapperexe.h b/minetestmapperexe.h index dabfade..89146b9 100644 --- a/minetestmapperexe.h +++ b/minetestmapperexe.h @@ -19,7 +19,7 @@ class MinetestMapperExe : public QObject { Q_OBJECT public: - explicit MinetestMapperExe(const QString &program, QObject *parent = 0); + explicit MinetestMapperExe(const QString &program, QObject *parent = nullptr); enum Tree{ Unknown, diff --git a/translations/gui_de.ts b/translations/gui_de.ts index d1dbcf1..78c8a1c 100644 --- a/translations/gui_de.ts +++ b/translations/gui_de.ts @@ -1306,7 +1306,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + Cancel Abbrechen @@ -1339,7 +1339,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + About MinetestMapper Über MinetestMapper @@ -1383,7 +1383,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + New Profile Neues Profil @@ -1413,7 +1413,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + About MinetestMapper GUI Über MinetestMapperGUI @@ -1583,69 +1583,69 @@ Please make shure Minetest Mapper Gui can access to the file/directory - + Open Minetest World Minetest Welt-Ordner öffnen - + Save generated map to... Karte speichern nach... - + png image (*.png) png Grafik (*.png) - + Open HeightmapNodes File Öffne HeightmapNodes Datei - - - + + + TXT File (*.txt) TXT Datei (*.txt) - + Open HeightmapColors File Öffne Höhenkarte Farbdefinitionsdatei - + Open colors.txt File Öffne colors.txt Datei - + <h1>About MinetestMapperGUI</h1>The <b>MinetestMapper Gui</b> is written by addi.<br />It is licensed under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>.<br>The current version is %1. <br>The sourcecode is aviable on <a href='https://bitbucket.org/adrido/minetestmappergui/'>Bitbucket</a>.<br>You may also want to read the <a href='https://forum.minetest.net/viewtopic.php?f=14&t=12139'>Minetest forum thread</a>.<br><br><b>Thanks to:</b><br>McKrustenkaese for his great icon - + <h1>About MinetestMapper</h1>The <b>MinetestMapper</b> is written by:<br>Miroslav Bendík <miroslav.bendik@gmail.com><br>ShadowNinja <shadowninja@minetest.net><br>sfan5 <sfan5@live.de><br>Rogier <rogier777@gmail.com><br><br><u>Version:</u> %1 (%2)<br><u>License:</u> LGPLv2.1+ and BSD 2-clause.<br><u>Source Code:</u> <a href='https://github.com/Rogier-5/minetest-mapper-cpp'>Github</a><br> - + map center - + map origin (top left) - + Create a colors.txt Erstelle eine colors.txt Datei - + There is a nodes.txt but no colors.txt in the world directory Do you want to generate one? If you select 'No' the default colors.txt will be used. @@ -1654,34 +1654,34 @@ Möchtest du eine erstellen? Wenn du auf 'Nein' clickst, wird eine standard colors.txt Datei verwendet. - + No colors.txt file Keine colors.txt Datei - + ERROR: Still no colors.txt file found inside world directory. Do you want to cancel or proceed with default colors.txt file? - + Proceed with default Mit standard Datei fortfahren - + Could not open Terminal - + Error: Could not open scriptfile (%1) for Terminal - + Open Directory @@ -1716,12 +1716,12 @@ Bitte erneut eine gültige minetestmapper Anwendung auswählen. (Bearbeiten-> Möchten Sie die Einstellungen jetzt öffnen? - + preview: %1 Vorschau: %1 - + Name of the new Profile: Name des Neuen Profils: diff --git a/translations/gui_en.ts b/translations/gui_en.ts index e648722..c9f5c6f 100644 --- a/translations/gui_en.ts +++ b/translations/gui_en.ts @@ -994,7 +994,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + Cancel @@ -1052,7 +1052,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + About MinetestMapper @@ -1088,7 +1088,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + About MinetestMapper GUI @@ -1139,7 +1139,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati - + New Profile @@ -1315,113 +1315,113 @@ Please make shure Minetest Mapper Gui can access to the file/directory - + Open Minetest World - + Save generated map to... - + png image (*.png) - + Open HeightmapNodes File - - - + + + TXT File (*.txt) - + Open HeightmapColors File - + Open colors.txt File - + <h1>About MinetestMapperGUI</h1>The <b>MinetestMapper Gui</b> is written by addi.<br />It is licensed under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>.<br>The current version is %1. <br>The sourcecode is aviable on <a href='https://bitbucket.org/adrido/minetestmappergui/'>Bitbucket</a>.<br>You may also want to read the <a href='https://forum.minetest.net/viewtopic.php?f=14&t=12139'>Minetest forum thread</a>.<br><br><b>Thanks to:</b><br>McKrustenkaese for his great icon - + <h1>About MinetestMapper</h1>The <b>MinetestMapper</b> is written by:<br>Miroslav Bendík <miroslav.bendik@gmail.com><br>ShadowNinja <shadowninja@minetest.net><br>sfan5 <sfan5@live.de><br>Rogier <rogier777@gmail.com><br><br><u>Version:</u> %1 (%2)<br><u>License:</u> LGPLv2.1+ and BSD 2-clause.<br><u>Source Code:</u> <a href='https://github.com/Rogier-5/minetest-mapper-cpp'>Github</a><br> - + map center - + map origin (top left) - + Create a colors.txt - + There is a nodes.txt but no colors.txt in the world directory Do you want to generate one? If you select 'No' the default colors.txt will be used. - + No colors.txt file - + ERROR: Still no colors.txt file found inside world directory. Do you want to cancel or proceed with default colors.txt file? - + Proceed with default - + Could not open Terminal - + Error: Could not open scriptfile (%1) for Terminal - + Open Directory - + preview: %1 - + Name of the new Profile: