From e1386c2a79b6f0c7405c49a82db33bf89a532aa5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 29 Sep 2017 17:17:12 +0200 Subject: [PATCH] Reformat using clang-tidy 5.0 --- cli/cli.cpp | 2 +- cli/cli.h | 4 ++-- gui/initiatequi.cpp | 2 +- gui/mainwindow.cpp | 2 +- gui/mainwindow.h | 6 +++--- gui/passwordgeneratordialog.cpp | 2 +- gui/passwordgeneratordialog.h | 2 +- gui/stacksupport.cpp | 2 +- gui/stacksupport.h | 2 +- gui/undocommands.cpp | 2 +- gui/undocommands.h | 4 ++-- model/entryfiltermodel.h | 2 +- model/entrymodel.h | 6 +++--- model/fieldmodel.h | 4 ++-- quickgui/applicationinfo.cpp | 2 +- quickgui/applicationinfo.h | 2 +- quickgui/applicationpaths.h | 2 +- quickgui/initiatequick.cpp | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cli/cli.cpp b/cli/cli.cpp index a69e7f6..10e2fd2 100644 --- a/cli/cli.cpp +++ b/cli/cli.cpp @@ -755,4 +755,4 @@ string InteractiveCli::askForPassphrase(bool confirm) } return input1; } -} +} // namespace Cli diff --git a/cli/cli.h b/cli/cli.h index d5191ad..f520ff1 100644 --- a/cli/cli.h +++ b/cli/cli.h @@ -21,7 +21,7 @@ typedef std::vector StringVector; namespace Io { class Entry; enum class EntryType : int; -} +} // namespace Io namespace Cli { @@ -78,6 +78,6 @@ private: bool m_modified; bool m_quit; }; -} +} // namespace Cli #endif // CLI_CLI_H diff --git a/gui/initiatequi.cpp b/gui/initiatequi.cpp index c95dfc6..6690278 100644 --- a/gui/initiatequi.cpp +++ b/gui/initiatequi.cpp @@ -48,4 +48,4 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, qtSettings.save(settings); return res; } -} +} // namespace QtGui diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 59cc0f6..76636c74 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1235,4 +1235,4 @@ void MainWindow::copyFieldsForXMilliSeconds(int x) QMessageBox::warning(this, QApplication::applicationName(), tr("The selection is empty.")); } } -} +} // namespace QtGui diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 8dee0c7..ee0b129 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -22,7 +22,7 @@ QT_FORWARD_DECLARE_CLASS(QSettings) namespace Io { DECLARE_ENUM_CLASS(EntryType, int); DECLARE_ENUM_CLASS(FieldType, int); -} +} // namespace Io namespace MiscUtils { class RecentMenuManager; @@ -32,7 +32,7 @@ namespace Dialogs { class AboutDialog; class SettingsDialog; class QtSettings; -} +} // namespace Dialogs namespace QtGui { @@ -131,6 +131,6 @@ private: Dialogs::QtSettings *m_qtSettings; Dialogs::SettingsDialog *m_settingsDlg; }; -} +} // namespace QtGui #endif // MAINWINDOW_H diff --git a/gui/passwordgeneratordialog.cpp b/gui/passwordgeneratordialog.cpp index 489a224..af1f35b 100644 --- a/gui/passwordgeneratordialog.cpp +++ b/gui/passwordgeneratordialog.cpp @@ -159,4 +159,4 @@ void PasswordGeneratorDialog::copyPassword() QClipboard *cb = QApplication::clipboard(); cb->setText(m_ui->passwordLineEdit->text()); } -} +} // namespace QtGui diff --git a/gui/passwordgeneratordialog.h b/gui/passwordgeneratordialog.h index 0a6a4bd..fa25252 100644 --- a/gui/passwordgeneratordialog.h +++ b/gui/passwordgeneratordialog.h @@ -31,6 +31,6 @@ private: std::vector m_charset; Util::OpenSslRandomDevice m_random; }; -} +} // namespace QtGui #endif // PASSWORDGENERATORDIALOG_H diff --git a/gui/stacksupport.cpp b/gui/stacksupport.cpp index 2c8876d..fef1482 100644 --- a/gui/stacksupport.cpp +++ b/gui/stacksupport.cpp @@ -14,4 +14,4 @@ StackSupport::StackSupport(QUndoStack *undoStack) : m_undoStack(undoStack) { } -} +} // namespace QtGui diff --git a/gui/stacksupport.h b/gui/stacksupport.h index c8ea5f9..41d96f9 100644 --- a/gui/stacksupport.h +++ b/gui/stacksupport.h @@ -98,6 +98,6 @@ inline QUndoStack *StackAbsorper::stack() { return m_stack; } -} +} // namespace QtGui #endif // QTGUI_STACKSUPPORT_H diff --git a/gui/undocommands.cpp b/gui/undocommands.cpp index 2aea757..7f77a9e 100644 --- a/gui/undocommands.cpp +++ b/gui/undocommands.cpp @@ -458,4 +458,4 @@ bool EntryModelMoveRowsCommand::internalUndo() } return true; } -} +} // namespace QtGui diff --git a/gui/undocommands.h b/gui/undocommands.h index 92dda41..bcd240c 100644 --- a/gui/undocommands.h +++ b/gui/undocommands.h @@ -13,7 +13,7 @@ QT_FORWARD_DECLARE_CLASS(QModelIndex) namespace Io { class Entry; class AccountEntry; -} +} // namespace Io namespace QtGui { @@ -193,6 +193,6 @@ private: std::list m_destParentPath; int m_destChild; }; -} +} // namespace QtGui #endif // UNDOCOMMANDS_H diff --git a/model/entryfiltermodel.h b/model/entryfiltermodel.h index 862af02..ca25ce7 100644 --- a/model/entryfiltermodel.h +++ b/model/entryfiltermodel.h @@ -16,6 +16,6 @@ protected: private: bool hasAcceptedChildren(const QModelIndex &index) const; }; -} +} // namespace QtGui #endif // ENTRYFILTERMODEL_H diff --git a/model/entrymodel.h b/model/entrymodel.h index 69f11e9..f98b254 100644 --- a/model/entrymodel.h +++ b/model/entrymodel.h @@ -13,7 +13,7 @@ namespace Io { class Entry; class NodeEntry; DECLARE_ENUM_CLASS(EntryType, int); -} +} // namespace Io namespace QtGui { @@ -27,7 +27,7 @@ enum EntryModelRoles { class EntryModel : public QAbstractItemModel #ifdef PASSWORD_MANAGER_GUI_QTWIDGETS - , + , public StackSupport #endif { @@ -122,6 +122,6 @@ inline void EntryModel::setInsertType(Io::EntryType type) { m_insertType = type; } -} +} // namespace QtGui #endif // ENTRYMODEL_H diff --git a/model/fieldmodel.h b/model/fieldmodel.h index 92b2f28..1e0891d 100644 --- a/model/fieldmodel.h +++ b/model/fieldmodel.h @@ -35,7 +35,7 @@ enum PasswordVisibility { class FieldModel : public QAbstractTableModel #ifdef PASSWORD_MANAGER_GUI_QTWIDGETS - , + , public StackSupport #endif { @@ -131,6 +131,6 @@ inline void FieldModel::setPasswordVisibility(PasswordVisibility passwordVisibil emit dataChanged(index(0, 1), index(m_fields->size() - 1, 1), QVector() << Qt::DisplayRole << Qt::EditRole); } } -} +} // namespace QtGui #endif // FIELDMODEL_H diff --git a/quickgui/applicationinfo.cpp b/quickgui/applicationinfo.cpp index b6cfa60..4bd5d4f 100644 --- a/quickgui/applicationinfo.cpp +++ b/quickgui/applicationinfo.cpp @@ -90,4 +90,4 @@ void ApplicationInfo::setIsPortraitMode(const bool newMode) emit hMarginChanged(); } } -} +} // namespace QtGui diff --git a/quickgui/applicationinfo.h b/quickgui/applicationinfo.h index eebe392..9f923fc 100644 --- a/quickgui/applicationinfo.h +++ b/quickgui/applicationinfo.h @@ -171,6 +171,6 @@ inline qreal ApplicationInfo::sizeWithRatio(const qreal height) { return ratio() * height; } -} +} // namespace QtGui #endif // APPLICATIONINFO_H diff --git a/quickgui/applicationpaths.h b/quickgui/applicationpaths.h index 8462877..c9465a1 100644 --- a/quickgui/applicationpaths.h +++ b/quickgui/applicationpaths.h @@ -36,6 +36,6 @@ inline QString ApplicationPaths::path(QStandardPaths::StandardLocation location) path += "/"; return path; } -} +} // namespace QtGui #endif // APPLICATIONPATHS_H diff --git a/quickgui/initiatequick.cpp b/quickgui/initiatequick.cpp index 16c9ccb..4593dc2 100644 --- a/quickgui/initiatequick.cpp +++ b/quickgui/initiatequick.cpp @@ -55,4 +55,4 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs) int res = a.exec(); return res; } -} +} // namespace QtGui