Apply clang-format and cmake-format
This commit is contained in:
parent
6684f1b627
commit
54e21607df
|
@ -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_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(GUI_SRC_FILES model/entryfiltermodel.cpp model/entrymodel.cpp model/fieldmodel.cpp)
|
||||||
|
|
||||||
set(WIDGETS_HEADER_FILES
|
set(WIDGETS_HEADER_FILES gui/fielddelegate.h gui/initiategui.h gui/mainwindow.h gui/passwordgeneratordialog.h
|
||||||
gui/fielddelegate.h
|
gui/stacksupport.h gui/undocommands.h)
|
||||||
gui/initiategui.h
|
|
||||||
gui/mainwindow.h
|
|
||||||
gui/passwordgeneratordialog.h
|
|
||||||
gui/stacksupport.h
|
|
||||||
gui/undocommands.h)
|
|
||||||
set(WIDGETS_SRC_FILES
|
set(WIDGETS_SRC_FILES
|
||||||
gui/fielddelegate.cpp
|
gui/fielddelegate.cpp
|
||||||
gui/initiategui.cpp
|
gui/initiategui.cpp
|
||||||
|
@ -114,7 +109,8 @@ set(REQUIRED_ICONS
|
||||||
window-close)
|
window-close)
|
||||||
|
|
||||||
# find c++utilities
|
# 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")
|
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)
|
find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.6.0 REQUIRED)
|
||||||
use_cpp_utilities()
|
use_cpp_utilities()
|
||||||
|
@ -123,7 +119,8 @@ use_cpp_utilities()
|
||||||
include(BasicConfig)
|
include(BasicConfig)
|
||||||
|
|
||||||
# find qtutilities
|
# 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")
|
CACHE STRING "sets the suffix for qtutilities")
|
||||||
find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED)
|
find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.0.0 REQUIRED)
|
||||||
use_qt_utilities()
|
use_qt_utilities()
|
||||||
|
|
|
@ -108,9 +108,9 @@ void InteractiveCli::run(const string &file)
|
||||||
|
|
||||||
void InteractiveCli::processCommand(const string &cmd)
|
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 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))
|
#define CMD2_P(value1, value2) !paramMissing && (checkCommand(cmd, value1, param, paramMissing) || checkCommand(cmd, value2, param, paramMissing))
|
||||||
|
|
||||||
string param;
|
string param;
|
||||||
|
|
|
@ -432,7 +432,8 @@ bool MainWindow::openFile(const QString &path, PasswordFileOpenFlags openFlags)
|
||||||
}
|
}
|
||||||
|
|
||||||
// show error message
|
// 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);
|
m_ui->statusBar->showMessage(errmsg, 5000);
|
||||||
QMessageBox::critical(this, QApplication::applicationName(), errmsg);
|
QMessageBox::critical(this, QApplication::applicationName(), errmsg);
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue