source code format, ui update and german update

- disabled "SortIncludes" in .clang-format would be good to have a universal solution for the sorting of header file includes, something like this: http://www.ostricher.com/2014/11/sort- your-include-files/ - also changed codeStyleCheck.php checkClang() to use a temporary file for clang changes (previous cli argument method did not work properly diue to escaping issues on some rare occasions)
buddhi1980 · Nov 10, 2016 · f1786b2 · f1786b2
1 parent 0440f41
commit f1786b2
Show file tree

Hide file tree

Showing 69 changed files with 1,003 additions and 718 deletions.
diff --git a/.clang-format b/.clang-format
@@ -61,4 +61,5 @@ CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
+SortIncludes: false
 ...
diff --git a/mandelbulber2/language/de.qm b/mandelbulber2/language/de.qm
diff --git a/mandelbulber2/language/de.ts b/mandelbulber2/language/de.ts
diff --git a/mandelbulber2/qt/common_my_widget_wrapper.h b/mandelbulber2/qt/common_my_widget_wrapper.h
@@ -47,7 +47,7 @@
 #include <QtCore>
 #include <QtGui>
 
-//forward declarations
+// forward declarations
 class cParameterContainer;
 
 class CommonMyWidgetWrapper

diff --git a/mandelbulber2/qt/dock_animation.h b/mandelbulber2/qt/dock_animation.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_effects.h b/mandelbulber2/qt/dock_effects.h
@@ -39,7 +39,7 @@
 
 #include "../src/parameters.hpp"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_fractal.h b/mandelbulber2/qt/dock_fractal.h
@@ -43,7 +43,7 @@
 #include "../src/synchronize_interface.hpp"
 #include "tab_fractal.h"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_gamepad.h b/mandelbulber2/qt/dock_gamepad.h
@@ -41,7 +41,7 @@
 #include <QtGamepad/qgamepad.h>
 #endif // USE_GAMEPAD
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_image_adjustmnets.h b/mandelbulber2/qt/dock_image_adjustmnets.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_measurements.h b/mandelbulber2/qt/dock_measurements.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_navigation.h b/mandelbulber2/qt/dock_navigation.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_queue.h b/mandelbulber2/qt/dock_queue.h
@@ -41,7 +41,7 @@
 #include "../qt/my_progress_bar.h"
 #include "../src/rendered_image_widget.hpp"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_rendering_engine.h b/mandelbulber2/qt/dock_rendering_engine.h
@@ -39,7 +39,7 @@
 
 #include "../src/parameters.hpp"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/dock_statistics.h b/mandelbulber2/qt/dock_statistics.h
@@ -39,7 +39,7 @@
 
 #include "../src/statistics.h"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/image_save_dialog.h b/mandelbulber2/qt/image_save_dialog.h
@@ -43,7 +43,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/material_editor.h b/mandelbulber2/qt/material_editor.h
@@ -39,7 +39,7 @@
 
 #include "../src/color_palette.hpp"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 class cParameterContainer;
 

diff --git a/mandelbulber2/qt/material_manager_view.h b/mandelbulber2/qt/material_manager_view.h
@@ -42,7 +42,7 @@
 
 #include <QWidget>
 
-//forward declarations
+// forward declarations
 class cMaterialItemModel;
 class cMaterialItemView;
 

diff --git a/mandelbulber2/qt/material_selector.h b/mandelbulber2/qt/material_selector.h
@@ -41,7 +41,7 @@
 
 #include "common_my_widget_wrapper.h"
 
-//forward declarations
+// forward declarations
 class cMaterialWidget;
 
 class cMaterialSelector : public QWidget, public CommonMyWidgetWrapper

diff --git a/mandelbulber2/qt/player_widget.hpp b/mandelbulber2/qt/player_widget.hpp
@@ -41,7 +41,7 @@
 #include <QWidget>
 #include <QtWidgets>
 
-//forward declarations
+// forward declarations
 class MyDoubleSpinBox;
 
 class PlayerWidget : public QWidget

diff --git a/mandelbulber2/qt/preferences_dialog.h b/mandelbulber2/qt/preferences_dialog.h
@@ -37,7 +37,7 @@
 
 #include <QDialog>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 
 namespace Ui

diff --git a/mandelbulber2/qt/preview_file_dialog.h b/mandelbulber2/qt/preview_file_dialog.h
@@ -41,7 +41,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-//forward declarations
+// forward declarations
 class cThumbnailWidget;
 class MyProgressBar;
 

diff --git a/mandelbulber2/qt/system_tray.hpp b/mandelbulber2/qt/system_tray.hpp
@@ -40,7 +40,7 @@
 #include <QAction>
 #include <QSystemTrayIcon>
 
-//forward declarations
+// forward declarations
 class cImage;
 
 class cSystemTray : public QObject

diff --git a/mandelbulber2/qt/tab_fractal.h b/mandelbulber2/qt/tab_fractal.h
@@ -42,7 +42,7 @@
 
 #include "../src/synchronize_interface.hpp"
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 class cParameterContainer;
 

diff --git a/mandelbulber2/qt/thumbnail_widget.h b/mandelbulber2/qt/thumbnail_widget.h
@@ -44,7 +44,7 @@
 #include <qprogressbar.h>
 #include <QElapsedTimer>
 
-//forward declarations
+// forward declarations
 class cParameterContainer;
 class cFractalContainer;
 class cImage;

diff --git a/mandelbulber2/qt/voxel_export_dialog.h b/mandelbulber2/qt/voxel_export_dialog.h
@@ -37,7 +37,7 @@
 
 #include <QDialog>
 
-//forward declarations
+// forward declarations
 class cAutomatedWidgets;
 class cVoxelExport;
 

diff --git a/mandelbulber2/qt_data/fractal_menger_prism_shape2.ui b/mandelbulber2/qt_data/fractal_menger_prism_shape2.ui
@@ -4364,8 +4364,7 @@
     t &lt;span style=&quot;color:#d0d0d0&quot;&gt;=&lt;/span&gt; &lt;span style=&quot;color:#e47eed&quot;&gt;max&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;&lt;span style=&quot;color:#87df71&quot;&gt;0.0&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;,&lt;/span&gt; dot1&lt;span style=&quot;color:#d0d0d0&quot;&gt;);&lt;/span&gt;
     &lt;span style=&quot;color:#7ec0ee; font-weight:bold&quot;&gt;if&lt;/span&gt; &lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;functionEnabledBxFalse&lt;span style=&quot;color:#d0d0d0&quot;&gt;)&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;{&lt;/span&gt;
-      z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;-=&lt;/span&gt; t &lt;span style=&quot;color:#d0d0d0&quot;&gt;* -&lt;/span&gt;SQRT_3
-             &lt;span style=&quot;color:#d0d0d0&quot;&gt;- (&lt;/span&gt;fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;offset0&lt;span style=&quot;color:#d0d0d0&quot;&gt;);&lt;/span&gt; &lt;span style=&quot;color:#d0d0a0&quot;&gt;// z.x moves pos dir       (0.5 * SQRT_3_4)&lt;/span&gt;
+      z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;-=&lt;/span&gt; t &lt;span style=&quot;color:#d0d0d0&quot;&gt;* -&lt;/span&gt;SQRT_3 &lt;span style=&quot;color:#d0d0d0&quot;&gt;- (&lt;/span&gt;fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;offset0&lt;span style=&quot;color:#d0d0d0&quot;&gt;);&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;}&lt;/span&gt;
     &lt;span style=&quot;color:#7ec0ee; font-weight:bold&quot;&gt;else&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;{&lt;/span&gt;
@@ -4423,7 +4422,7 @@
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;{&lt;/span&gt;
       z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;=&lt;/span&gt; &lt;span style=&quot;color:#e47eed&quot;&gt;fabs&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x&lt;span style=&quot;color:#d0d0d0&quot;&gt;);&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;}&lt;/span&gt;
-    dot1 &lt;span style=&quot;color:#d0d0d0&quot;&gt;=&lt;/span&gt; z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;* -&lt;/span&gt;SQRT_3_4 &lt;span style=&quot;color:#d0d0d0&quot;&gt;+&lt;/span&gt; z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;y &lt;span style=&quot;color:#d0d0d0&quot;&gt;*&lt;/span&gt; &lt;span style=&quot;color:#87df71&quot;&gt;0.5&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
+    dot1 &lt;span style=&quot;color:#d0d0d0&quot;&gt;= (&lt;/span&gt;z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;* -&lt;/span&gt;SQRT_3_4 &lt;span style=&quot;color:#d0d0d0&quot;&gt;+&lt;/span&gt; z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;y &lt;span style=&quot;color:#d0d0d0&quot;&gt;*&lt;/span&gt; &lt;span style=&quot;color:#87df71&quot;&gt;0.5&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;) *&lt;/span&gt; fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;scaleD1&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
     &lt;span style=&quot;color:#f09479; font-weight:bold&quot;&gt;double&lt;/span&gt; t &lt;span style=&quot;color:#d0d0d0&quot;&gt;=&lt;/span&gt; &lt;span style=&quot;color:#e47eed&quot;&gt;max&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;&lt;span style=&quot;color:#87df71&quot;&gt;0.0&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;,&lt;/span&gt; dot1&lt;span style=&quot;color:#d0d0d0&quot;&gt;);&lt;/span&gt;
     z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;-=&lt;/span&gt; t &lt;span style=&quot;color:#d0d0d0&quot;&gt;* -&lt;/span&gt;SQRT_3&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
     &lt;span style=&quot;color:#7ec0ee; font-weight:bold&quot;&gt;if&lt;/span&gt; &lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;functionEnabledBzFalse&lt;span style=&quot;color:#d0d0d0&quot;&gt;)&lt;/span&gt;
@@ -4453,15 +4452,14 @@
     z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;z &lt;span style=&quot;color:#d0d0d0&quot;&gt;-=&lt;/span&gt; dz&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
     z &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;scaleA3&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
     aux&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;DE &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;scaleA3&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
-    dd &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; &lt;span style=&quot;color:#87df71&quot;&gt;0.33333333333333333333333333333333&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
-
     z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;y &lt;span style=&quot;color:#d0d0d0&quot;&gt;+=&lt;/span&gt; dy&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
     z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;z &lt;span style=&quot;color:#d0d0d0&quot;&gt;+=&lt;/span&gt; dz&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
-
     z&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;x &lt;span style=&quot;color:#d0d0d0&quot;&gt;+=&lt;/span&gt; SQRT_3_4&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
+
     &lt;span style=&quot;color:#7ec0ee; font-weight:bold&quot;&gt;if&lt;/span&gt; &lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;functionEnabledFalse&lt;span style=&quot;color:#d0d0d0&quot;&gt;)&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;{&lt;/span&gt;
-      z &lt;span style=&quot;color:#d0d0d0&quot;&gt;=&lt;/span&gt; dd &lt;span style=&quot;color:#d0d0d0&quot;&gt;*&lt;/span&gt; z&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
+      dd &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; &lt;span style=&quot;color:#87df71&quot;&gt;0.33333333333333333333333333333&lt;/span&gt; &lt;span style=&quot;color:#d0d0d0&quot;&gt;*&lt;/span&gt; fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;scaleE1&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
+      z &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; dd&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
       aux&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;DE &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; dd&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;}&lt;/span&gt;
     aux&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;DE &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;offset1&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt; &lt;span style=&quot;color:#d0d0a0&quot;&gt;//.DE tweak cross menger part&lt;/span&gt;
@@ -4508,7 +4506,7 @@
     z &lt;span style=&quot;color:#d0d0d0&quot;&gt;+=&lt;/span&gt; &lt;span style=&quot;color:#e47eed&quot;&gt;CVector3&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;&lt;span style=&quot;color:#87df71&quot;&gt;0.5&lt;/span&gt; &lt;span style=&quot;color:#d0d0d0&quot;&gt;*&lt;/span&gt; SQRT_3&lt;span style=&quot;color:#d0d0d0&quot;&gt;,&lt;/span&gt; &lt;span style=&quot;color:#87df71&quot;&gt;1.5&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;,&lt;/span&gt; &lt;span style=&quot;color:#87df71&quot;&gt;1.5&lt;/span&gt;&lt;span style=&quot;color:#d0d0d0&quot;&gt;);&lt;/span&gt;
     &lt;span style=&quot;color:#7ec0ee; font-weight:bold&quot;&gt;if&lt;/span&gt; &lt;span style=&quot;color:#d0d0d0&quot;&gt;(&lt;/span&gt;fractal&lt;span style=&quot;color:#d0d0d0&quot;&gt;-&amp;gt;&lt;/span&gt;transformCommon&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;functionEnabledxFalse&lt;span style=&quot;color:#d0d0d0&quot;&gt;)&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;{&lt;/span&gt;
-      z &lt;span style=&quot;color:#d0d0d0&quot;&gt;=&lt;/span&gt; dd &lt;span style=&quot;color:#d0d0d0&quot;&gt;*&lt;/span&gt; z&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
+      z &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; dd&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt;
       aux&lt;span style=&quot;color:#d0d0d0&quot;&gt;.&lt;/span&gt;DE &lt;span style=&quot;color:#d0d0d0&quot;&gt;*=&lt;/span&gt; dd&lt;span style=&quot;color:#d0d0d0&quot;&gt;;&lt;/span&gt; &lt;span style=&quot;color:#d0d0a0&quot;&gt;// * s;&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0d0&quot;&gt;}&lt;/span&gt;
     &lt;span style=&quot;color:#d0d0a0&quot;&gt;// gap2 = dd * gap2;&lt;/span&gt;