diff --git a/src/plugins/qttest/qsystem.cpp b/src/plugins/qttest/qsystem.cpp index f60b3847149..f343482a5c0 100644 --- a/src/plugins/qttest/qsystem.cpp +++ b/src/plugins/qttest/qsystem.cpp @@ -53,7 +53,7 @@ # include #endif -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN # include # include #endif @@ -89,14 +89,16 @@ QString QSystem::userName() #if defined Q_OS_TEMP userName = QLatin1String("WinCE"); -#elif defined Q_OS_WIN32 +#elif defined Q_OS_WIN userName = QString::fromLocal8Bit(qgetenv("USERNAME")); #elif defined Q_OS_UNIX userName = QString::fromLocal8Bit(qgetenv("USER")); if (userName.isEmpty()) userName = QString::fromLocal8Bit(qgetenv("LOGNAME")); #elif defined Q_OS_MAC - userName = getenv(); // TODO? + userName = QString::fromLocal8Bit(qgetenv("USER")); + if (userName.isEmpty()) + userName = QString::fromLocal8Bit(qgetenv("LOGNAME")); #endif return userName.toLower(); diff --git a/src/plugins/qttest/qttestplugin.cpp b/src/plugins/qttest/qttestplugin.cpp index 1f4c3592c64..30fecaa7cbf 100644 --- a/src/plugins/qttest/qttestplugin.cpp +++ b/src/plugins/qttest/qttestplugin.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #include #include @@ -306,11 +305,9 @@ void QtTestPlugin::insertTestFunction() if (currentTest) { QString prompt = QLatin1String("") + currentTest->testTypeString() + QLatin1String(" Test: ") + currentTest->testCase(); - NewTestFunctionDlg dlg(prompt); - dlg.exec(); - - if (dlg.result() == QDialog::Accepted) { - QString testFunc = dlg.testFunctionName->text(); + QPointer dlg = new NewTestFunctionDlg(prompt); + if (dlg->exec() == QDialog::Accepted) { + QString testFunc = dlg->testFunctionName->text(); // check for duplicate if (TestFunctionInfo *functionInfo = currentTest->findFunction(testFunc)) { QMessageBox::critical(0, tr("Error"), @@ -318,8 +315,9 @@ void QtTestPlugin::insertTestFunction() currentTest->gotoLine(functionInfo->testStartLine()); return; } - currentTest->addTestFunction(testFunc, QString(), dlg.insertAtCursor->isChecked()); + currentTest->addTestFunction(testFunc, QString(), dlg->insertAtCursor->isChecked()); } + delete dlg; } } diff --git a/src/plugins/qttest/testcontextmenu.cpp b/src/plugins/qttest/testcontextmenu.cpp old mode 100755 new mode 100644 index 6e55fad6bc0..03332312361 --- a/src/plugins/qttest/testcontextmenu.cpp +++ b/src/plugins/qttest/testcontextmenu.cpp @@ -36,7 +36,6 @@ #include "qsystem.h" #include "testsuite.h" #include "testexecuter.h" -#include "testcode.h" #include "testoutputwindow.h" #include @@ -316,9 +315,9 @@ void TestContextMenuPrivate::editorChanged(Core::IEditor *iface) if (iface) { QString fname = iface->displayName(); - isTestcase = ((fname.endsWith(".qtt") || fname.endsWith(".cpp")) - && (fname.startsWith("tst_") || fname.startsWith("sys_") - || fname.startsWith("int_") || fname.startsWith("prf_"))); + isTestcase = ((fname.endsWith(QLatin1String(".qtt")) || fname.endsWith(QLatin1String(".cpp"))) + && (fname.startsWith(QLatin1String("tst_")) || fname.startsWith(QLatin1String("sys_")) + || fname.startsWith(QLatin1String("int_")) || fname.startsWith(QLatin1String("prf_")))); } if (isTestcase) { diff --git a/src/plugins/qttest/testexecuter.cpp b/src/plugins/qttest/testexecuter.cpp index 8b2774ffdba..f85201d14b3 100644 --- a/src/plugins/qttest/testexecuter.cpp +++ b/src/plugins/qttest/testexecuter.cpp @@ -601,7 +601,7 @@ void TestExecuter::parseOutput() } } else { if (m_xmlMode) { - if (line.startsWith("")) { + if (line.endsWith(QLatin1String("/>"))) { line = m_xmlResult.toUpper(); while (line.length() < 7) line += QLatin1Char(' '); @@ -703,14 +703,14 @@ void TestExecuter::parseOutput() m_killTestRequested = true; QTimer::singleShot(1500, this, SLOT(onKillTestRequested())); - } else if (line.startsWith("")) { + } else if (line.startsWith(QLatin1String(""))) { line = "Config: Using QTest library " + m_xmlQtestVersion + ", Qt " + m_xmlQtVersion; } else if (xmlLineStartsWith(line, "")) { + } else if (line.startsWith(QLatin1String(""))) { continue; } else if (xmlLineStartsWith(line, "",m_xmlQtestVersion)) { continue; - } else if (line.startsWith("()@")) { + } else if (line.startsWith(QLatin1String("()@"))) { m_xmlFile = line.mid(line.indexOf(QLatin1Char('@'))+1); m_xmlLine = m_xmlFile.mid(m_xmlFile.indexOf(QLatin1Char(':'))+1); m_xmlFile = m_xmlFile.left(m_xmlFile.indexOf(QLatin1Char(':'))); @@ -1261,10 +1261,9 @@ void TestExecuter::eventRecordingStarted(const QString &file, int line, const QS tmp->openTestInEditor(QString()); tmp->gotoLine(line); } - - QDialog recordWindow; + QPointer recordWindow = new QDialog; Ui::RecordDialog ui; - ui.setupUi(&recordWindow); + ui.setupUi(recordWindow); if (!manualSteps.isEmpty()) { ui.steps_view->setPlainText(manualSteps); @@ -1277,12 +1276,13 @@ void TestExecuter::eventRecordingStarted(const QString &file, int line, const QS "or 'Abort' to abandon recording."); m_recordedEventsEdit = ui.codeEdit; - connect(ui.abort_button, SIGNAL(clicked()), &recordWindow, SLOT(close())); + connect(ui.abort_button, SIGNAL(clicked()), recordWindow, SLOT(close())); connect(ui.abort_button, SIGNAL(clicked()), this, SLOT(abortRecording())); m_abortRecording = false; m_recordingEvents = true; - recordWindow.exec(); + recordWindow->exec(); + delete recordWindow; m_recordingEvents = false; if (m_abortRecording) return; diff --git a/src/plugins/qttest/testselector.cpp b/src/plugins/qttest/testselector.cpp index 5dc0d036192..849a645c118 100644 --- a/src/plugins/qttest/testselector.cpp +++ b/src/plugins/qttest/testselector.cpp @@ -176,6 +176,11 @@ public: int m_startLine; }; +const QPixmap TestViewItem::m_selectpxm(selected_xpm); +const QPixmap TestViewItem::m_unselectpxm(unselected_xpm); +const QPixmap TestViewItem::m_parentAssignpxm(parentAssigned_xpm); +const QPixmap TestViewItem::m_childAssignpxm(childAssigned_xpm); + TestViewItem::TestViewItem(TestViewItem *parent, const QString &name, bool testSuite, int type) : QTreeWidgetItem(parent, QStringList() << name, type), m_errored(false) @@ -356,22 +361,17 @@ TestViewItem *TestSelector::recastItem(QTreeWidgetItem *item) void TestViewItem::updatePixmap() { - static QPixmap selectpxm = QPixmap(selected_xpm); - static QPixmap unselectpxm = QPixmap(unselected_xpm); - static QPixmap parentAssignpxm = QPixmap(parentAssigned_xpm); - static QPixmap childAssignpxm = QPixmap(childAssigned_xpm); - if (m_errored) return; if (m_assigned) - setIcon(0, QIcon(selectpxm)); + setIcon(0, QIcon(m_selectpxm)); else if (m_parentAssigned > 0) - setIcon(0, QIcon(parentAssignpxm)); + setIcon(0, QIcon(m_parentAssignpxm)); else if (m_childAssigned > 0) - setIcon(0, QIcon(childAssignpxm)); + setIcon(0, QIcon(m_childAssignpxm)); else - setIcon(0, QIcon(unselectpxm)); + setIcon(0, QIcon(m_unselectpxm)); } void TestViewItem::removeAllChildren() @@ -840,7 +840,7 @@ void TestSelector::updateActions() void TestSelector::selectGroup() { - SelectDlg dlg("Select a group", + QPointer dlg = new SelectDlg("Select a group", "Please select the groups that you'd want to test", QAbstractItemView::MultiSelection, 300, 400, QStringList() << "Groups", QByteArray(), this); @@ -853,7 +853,7 @@ void TestSelector::selectGroup() TestFunctionInfo *inf = tc->testFunction(j); if (inf && (inf->testStartLine() >= 0)) { if (!inf->testGroups().isEmpty()) { - dlg.addSelectableItems(inf->testGroups() + dlg->addSelectableItems(inf->testGroups() .split(QLatin1Char(','), QString::SkipEmptyParts)); groupsList.append(tc->testCase() + "::" + inf->functionName() + QLatin1Char('@') + inf->testGroups().split(QLatin1Char(','), QString::SkipEmptyParts).join(QString(QLatin1Char('@')))); @@ -863,8 +863,8 @@ void TestSelector::selectGroup() } } - if (dlg.exec()) { - QStringList selectedGroups = dlg.selectedItems(); + if (dlg->exec()) { + QStringList selectedGroups = dlg->selectedItems(); unassignAll(); int current = 0; while (current < groupsList.count()) { @@ -884,6 +884,7 @@ void TestSelector::selectGroup() } setSelectedTests(true, groupsList); } + delete dlg; } QString TestSelector::curTestSuite(bool fullPath) @@ -1462,19 +1463,18 @@ void TestSelector::testInsertUnitOrSystemTest() if (cfg) basePath = cfg->srcPath(); } - - NewTestCaseDlg dlg(basePath, this); - if (dlg.exec() == QDialog::Accepted) { + QPointer dlg = new NewTestCaseDlg(basePath, this); + if (dlg->exec() == QDialog::Accepted) { TestGenerator gen; QString classFile; - gen.enableComponentInTestName(dlg.componentInName()); - gen.setTestCase(dlg.mode(), - dlg.location(), + gen.enableComponentInTestName(dlg->componentInName()); + gen.setTestCase(dlg->mode(), + dlg->location(), QString(), // use automatic "subdir" selection - dlg.testCaseName(), - dlg.testedComponent(), - dlg.testedClassName(), + dlg->testCaseName(), + dlg->testedComponent(), + dlg->testedClassName(), classFile); if (gen.generateTest()) { @@ -1486,4 +1486,5 @@ void TestSelector::testInsertUnitOrSystemTest() } } } + delete dlg; } diff --git a/src/plugins/qttest/testselector.h b/src/plugins/qttest/testselector.h index 799f1d85094..8b76a28bd3c 100644 --- a/src/plugins/qttest/testselector.h +++ b/src/plugins/qttest/testselector.h @@ -104,6 +104,11 @@ private: uint m_parentAssigned; bool m_assigned; bool m_isTestSuite; + + static const QPixmap m_selectpxm; + static const QPixmap m_unselectpxm; + static const QPixmap m_parentAssignpxm; + static const QPixmap m_childAssignpxm; }; class TestSelector : public QTreeWidget diff --git a/src/plugins/qttest/testsettingspropertiespage.ui b/src/plugins/qttest/testsettingspropertiespage.ui index 3532cba9377..aee09aecd92 100644 --- a/src/plugins/qttest/testsettingspropertiespage.ui +++ b/src/plugins/qttest/testsettingspropertiespage.ui @@ -295,7 +295,7 @@ - The reference for the plaform under test, e.g: <MkSpec> + The reference for the platform under test, e.g: <MkSpec>