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

Valgrind: Callgrind log is not XML #2

Browse Source 
Complements commit 1840a89aff

Change-Id: Idf09e77ae766aa43683ffaf0a7aa108f4b41d705
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2014-11-04 11:45:13 +02:00
committed by hjk
parent 6c9ce2b243
commit fb68072b94
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -129,7 +129,7 @@ signals:
public slots: public slots:
void slotClear(); void slotClear();
void slotRequestDump(); void slotRequestDump();
void loadExternalXmlLogFile(); void loadExternalLogFile();
void selectFunction(const Valgrind::Callgrind::Function *); void selectFunction(const Valgrind::Callgrind::Function *);
void setCostFormat(Valgrind::Internal::CostDelegate::CostFormat format); void setCostFormat(Valgrind::Internal::CostDelegate::CostFormat format);
@@ -562,11 +562,6 @@ void CallgrindTool::startTool(StartMode mode)
d->setBusyCursor(true); d->setBusyCursor(true);
} }
void CallgrindTool::loadExternalXmlLogFile()
{
d->loadExternalXmlLogFile();
}
void CallgrindTool::handleShowCostsOfFunction() void CallgrindTool::handleShowCostsOfFunction()
{ {
d->handleShowCostsOfFunction(); d->handleShowCostsOfFunction();
@@ -662,11 +657,11 @@ QWidget *CallgrindToolPrivate::createWidgets()
layout->setSpacing(0); layout->setSpacing(0);
widget->setLayout(layout); widget->setLayout(layout);
// load external XML log file // load external log file
action = new QAction(this); action = new QAction(this);
action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_OPENFILE))); action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_OPENFILE)));
action->setToolTip(tr("Load External XML Log File")); action->setToolTip(tr("Load External Log File"));
connect(action, SIGNAL(triggered(bool)), this, SLOT(loadExternalXmlLogFile())); connect(action, SIGNAL(triggered(bool)), this, SLOT(loadExternalLogFile()));
layout->addWidget(createToolButton(action)); layout->addWidget(createToolButton(action));
m_loadExternalLogFile = action; m_loadExternalLogFile = action;
@@ -928,7 +923,7 @@ void CallgrindToolPrivate::slotRequestDump()
dumpRequested(); dumpRequested();
} }
void CallgrindToolPrivate::loadExternalXmlLogFile() void CallgrindToolPrivate::loadExternalLogFile()
{ {
const QString filePath = QFileDialog::getOpenFileName( const QString filePath = QFileDialog::getOpenFileName(
Core::ICore::mainWindow(), Core::ICore::mainWindow(),

1
src/plugins/valgrind/callgrindtool.h
View File

@@ -51,7 +51,6 @@ public:
QWidget *createWidgets(); QWidget *createWidgets();
void startTool(Analyzer::StartMode mode); void startTool(Analyzer::StartMode mode);
void loadExternalXmlLogFile();
public slots: public slots:
void handleShowCostsOfFunction(); void handleShowCostsOfFunction();