feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix krazy warnings/some includes in qttest.

Browse Source 
Change-Id: I4c11aa5977efb3fa726e8394bec25c86a6fe049f
Reviewed-on: http://codereview.qt.nokia.com/3725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-08-29 11:33:16 +02:00
parent 662c66ef6b
commit c952834ff2
27 changed files with 673 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qttest/qttestplugin.cpp
View File

@@ -35,6 +35,11 @@
#include "dialogs.h"
#include "qsystem.h"
#include "testsettingspropertiespage.h"
#include "resultsview.h"
#include "testexecuter.h"
#include "testcontextmenu.h"
#include "testsuite.h"
#include "testoutputwindow.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
@@ -48,6 +53,7 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <qmljseditor/qmljseditorconstants.h>
#include <texteditor/basetexteditor.h>
#include <cppeditor/cppeditorconstants.h>
#include <cpptools/cpptoolsconstants.h>
#include <extensionsystem/pluginmanager.h>
@@ -76,6 +82,8 @@
using namespace QtTest::Internal;
enum { debug = 0 };
Core::NavigationView TestNavigationWidgetFactory::createWidget()
{
Core::NavigationView view;
@@ -109,16 +117,15 @@ Core::NavigationView TestNavigationWidgetFactory::createWidget()
QString TestNavigationWidgetFactory::displayName() const
{
return "Tests";
return QtTestPlugin::tr("Tests");
}
//******************************************
QtTestPlugin::QtTestPlugin()
QtTestPlugin::QtTestPlugin() :
m_messageOutputWindow(0), m_testResultsWindow(0),
m_contextMenu(new TestContextMenu(this))
{
m_messageOutputWindow = 0;
m_testResultsWindow = 0;
m_contextMenu = new TestContextMenu(this);
}
QtTestPlugin::~QtTestPlugin()
@@ -235,9 +242,10 @@ void QtTestPlugin::testDebug()
Debugger::DebuggerRunControl *runControl = 0;
Debugger::DebuggerStartParameters params;
params.startMode = Debugger::NoStartMode; // we'll start the test runner here
params.executable = ".qtt";
params.executable = QLatin1String(".qtt");
runControl = Debugger::DebuggerPlugin::createDebugger(params);
qDebug() << "Debugger run control" << runControl;
if (debug)
qDebug() << "Debugger run control" << runControl;
runControl->start();
#ifdef QTTEST_DEBUGGER_SUPPORT
@@ -276,7 +284,7 @@ void QtTestPlugin::retryTests(const QStringList &tests)
QStringList newSelection;
foreach (const QString &test, currentSelection) {
QString testName = test.mid(test.lastIndexOf("/") + 1);
QString testName = test.mid(test.lastIndexOf(QLatin1Char('/')) + 1);
if (tests.contains(testName))
newSelection.append(test);
}
@@ -288,8 +296,8 @@ void QtTestPlugin::insertTestFunction()
{
TestCode *currentTest = m_testCollection.currentEditedTest();
if (currentTest) {
QString prompt = "<b>" + currentTest->testTypeString()
+ " Test: </b>" + currentTest->testCase();
QString prompt = QLatin1String("<b>") + currentTest->testTypeString()
+ QLatin1String(" Test: </b>") + currentTest->testCase();
NewTestFunctionDlg dlg(prompt);
dlg.exec();