complete clang-format, no content change

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
GCarneiroA · Apr 19, 2020 · f1b0ab8 · f1b0ab8
1 parent 52c9236
commit f1b0ab8
Show file tree

Hide file tree

Showing 129 changed files with 6,511 additions and 6,302 deletions.
diff --git a/openhantek/.clang-format b/openhantek/.clang-format
@@ -9,18 +9,18 @@ AlignEscapedNewlinesLeft: false
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: false
 BinPackArguments: true
 BinPackParameters: true
-BraceWrapping:   
+BraceWrapping:
   AfterClass:      false
   AfterControlStatement: false
   AfterEnum:       false
@@ -64,7 +64,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
+MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
@@ -86,8 +86,8 @@ SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
+SpacesInParentheses: true
+SpacesInSquareBrackets: true
 Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never

diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h
@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20200414 build 642"
+#define OH_BUILD "20200419 build 644"
diff --git a/openhantek/src/OH_VERSION.h b/openhantek/src/OH_VERSION.h
@@ -4,13 +4,13 @@
 #define OH_VERSION "3.0.4b"
 
 
-# ifdef OH_VERSION
-#   undef VERSION
-#   define VERSION OH_VERSION
-# else
-#   include "OH_BUILD.h"
-#   ifdef OH_BUILD
-#     undef VERSION
-#     define VERSION OH_BUILD
-#   endif
-# endif
+#ifdef OH_VERSION
+#undef VERSION
+#define VERSION OH_VERSION
+#else
+#include "OH_BUILD.h"
+#ifdef OH_BUILD
+#undef VERSION
+#define VERSION OH_BUILD
+#endif
+#endif
diff --git a/openhantek/src/configdialog/DsoConfigAnalysisPage.cpp b/openhantek/src/configdialog/DsoConfigAnalysisPage.cpp
@@ -2,64 +2,66 @@
 
 #include "DsoConfigAnalysisPage.h"
 
-DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings, QWidget *parent)
-    : QWidget(parent), settings(settings) {
+DsoConfigAnalysisPage::DsoConfigAnalysisPage( DsoSettings *settings, QWidget *parent )
+    : QWidget( parent ), settings( settings ) {
     // Initialize lists for comboboxes
     QStringList windowFunctionStrings;
-    windowFunctionStrings << tr("Rectangular") << tr("Hamming") << tr("Hann") << tr("Cosine") << tr("Lanczos")
-                          << tr("Bartlett") << tr("Triangular") << tr("Gauss") << tr("Bartlett-Hann") << tr("Blackman")
+    windowFunctionStrings << tr( "Rectangular" ) << tr( "Hamming" ) << tr( "Hann" ) << tr( "Cosine" ) << tr( "Lanczos" )
+                          << tr( "Bartlett" ) << tr( "Triangular" ) << tr( "Gauss" ) << tr( "Bartlett-Hann" )
+                          << tr( "Blackman" )
                           //<< tr("Kaiser")
-                          << tr("Nuttall") << tr("Blackman-Harris") << tr("Blackman-Nuttall") << tr("Flat top");
+                          << tr( "Nuttall" ) << tr( "Blackman-Harris" ) << tr( "Blackman-Nuttall" ) << tr( "Flat top" );
 
     // Initialize elements
-    windowFunctionLabel = new QLabel(tr("<b>Window function</b>"));
+    windowFunctionLabel = new QLabel( tr( "<b>Window function</b>" ) );
     windowFunctionComboBox = new QComboBox();
-    windowFunctionComboBox->addItems(windowFunctionStrings);
-    windowFunctionComboBox->setCurrentIndex(int(settings->post.spectrumWindow));
+    windowFunctionComboBox->addItems( windowFunctionStrings );
+    windowFunctionComboBox->setCurrentIndex( int( settings->post.spectrumWindow ) );
 
-    referenceLevelLabel = new QLabel(tr("<b>Reference level</b><br/>0 dBu = -2.2 dBV<br/>0 dBm (@600 &Omega;) = -2.2 dBV<br/>0 dBm (@50 &Omega;) = -13 dBV"));
+    referenceLevelLabel = new QLabel( tr( "<b>Reference level</b><br/>0 dBu = -2.2 dBV<br/>0 dBm (@600 &Omega;) = -2.2 "
+                                          "dBV<br/>0 dBm (@50 &Omega;) = -13 dBV" ) );
     referenceLevelSpinBox = new QDoubleSpinBox();
-    referenceLevelSpinBox->setDecimals(1);
-    referenceLevelSpinBox->setMinimum(-100.0);
-    referenceLevelSpinBox->setMaximum(100.0);
-    referenceLevelSpinBox->setValue(settings->post.spectrumReference);
-    referenceLevelUnitLabel = new QLabel(tr("dBV"));
+    referenceLevelSpinBox->setDecimals( 1 );
+    referenceLevelSpinBox->setMinimum( -100.0 );
+    referenceLevelSpinBox->setMaximum( 100.0 );
+    referenceLevelSpinBox->setValue( settings->post.spectrumReference );
+    referenceLevelUnitLabel = new QLabel( tr( "dBV" ) );
     referenceLevelLayout = new QHBoxLayout();
-    referenceLevelLayout->addWidget(referenceLevelSpinBox);
-    referenceLevelLayout->addWidget(referenceLevelUnitLabel);
+    referenceLevelLayout->addWidget( referenceLevelSpinBox );
+    referenceLevelLayout->addWidget( referenceLevelUnitLabel );
 
-    minimumMagnitudeLabel = new QLabel(tr("<b>Minimum magnitude</b>"));
+    minimumMagnitudeLabel = new QLabel( tr( "<b>Minimum magnitude</b>" ) );
     minimumMagnitudeSpinBox = new QDoubleSpinBox();
-    minimumMagnitudeSpinBox->setDecimals(1);
-    minimumMagnitudeSpinBox->setMinimum(-100.0);
-    minimumMagnitudeSpinBox->setMaximum(100.0);
-    minimumMagnitudeSpinBox->setValue(settings->post.spectrumLimit);
-    minimumMagnitudeUnitLabel = new QLabel(tr("dBV"));
+    minimumMagnitudeSpinBox->setDecimals( 1 );
+    minimumMagnitudeSpinBox->setMinimum( -100.0 );
+    minimumMagnitudeSpinBox->setMaximum( 100.0 );
+    minimumMagnitudeSpinBox->setValue( settings->post.spectrumLimit );
+    minimumMagnitudeUnitLabel = new QLabel( tr( "dBV" ) );
     minimumMagnitudeLayout = new QHBoxLayout();
-    minimumMagnitudeLayout->addWidget(minimumMagnitudeSpinBox);
-    minimumMagnitudeLayout->addWidget(minimumMagnitudeUnitLabel);
+    minimumMagnitudeLayout->addWidget( minimumMagnitudeSpinBox );
+    minimumMagnitudeLayout->addWidget( minimumMagnitudeUnitLabel );
 
     spectrumLayout = new QGridLayout();
-    spectrumLayout->addWidget(windowFunctionLabel, 0, 0);
-    spectrumLayout->addWidget(windowFunctionComboBox, 0, 1);
-    spectrumLayout->addWidget(referenceLevelLabel, 1, 0);
-    spectrumLayout->addLayout(referenceLevelLayout, 1, 1);
-    spectrumLayout->addWidget(minimumMagnitudeLabel, 2, 0);
-    spectrumLayout->addLayout(minimumMagnitudeLayout, 2, 1);
+    spectrumLayout->addWidget( windowFunctionLabel, 0, 0 );
+    spectrumLayout->addWidget( windowFunctionComboBox, 0, 1 );
+    spectrumLayout->addWidget( referenceLevelLabel, 1, 0 );
+    spectrumLayout->addLayout( referenceLevelLayout, 1, 1 );
+    spectrumLayout->addWidget( minimumMagnitudeLabel, 2, 0 );
+    spectrumLayout->addLayout( minimumMagnitudeLayout, 2, 1 );
 
-    spectrumGroup = new QGroupBox(tr("Spectrum"));
-    spectrumGroup->setLayout(spectrumLayout);
+    spectrumGroup = new QGroupBox( tr( "Spectrum" ) );
+    spectrumGroup->setLayout( spectrumLayout );
 
     mainLayout = new QVBoxLayout();
-    mainLayout->addWidget(spectrumGroup);
-    mainLayout->addStretch(1);
+    mainLayout->addWidget( spectrumGroup );
+    mainLayout->addStretch( 1 );
 
-    setLayout(mainLayout);
+    setLayout( mainLayout );
 }
 
 /// \brief Saves the new settings.
 void DsoConfigAnalysisPage::saveSettings() {
-    settings->post.spectrumWindow = Dso::WindowFunction(windowFunctionComboBox->currentIndex());
+    settings->post.spectrumWindow = Dso::WindowFunction( windowFunctionComboBox->currentIndex() );
     settings->post.spectrumReference = referenceLevelSpinBox->value();
     settings->post.spectrumLimit = minimumMagnitudeSpinBox->value();
 }
diff --git a/openhantek/src/configdialog/DsoConfigAnalysisPage.h b/openhantek/src/configdialog/DsoConfigAnalysisPage.h
@@ -21,7 +21,7 @@ class DsoConfigAnalysisPage : public QWidget {
     Q_OBJECT
 
   public:
-    DsoConfigAnalysisPage(DsoSettings *settings, QWidget *parent = nullptr);
+    DsoConfigAnalysisPage( DsoSettings *settings, QWidget *parent = nullptr );
 
   public slots:
     void saveSettings();