Formatting
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wcpp"
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wcpp"
|
||||
#endif
|
||||
#include <gmock/gmock.h>
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wcpp"
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wcpp"
|
||||
#endif
|
||||
#include <gtest/gtest.h>
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
@@ -34,6 +34,7 @@ class LoggingEnvironment : public ::testing::Environment {
|
||||
logging::Init();
|
||||
logging::SetLevels(u"*:4"_s);
|
||||
}
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(LoggingEnvironment)
|
||||
};
|
||||
|
||||
@@ -42,6 +42,7 @@ class MetatypesEnvironment : public ::testing::Environment {
|
||||
qRegisterMetaType<QModelIndex>("QModelIndex");
|
||||
qRegisterMetaType<SongLoader::Result>("SongLoader::Result");
|
||||
}
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(MetatypesEnvironment)
|
||||
};
|
||||
|
||||
@@ -439,7 +439,7 @@ TEST_F(PlaylistTest, ShuffleThenNext) {
|
||||
// Add 100 items
|
||||
PlaylistItemPtrList items;
|
||||
items.reserve(100);
|
||||
for (int i = 0 ; i < 100 ; ++i)
|
||||
for (int i = 0; i < 100; ++i)
|
||||
items << MakeMockItemP(u"Item "_s + QString::number(i));
|
||||
playlist_.InsertItems(items);
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ class ResourcesEnvironment : public ::testing::Environment {
|
||||
Q_INIT_RESOURCE(icons);
|
||||
Q_INIT_RESOURCE(testdata);
|
||||
}
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(ResourcesEnvironment)
|
||||
};
|
||||
|
||||
@@ -52,11 +52,11 @@ void PrintTo(const ::QVariant &var, std::ostream &os);
|
||||
void PrintTo(const ::QUrl &url, std::ostream &os);
|
||||
|
||||
#define EXPOSE_SIGNAL0(n) \
|
||||
void Emit##n() { emit n(); }
|
||||
void Emit##n() { emit n(); }
|
||||
#define EXPOSE_SIGNAL1(n, t1) \
|
||||
void Emit##n(const t1& a1) { emit n(a1); }
|
||||
void Emit##n(const t1 &a1) { emit n(a1); }
|
||||
#define EXPOSE_SIGNAL2(n, t1, t2) \
|
||||
void Emit##n(const t1& a1, const t2& a2) { emit n(a1, a2); }
|
||||
void Emit##n(const t1 &a1, const t2 &a2) { emit n(a1, a2); }
|
||||
|
||||
Q_DECLARE_METATYPE(QModelIndex)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user