Commit 5d445439 authored by Robert Loehning's avatar Robert Loehning Committed by Eike Ziller
Browse files

Removed dead code

Change-Id: I54eaa6c994ca4628d8e4a89b28df6f72f2029a11
Reviewed-on: http://codereview.qt.nokia.com/4104

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarSunil Thaha <sunil.thaha@nokia.com>
Reviewed-by: default avatarShane Bradley <shane.bradley@nokia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent d5e57c12
......@@ -396,10 +396,6 @@ bool QSystem::hasEnvKey(const QString &envString, QString &key, int &pos, int st
}
if (end > pos) {
int extraKey = 0;
if (winKey)
extraKey = 1;
QString tmpKey = envString.mid(pos + 1, end - (pos+1));
// see if we have a string that looks like $(QTDIR) and convert it to QTDIR
......
......@@ -360,10 +360,8 @@ int ResultsView::intLine(int row)
void ResultsView::setResult(const QString &result, const QString &test, const QString &reason, const QString &dataTag, const QString &file, int line)
{
int row;
QString lineStr(QString::number(line));
append(result, test, reason, dataTag, file, lineStr);
row = rowCount()-1;
}
void ResultsView::onChanged()
......
......@@ -1340,6 +1340,10 @@ QString TestCode::targetFileName(const QString &buildPath) const
void TestCode::onContextHelpIdRequested(TextEditor::ITextEditor *editor, int position)
{
#ifdef QTTEST_PLUGIN_LEAN
Q_UNUSED(editor);
Q_UNUSED(position);
#else
int charsBefore = 32;
if (position < charsBefore)
charsBefore = position;
......@@ -1361,7 +1365,6 @@ void TestCode::onContextHelpIdRequested(TextEditor::ITextEditor *editor, int pos
}
}
#ifndef QTTEST_PLUGIN_LEAN
static QStringList qstSlots;
if (qstSlots.isEmpty()) {
for (int i = 0; i < QSystemTest::staticMetaObject.methodCount(); ++i) {
......
......@@ -196,7 +196,6 @@ void TestExecuter::runSelectedTests(bool forceManual)
testOutputPane()->clear();
bool hasSystemTestsSelected = false;
int maxProgress = 0;
m_lastFinishedTest.clear();
QString lastTc;
......@@ -209,10 +208,8 @@ void TestExecuter::runSelectedTests(bool forceManual)
++maxProgress;
TestCode *tmp = m_testCollection.findCodeByTestCaseName(lastTc);
if (tmp && tmp->testType() == TestCode::TypeSystemTest) {
if (tmp && tmp->testType() == TestCode::TypeSystemTest)
lastIsSystemTest = true;
hasSystemTestsSelected = true;
}
} else if (lastIsSystemTest) {
++maxProgress;
}
......
......@@ -899,15 +899,11 @@ QString TestSelector::curTestSuite(bool fullPath)
void TestSelector::checkSuite(TestSuiteItem *base, bool &selected, bool &multiSelection)
{
TestViewItem *tmpViewItem;
TestSuiteItem *testSuite;
int tmpViewItemInd = 1;
if (base == 0) {
if (base == 0)
tmpViewItem = static_cast<TestViewItem *>(topLevelItem(0));
testSuite = static_cast<TestSuiteItem *>(tmpViewItem);
} else {
else
tmpViewItem = static_cast<TestViewItem *>(base->child(0));
testSuite = base;
}
while (tmpViewItem != 0) {
......@@ -992,15 +988,11 @@ QStringList TestSelector::selectedTests()
void TestSelector::getSelectedTests(TestSuiteItem *base, QStringList &list, bool isAssigned)
{
TestViewItem *tmpViewItem;
TestSuiteItem *testSuite;
int tmpViewItemInd = 1;
if (base == 0) {
if (base == 0)
tmpViewItem = static_cast<TestViewItem *>(topLevelItem(0));
testSuite = static_cast<TestSuiteItem *>(tmpViewItem);
} else {
else
tmpViewItem = static_cast<TestViewItem *>(base->child(0));
testSuite = base;
}
while (tmpViewItem != 0) {
if (tmpViewItem->isTestSuite()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment