Update Astyle config and format sources

Author: u-235

addons/src/bhc/bhcdialog.cpp

@@ -306,7 +306,7 @@ void BHCDialog::computeButtonClicked()
 			yItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
 
 			QTableWidgetItem* hdr = new QTableWidgetItem(Utils::removeZeros(QString("%1 - %2 ").arg(i + 1).arg(ang,
-			    0, 'f', 3)));
+			        0, 'f', 3)));
 			tab->resultTable->setVerticalHeaderItem(i, hdr);
 			tab->resultTable->setItem(i, 0, xItem);
 			tab->resultTable->setItem(i, 1, yItem);

addons/src/i2mprog/utils-i2mprog.cpp

@@ -32,7 +32,7 @@ int Utils::i2mprog(QString tx, const QString& addr, bool toInch, int prec)
 
 	regex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
 	regex.setPattern(
-	         QString("[%1]{1,1}([+-]?\\d*\\.?\\d*)|\\([^\\n\\r]*\\)|\'[^\\n\\r]*\'|;[^\\n\\r]*$").arg(addr));
+	    QString("[%1]{1,1}([+-]?\\d*\\.?\\d*)|\\([^\\n\\r]*\\)|\'[^\\n\\r]*\'|;[^\\n\\r]*$").arg(addr));
 	auto match = regex.match(tx);
 
 	while (match.hasMatch()) {

gcodefileserver/gcodefileserver.cpp

@@ -183,7 +183,7 @@ void GCodeFileServer::loadSettings()
 SerialTransmissionDialog* GCodeFileServer::createSerialPortServer(QString __config)
 {
 	SerialTransmissionDialog* spServer = new SerialTransmissionDialog(this, Qt::SubWindow,
-	    true);  // Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint
+	        true);  // Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint
 	spServer->setAttribute(Qt::WA_DeleteOnClose);
 	ui->mdiArea->addSubWindow(spServer);
 
@@ -324,7 +324,7 @@ void GCodeFileServer::createActions()
 void GCodeFileServer::serialConfig()
 {
 	SerialPortConfigDialog* serialConfigDialog = new SerialPortConfigDialog(this,
-	    configBox->currentText());
+	        configBox->currentText());
 
 	if (serialConfigDialog->exec() == QDialog::Accepted) {
 		loadSerialConfignames();

gcodeshared/include/version.h

@@ -21,7 +21,7 @@
 #define VERSION_H
 
 #ifndef GCODEWORKSHOP_VERSION
-    #define GCODEWORKSHOP_VERSION "2024.10"
+	#define GCODEWORKSHOP_VERSION "2024.10"
 #endif
 
 #endif // VERSION_H

gcodeshared/serialporttestdialog.cpp

@@ -359,7 +359,7 @@ void SerialPortTestDialog::updateLeds()
 void SerialPortTestDialog::configButtonClicked()
 {
 	SerialPortConfigDialog* serialConfigDialog = new SerialPortConfigDialog(this,
-	    configBox->currentText());
+	        configBox->currentText());
 
 	if (serialConfigDialog->exec() == QDialog::Accepted) {
 		changeSettings();

gcodeshared/serialtransmissiondialog.cpp

@@ -523,8 +523,6 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes)
 //        serialPortReadBuffer.append(buf);
 
 
-
-
 //        setLabelText(tr("Receiving byte %1").arg(serialPortReadBuffer.size() - 1));
 
 //        //qDebug() << "Data read" << buff << "xoffReceived" << xoffReceived;
@@ -1339,7 +1337,7 @@ void SerialTransmissionDialog::fileServerProcessData()
 
 					if (!fileName.isEmpty()) {
 						path = portSettings.searchPath1 + "/" + fileName + (ext.isEmpty() ? portSettings.searchExt1 :
-						       ext);
+						        ext);
 						fileInfo.setFile(path);
 
 						if (!fileInfo.exists()) {
@@ -1348,7 +1346,7 @@ void SerialTransmissionDialog::fileServerProcessData()
 							}
 
 							path = portSettings.searchPath2 + "/" + fileName + (ext.isEmpty() ? portSettings.searchExt2 :
-							       ext);
+							        ext);
 							fileInfo.setFile(path);
 
 							if (!fileInfo.exists()) {
@@ -1357,7 +1355,7 @@ void SerialTransmissionDialog::fileServerProcessData()
 								}
 
 								path = portSettings.searchPath3 + "/" + fileName + (ext.isEmpty() ? portSettings.searchExt3 :
-								       ext);
+								        ext);
 								fileInfo.setFile(path);
 
 								if (!fileInfo.exists()) {

gcodeworkshop/src/findinf.cpp

@@ -356,7 +356,7 @@ bool FindInFiles::findFiles(const QString startDir, QString mainDir, bool notFou
 				}
 
 				QTableWidgetItem* fileNameItem = new QTableWidgetItem(QDir::toNativeSeparators(
-				        subDir) + files[i]);
+				            subDir) + files[i]);
 				fileNameItem->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
 
 				QTableWidgetItem* infoNameItem = new QTableWidgetItem(comment_tx);

gcodeworkshop/src/highlighter.cpp

@@ -1731,7 +1731,6 @@ void Highlighter::highlightBlockToolTipsRule(const QString& tx)
 	highlightRules.append(ruleP);
 
 
-
 	keywordFormat.setForeground(QColor(highlightColors.mColor));
 	keywordFormat.setFontWeight(QFont::Normal);
 	ruleP.pattern = QRegularExpression("(<b>|<i>)[a-zA-Z0-9_.@=\\[\\]\\s]{1,30}(</b>|</i>)");

tools/astyle.cfg

@@ -1,6 +1,9 @@
-# astyle version 3.1
-# astyle  --project=tools/astyle.cfg -r -I 'src/*.cpp' 'src/*.h'
+# astyle version 3.4
+# astyle  --project=tools/astyle.cfg -r -I '*.cpp' '*.h'
 
+--style=kr
+
+--squeeze-lines=2
 --max-code-length=120
 
 # Indents
@@ -11,7 +14,6 @@
 --indent-preproc-define
 
 # Brace Style Options
---style=kr
 --attach-namespaces
 --attach-closing-while      # not present in astyle v2.5
 --break-one-line-headers    # not present in astyle v2.5
@@ -31,3 +33,14 @@
 --align-reference=type
 
 --suffix=none
+
+--ignore-exclude-errors-x
+--exclude=3rdparty
+--exclude=bin
+--exclude=build
+--exclude=doc
+--exclude=examples
+--exclude=install
+--exclude=lang
+--exclude=template
+--exclude=tools