diff --git a/.clang-format b/.clang-format index 3fa41ba..2c120cc 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,3 @@ ---- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -2 @@ -90,10 +89,6 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left -RawStringFormats: - - Delimiter: pb - Language: TextProto - BasedOnStyle: google ReflowComments: true SortIncludes: true SortUsingDeclarations: true @@ -108,8 +103,7 @@ SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp11 +Standard: Auto TabWidth: 8 UseTab: Never -... diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 929ee2c..3460e10 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -163,7 +163,6 @@ void MainWindow::onActionEditSellerTriggered() setSaleModel(); updateStatLabel(); - } void MainWindow::setSaleModel() @@ -195,7 +194,6 @@ void MainWindow::onPaidButtonTriggered() ui_.sellerNoEdit->setFocus(); statusBar()->showMessage("Verkaufsvorgang erfolgreich durchgeführt.", STATUSBAR_TIMEOUT); updateStatLabel(); - } } @@ -445,7 +443,6 @@ void MainWindow::onImportSellerExcelActionTriggered() ExcelReader::readSellersFromFile(filePath, marketplace_.get()); updateStatLabel(); - } void MainWindow::onImportSellerJsonActionTriggered() @@ -468,7 +465,6 @@ void MainWindow::onImportSellerJsonActionTriggered() JsonUtil::importSellers(filePath, marketplace_.get()); updateStatLabel(); - } void MainWindow::onExportSellerJsonActionTriggered() @@ -488,8 +484,10 @@ void MainWindow::onExportSalesJsonActionTriggered() { QSettings settings; - auto filename = QFileDialog::getSaveFileName(this, "Umsätze/Transaktionen exportieren", - QString(), "JSON Dateien (*.json)"); + auto filename = QFileDialog::getSaveFileName( + this, "Umsätze/Transaktionen exportieren", + QString("kima2_umsaetze_kasse") + settings.value("global/cashPointNo").toString() + ".json", + "JSON Dateien (*.json)"); if (filename.isEmpty()) return; @@ -523,7 +521,6 @@ void MainWindow::onImportSalesJsonActionTriggered() } setSaleModel(); updateStatLabel(); - } void MainWindow::writeGeometry()