Reformat using clang-tidy 5.0

This commit is contained in:
Martchus 2017-09-29 17:17:12 +02:00
parent 654489cb45
commit e1386c2a79
18 changed files with 25 additions and 25 deletions

View File

@ -755,4 +755,4 @@ string InteractiveCli::askForPassphrase(bool confirm)
} }
return input1; return input1;
} }
} } // namespace Cli

View File

@ -21,7 +21,7 @@ typedef std::vector<std::string> StringVector;
namespace Io { namespace Io {
class Entry; class Entry;
enum class EntryType : int; enum class EntryType : int;
} } // namespace Io
namespace Cli { namespace Cli {
@ -78,6 +78,6 @@ private:
bool m_modified; bool m_modified;
bool m_quit; bool m_quit;
}; };
} } // namespace Cli
#endif // CLI_CLI_H #endif // CLI_CLI_H

View File

@ -48,4 +48,4 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs,
qtSettings.save(settings); qtSettings.save(settings);
return res; return res;
} }
} } // namespace QtGui

View File

@ -1235,4 +1235,4 @@ void MainWindow::copyFieldsForXMilliSeconds(int x)
QMessageBox::warning(this, QApplication::applicationName(), tr("The selection is empty.")); QMessageBox::warning(this, QApplication::applicationName(), tr("The selection is empty."));
} }
} }
} } // namespace QtGui

View File

@ -22,7 +22,7 @@ QT_FORWARD_DECLARE_CLASS(QSettings)
namespace Io { namespace Io {
DECLARE_ENUM_CLASS(EntryType, int); DECLARE_ENUM_CLASS(EntryType, int);
DECLARE_ENUM_CLASS(FieldType, int); DECLARE_ENUM_CLASS(FieldType, int);
} } // namespace Io
namespace MiscUtils { namespace MiscUtils {
class RecentMenuManager; class RecentMenuManager;
@ -32,7 +32,7 @@ namespace Dialogs {
class AboutDialog; class AboutDialog;
class SettingsDialog; class SettingsDialog;
class QtSettings; class QtSettings;
} } // namespace Dialogs
namespace QtGui { namespace QtGui {
@ -131,6 +131,6 @@ private:
Dialogs::QtSettings *m_qtSettings; Dialogs::QtSettings *m_qtSettings;
Dialogs::SettingsDialog *m_settingsDlg; Dialogs::SettingsDialog *m_settingsDlg;
}; };
} } // namespace QtGui
#endif // MAINWINDOW_H #endif // MAINWINDOW_H

View File

@ -159,4 +159,4 @@ void PasswordGeneratorDialog::copyPassword()
QClipboard *cb = QApplication::clipboard(); QClipboard *cb = QApplication::clipboard();
cb->setText(m_ui->passwordLineEdit->text()); cb->setText(m_ui->passwordLineEdit->text());
} }
} } // namespace QtGui

View File

@ -31,6 +31,6 @@ private:
std::vector<char> m_charset; std::vector<char> m_charset;
Util::OpenSslRandomDevice m_random; Util::OpenSslRandomDevice m_random;
}; };
} } // namespace QtGui
#endif // PASSWORDGENERATORDIALOG_H #endif // PASSWORDGENERATORDIALOG_H

View File

@ -14,4 +14,4 @@ StackSupport::StackSupport(QUndoStack *undoStack)
: m_undoStack(undoStack) : m_undoStack(undoStack)
{ {
} }
} } // namespace QtGui

View File

@ -98,6 +98,6 @@ inline QUndoStack *StackAbsorper::stack()
{ {
return m_stack; return m_stack;
} }
} } // namespace QtGui
#endif // QTGUI_STACKSUPPORT_H #endif // QTGUI_STACKSUPPORT_H

View File

@ -458,4 +458,4 @@ bool EntryModelMoveRowsCommand::internalUndo()
} }
return true; return true;
} }
} } // namespace QtGui

View File

@ -13,7 +13,7 @@ QT_FORWARD_DECLARE_CLASS(QModelIndex)
namespace Io { namespace Io {
class Entry; class Entry;
class AccountEntry; class AccountEntry;
} } // namespace Io
namespace QtGui { namespace QtGui {
@ -193,6 +193,6 @@ private:
std::list<std::string> m_destParentPath; std::list<std::string> m_destParentPath;
int m_destChild; int m_destChild;
}; };
} } // namespace QtGui
#endif // UNDOCOMMANDS_H #endif // UNDOCOMMANDS_H

View File

@ -16,6 +16,6 @@ protected:
private: private:
bool hasAcceptedChildren(const QModelIndex &index) const; bool hasAcceptedChildren(const QModelIndex &index) const;
}; };
} } // namespace QtGui
#endif // ENTRYFILTERMODEL_H #endif // ENTRYFILTERMODEL_H

View File

@ -13,7 +13,7 @@ namespace Io {
class Entry; class Entry;
class NodeEntry; class NodeEntry;
DECLARE_ENUM_CLASS(EntryType, int); DECLARE_ENUM_CLASS(EntryType, int);
} } // namespace Io
namespace QtGui { namespace QtGui {
@ -27,7 +27,7 @@ enum EntryModelRoles {
class EntryModel : public QAbstractItemModel class EntryModel : public QAbstractItemModel
#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS #ifdef PASSWORD_MANAGER_GUI_QTWIDGETS
, ,
public StackSupport public StackSupport
#endif #endif
{ {
@ -122,6 +122,6 @@ inline void EntryModel::setInsertType(Io::EntryType type)
{ {
m_insertType = type; m_insertType = type;
} }
} } // namespace QtGui
#endif // ENTRYMODEL_H #endif // ENTRYMODEL_H

View File

@ -35,7 +35,7 @@ enum PasswordVisibility {
class FieldModel : public QAbstractTableModel class FieldModel : public QAbstractTableModel
#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS #ifdef PASSWORD_MANAGER_GUI_QTWIDGETS
, ,
public StackSupport public StackSupport
#endif #endif
{ {
@ -131,6 +131,6 @@ inline void FieldModel::setPasswordVisibility(PasswordVisibility passwordVisibil
emit dataChanged(index(0, 1), index(m_fields->size() - 1, 1), QVector<int>() << Qt::DisplayRole << Qt::EditRole); emit dataChanged(index(0, 1), index(m_fields->size() - 1, 1), QVector<int>() << Qt::DisplayRole << Qt::EditRole);
} }
} }
} } // namespace QtGui
#endif // FIELDMODEL_H #endif // FIELDMODEL_H

View File

@ -90,4 +90,4 @@ void ApplicationInfo::setIsPortraitMode(const bool newMode)
emit hMarginChanged(); emit hMarginChanged();
} }
} }
} } // namespace QtGui

View File

@ -171,6 +171,6 @@ inline qreal ApplicationInfo::sizeWithRatio(const qreal height)
{ {
return ratio() * height; return ratio() * height;
} }
} } // namespace QtGui
#endif // APPLICATIONINFO_H #endif // APPLICATIONINFO_H

View File

@ -36,6 +36,6 @@ inline QString ApplicationPaths::path(QStandardPaths::StandardLocation location)
path += "/"; path += "/";
return path; return path;
} }
} } // namespace QtGui
#endif // APPLICATIONPATHS_H #endif // APPLICATIONPATHS_H

View File

@ -55,4 +55,4 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs)
int res = a.exec(); int res = a.exec();
return res; return res;
} }
} } // namespace QtGui