Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply clang-format and cmake-format

This commit is contained in:
Martchus 2021-08-22 00:05:07 +02:00
parent 6684f1b627
commit 54e21607df
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -24,13 +24,8 @@ set(SRC_FILES cli/cli.cpp main.cpp)
set(GUI_HEADER_FILES model/entryfiltermodel.cpp model/entrymodel.cpp model/fieldmodel.cpp)
set(GUI_SRC_FILES model/entryfiltermodel.cpp model/entrymodel.cpp model/fieldmodel.cpp)
set(WIDGETS_HEADER_FILES
gui/fielddelegate.h
gui/initiategui.h
gui/mainwindow.h
gui/passwordgeneratordialog.h
gui/stacksupport.h
gui/undocommands.h)
set(WIDGETS_HEADER_FILES gui/fielddelegate.h gui/initiategui.h gui/mainwindow.h gui/passwordgeneratordialog.h
gui/stacksupport.h gui/undocommands.h)
set(WIDGETS_SRC_FILES
gui/fielddelegate.cpp
gui/initiategui.cpp
@ -114,7 +109,8 @@ set(REQUIRED_ICONS
window-close)
# find c++utilities
set(CONFIGURATION_PACKAGE_SUFFIX ""
set(CONFIGURATION_PACKAGE_SUFFIX
""
CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.6.0 REQUIRED)
use_cpp_utilities()
@ -123,7 +119,8 @@ use_cpp_utilities()
include(BasicConfig)
# find qtutilities
set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES "${CONFIGURATION_PACKAGE_SUFFIX}"
set(CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES
"${CONFIGURATION_PACKAGE_SUFFIX}"
CACHE STRING "sets the suffix for qtutilities")
find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED)
use_qt_utilities()

4
cli/cli.cpp
View File

@ -108,9 +108,9 @@ void InteractiveCli::run(const string &file)
void InteractiveCli::processCommand(const string &cmd)
{
#define CMD(value) !paramMissing && cmd == value
#define CMD(value) !paramMissing &&cmd == value
#define CMD2(value1, value2) !paramMissing && (cmd == value1 || cmd == value2)
#define CMD_P(value) !paramMissing && checkCommand(cmd, value, param, paramMissing)
#define CMD_P(value) !paramMissing &&checkCommand(cmd, value, param, paramMissing)
#define CMD2_P(value1, value2) !paramMissing && (checkCommand(cmd, value1, param, paramMissing) || checkCommand(cmd, value2, param, paramMissing))
string param;

3
gui/mainwindow.cpp
View File

@ -432,7 +432,8 @@ bool MainWindow::openFile(const QString &path, PasswordFileOpenFlags openFlags)
}
// show error message
const QString errmsg = tr("An IO error occurred when opening the specified file \"%1\": %2").arg(path, QString::fromLocal8Bit(failure.what()));
const QString errmsg
= tr("An IO error occurred when opening the specified file \"%1\": %2").arg(path, QString::fromLocal8Bit(failure.what()));
m_ui->statusBar->showMessage(errmsg, 5000);
QMessageBox::critical(this, QApplication::applicationName(), errmsg);
return false;