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

QmlDesigner.Rewriter: Cleaning up the warning code

Browse Source 
The class is renamed to RewriterError and moved outside of RewriterView.
Reason: Inner classes cannot be forward declared in C++.

Changing RewriterView::Error to RewriterError, because inner
classes cannot be forward declared.

Change-Id: I51e3b08efeda44a8cd2abe84e833a5f8c190b84e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-09 13:41:25 +02:00
committed by Thomas Hartmann
parent 9b4512f906
commit 8cdfc4e097
9 changed files with 177 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -98,14 +98,14 @@ DocumentWarningWidget::DocumentWarningWidget(DesignModeWidget *parent) :
layout->addWidget(m_goToError, 1, Qt::AlignRight);
}
void DocumentWarningWidget::setError(const RewriterView::Error &error)
void DocumentWarningWidget::setError(const RewriterError &error)
{
m_error = error;
QString str;
if (error.type() == RewriterView::Error::ParseError) {
if (error.type() == RewriterError::ParseError) {
str = tr("%3 (%1:%2)").arg(QString::number(error.line()), QString::number(error.column()), error.description());
m_goToError->show();
} else if (error.type() == RewriterView::Error::InternalError) {
} else if (error.type() == RewriterError::InternalError) {
str = tr("Internal error (%1)").arg(error.description());
m_goToError->hide();
}
@@ -278,7 +278,7 @@ void DesignModeWidget::disableWidgets()
m_isDisabled = true;
}
void DesignModeWidget::updateErrorStatus(const QList<RewriterView::Error> &errors)
void DesignModeWidget::updateErrorStatus(const QList<RewriterError> &errors)
{
if (debug)
qDebug() << Q_FUNC_INFO << errors.count();
@@ -459,8 +459,8 @@ void DesignModeWidget::deleteSidebarWidgets()
void DesignModeWidget::qmlPuppetCrashed()
{
QList<RewriterView::Error> errorList;
RewriterView::Error error(tr("Qt Quick emulation layer crashed"));
QList<RewriterError> errorList;
RewriterError error(tr("Qt Quick emulation layer crashed"));
errorList.append(error);
disableWidgets();
@@ -616,7 +616,7 @@ QWidget *DesignModeWidget::createCrumbleBarFrame()
return frame;
}
void DesignModeWidget::showErrorMessage(const QList<RewriterView::Error> &errors)
void DesignModeWidget::showErrorMessage(const QList<RewriterError> &errors)
{
Q_ASSERT(!errors.isEmpty());
m_warningWidget->setError(errors.first());