change: change code style to Linux style except indent.
This commit is contained in:
@@ -20,16 +20,17 @@
|
||||
|
||||
#include "valuedatabase.h"
|
||||
|
||||
namespace olive {
|
||||
namespace olive
|
||||
{
|
||||
|
||||
NodeValueTable NodeValueDatabase::Merge() const
|
||||
{
|
||||
QHash<QString, NodeValueTable> copy = tables_;
|
||||
QHash<QString, NodeValueTable> copy = tables_;
|
||||
|
||||
// Kinda hacky, but we don't need this table to slipstream
|
||||
copy.remove(QStringLiteral("global"));
|
||||
// Kinda hacky, but we don't need this table to slipstream
|
||||
copy.remove(QStringLiteral("global"));
|
||||
|
||||
return NodeValueTable::Merge(copy.values());
|
||||
return NodeValueTable::Merge(copy.values());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user