aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2017-11-18 20:42:28 +0300
committerJake Petroules <jake.petroules@qt.io>2018-01-23 00:00:18 +0000
commit901bf1f7749e79a9fae2999d50131496dcaf4036 (patch)
tree1109c9c249540534fdbab19ffa54f98984c11518 /tests
parent46a700d8757badddadf4b3dbe06bfc2ad5ca9780 (diff)
Use 'auto' keywords more for the allocated variables
Change-Id: I25ec97e64522d7fa486fcf408d8134cbbd8b24ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp2
-rw-r--r--tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp2
-rw-r--r--tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp2
-rw-r--r--tests/auto/blackbox/testdata/enableRtti/main.cpp2
-rw-r--r--tests/auto/buildgraph/tst_buildgraph.cpp14
-rw-r--r--tests/auto/language/tst_language.cpp2
-rw-r--r--tests/auto/tools/tst_tools.cpp6
7 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp b/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp
index 2c6db4403..d6568d77c 100644
--- a/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp
+++ b/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
scene.setSceneRect(-500, -500, 1000, 1000);
scene.setItemIndexMethod(QGraphicsScene::NoIndex);
- Car *car = new Car();
+ auto car = new Car();
scene.addItem(car);
QGraphicsView view(&scene);
diff --git a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp
index 3bb9efa5a..94b288440 100644
--- a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp
+++ b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp
@@ -41,7 +41,7 @@ public:
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- MyObject *obj = new MyObject(&app);
+ auto obj = new MyObject(&app);
return app.exec();
}
diff --git a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp
index 14a23f67b..0d216e970 100644
--- a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp
+++ b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp
@@ -41,7 +41,7 @@ public:
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- MyObject *obj = new MyObject(&app);
+ auto obj = new MyObject(&app);
return app.exec();
}
diff --git a/tests/auto/blackbox/testdata/enableRtti/main.cpp b/tests/auto/blackbox/testdata/enableRtti/main.cpp
index 6301561b3..b7faa3d6b 100644
--- a/tests/auto/blackbox/testdata/enableRtti/main.cpp
+++ b/tests/auto/blackbox/testdata/enableRtti/main.cpp
@@ -47,7 +47,7 @@ class B : public I {
};
int main() {
- I *a = new A();
+ auto a = new A();
B *b = dynamic_cast<B *>(a);
(void)b;
delete a;
diff --git a/tests/auto/buildgraph/tst_buildgraph.cpp b/tests/auto/buildgraph/tst_buildgraph.cpp
index 04d32c1fd..b83e30c3f 100644
--- a/tests/auto/buildgraph/tst_buildgraph.cpp
+++ b/tests/auto/buildgraph/tst_buildgraph.cpp
@@ -85,9 +85,9 @@ ResolvedProductConstPtr TestBuildGraph::productWithDirectCycle()
const ResolvedProductPtr product = ResolvedProduct::create();
product->project = project;
product->buildData.reset(new ProductBuildData);
- Artifact * const root = new Artifact;
+ auto root = new Artifact;
root->product = product;
- Artifact * const child = new Artifact;
+ auto child = new Artifact;
child->product = product;
product->buildData->roots.insert(root);
product->buildData->nodes << root << child;
@@ -101,9 +101,9 @@ ResolvedProductConstPtr TestBuildGraph::productWithLessDirectCycle()
const ResolvedProductPtr product = ResolvedProduct::create();
product->project = project;
product->buildData.reset(new ProductBuildData);
- Artifact * const root = new Artifact;
- Artifact * const child = new Artifact;
- Artifact * const grandchild = new Artifact;
+ auto root = new Artifact;
+ auto child = new Artifact;
+ auto grandchild = new Artifact;
root->product = product;
child->product = product;
grandchild->product = product;
@@ -121,8 +121,8 @@ ResolvedProductConstPtr TestBuildGraph::productWithNoCycle()
const ResolvedProductPtr product = ResolvedProduct::create();
product->project = project;
product->buildData.reset(new ProductBuildData);
- Artifact * const root = new Artifact;
- Artifact * const root2 = new Artifact;
+ auto root = new Artifact;
+ auto root2 = new Artifact;
root->product = product;
root2->product = product;
product->buildData->roots << root << root2;
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 0eb466188..8b11b35d2 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -1326,7 +1326,7 @@ public:
{
JSSourceValuePtr value = JSSourceValue::create();
value->setFile(m_fileContext);
- QString *str = new QString(sourceCode);
+ auto str = new QString(sourceCode);
m_strings.push_back(str);
value->setSourceCode(QStringRef(str));
return value;
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index 71af06aaa..44f4303e3 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -317,7 +317,7 @@ void TestTools::testSettingsMigration_data()
QString TestTools::setupSettingsDir1()
{
- QTemporaryDir * const baseDir = new QTemporaryDir;
+ auto baseDir = new QTemporaryDir;
m_tmpDirs.push_back(baseDir);
const Version thisVersion = Version::fromString(QBS_VERSION);
@@ -360,7 +360,7 @@ QString TestTools::setupSettingsDir1()
QString TestTools::setupSettingsDir2()
{
- QTemporaryDir * const baseDir = new QTemporaryDir;
+ auto baseDir = new QTemporaryDir;
m_tmpDirs.push_back(baseDir);
const QString settingsDir = baseDir->path();
QSettings s(settingsDir + QLatin1String("/qbs.conf"),
@@ -376,7 +376,7 @@ QString TestTools::setupSettingsDir2()
QString TestTools::setupSettingsDir3()
{
- auto * const baseDir = new QTemporaryDir;
+ auto baseDir = new QTemporaryDir;
m_tmpDirs.push_back(baseDir);
return baseDir->path();
}