forked from qt-creator/qt-creator
Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
@@ -107,7 +107,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command)
|
||||
QDataStream temporaryOutDataStream(&outDataStreamByteArray, QIODevice::WriteOnly);
|
||||
temporaryOutDataStream.setVersion(QDataStream::Qt_4_8);
|
||||
|
||||
temporaryOutDataStream << command.valueChanges();;
|
||||
temporaryOutDataStream << command.valueChanges();
|
||||
|
||||
QSharedMemory *sharedMemory = createSharedMemory(keyCounter, outDataStreamByteArray.size());
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ static QTransform transformForItem(QQuickItem *item, NodeInstanceServer *nodeIns
|
||||
|
||||
QTransform QuickItemNodeInstance::transform() const
|
||||
{ if (quickItem()->parentItem())
|
||||
return DesignerSupport::parentTransform(quickItem());;
|
||||
return DesignerSupport::parentTransform(quickItem());
|
||||
|
||||
return QTransform();
|
||||
}
|
||||
|
||||
@@ -134,5 +134,5 @@ int main(int argc, char *argv[])
|
||||
if (application.arguments().at(1) == "--readcapturedstream")
|
||||
return 0;
|
||||
|
||||
return application.exec();;
|
||||
return application.exec();
|
||||
}
|
||||
|
||||
@@ -283,9 +283,9 @@ void ContextPaneTextWidget::onColorDialogApplied(const QColor &)
|
||||
ContextPaneWidget *parentContextWidget = qobject_cast<ContextPaneWidget*>(parentWidget());
|
||||
parentContextWidget->onShowColorDialog(false, QPoint());
|
||||
if (ui->textColorButton->isChecked())
|
||||
emit propertyChanged(QLatin1String("styleColor"),parentContextWidget->colorDialog()->color());; //write back color
|
||||
emit propertyChanged(QLatin1String("styleColor"),parentContextWidget->colorDialog()->color()); //write back color
|
||||
if (ui->colorButton->isChecked())
|
||||
emit propertyChanged(QLatin1String("color"),parentContextWidget->colorDialog()->color());; //write back color
|
||||
emit propertyChanged(QLatin1String("color"),parentContextWidget->colorDialog()->color()); //write back color
|
||||
ui->textColorButton->setChecked(false);
|
||||
ui->colorButton->setChecked(false);
|
||||
}
|
||||
|
||||
@@ -168,9 +168,9 @@ void ContextPaneWidgetRectangle::onColorDialogApplied(const QColor &)
|
||||
ContextPaneWidget *parentContextWidget = qobject_cast<ContextPaneWidget*>(parentWidget());
|
||||
parentContextWidget->onShowColorDialog(false, QPoint());
|
||||
if (ui->colorColorButton->isChecked())
|
||||
emit propertyChanged(QLatin1String("color"),parentContextWidget->colorDialog()->color());; //write back color
|
||||
emit propertyChanged(QLatin1String("color"),parentContextWidget->colorDialog()->color()); //write back color
|
||||
if (ui->borderColorButton->isChecked())
|
||||
emit propertyChanged(QLatin1String("border.color"),parentContextWidget->colorDialog()->color());; //write back color
|
||||
emit propertyChanged(QLatin1String("border.color"),parentContextWidget->colorDialog()->color()); //write back color
|
||||
if (m_gradientLineDoubleClicked)
|
||||
ui->gradientLine->setActiveColor(parentContextWidget->colorDialog()->color());
|
||||
ui->colorColorButton->setChecked(false);
|
||||
|
||||
@@ -73,7 +73,7 @@ std::string msgDebugEngineComResult(HRESULT hr)
|
||||
return std::string("E_NOTIMPL");
|
||||
}
|
||||
if (hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED))
|
||||
return std::string("ERROR_ACCESS_DENIED");;
|
||||
return std::string("ERROR_ACCESS_DENIED");
|
||||
if (hr == HRESULT_FROM_NT(STATUS_CONTROL_C_EXIT))
|
||||
return std::string("STATUS_CONTROL_C_EXIT");
|
||||
return std::string("E_FAIL ") + winErrorMessage(HRESULT_CODE(hr));
|
||||
|
||||
@@ -183,7 +183,7 @@ bool ProjectIntroPage::validate()
|
||||
|
||||
if (projectDirFile.isDir()) {
|
||||
displayStatusMessage(Warning, tr("The project already exists."));
|
||||
return nameValid;;
|
||||
return nameValid;
|
||||
}
|
||||
// Not a directory, but something else, likely causing directory creation to fail
|
||||
displayStatusMessage(Error, tr("A file with that name already exists."));
|
||||
|
||||
@@ -176,7 +176,7 @@ void StyleHelper::verticalGradient(QPainter *painter, const QRect &spanRect, con
|
||||
QColor keyColor = baseColor(lightColored);
|
||||
key.sprintf("mh_vertical %d %d %d %d %d",
|
||||
spanRect.width(), spanRect.height(), clipRect.width(),
|
||||
clipRect.height(), keyColor.rgb());;
|
||||
clipRect.height(), keyColor.rgb());
|
||||
|
||||
QPixmap pixmap;
|
||||
if (!QPixmapCache::find(key, pixmap)) {
|
||||
|
||||
@@ -413,7 +413,7 @@ bool AnalyzerManagerPrivate::showPromptDialog(const QString &title, const QStrin
|
||||
messageBox.button(QDialogButtonBox::Cancel)->setText(cancelButtonText);
|
||||
messageBox.setDefaultButton(QDialogButtonBox::Yes);
|
||||
messageBox.setCheckBoxVisible(false);
|
||||
messageBox.exec();;
|
||||
messageBox.exec();
|
||||
return messageBox.clickedStandardButton() == QDialogButtonBox::Yes;
|
||||
}
|
||||
|
||||
|
||||
@@ -754,7 +754,7 @@ QVector<AndroidManager::Library> AndroidManager::availableQtLibsWithDependencies
|
||||
}
|
||||
|
||||
const QString library = libgnustl.mid(libgnustl.lastIndexOf(QLatin1Char('/')) + 1);
|
||||
mapLibs[library] = Library();;
|
||||
mapLibs[library] = Library();
|
||||
|
||||
// clean dependencies
|
||||
const LibrariesMap::Iterator lend = mapLibs.end();
|
||||
|
||||
@@ -616,7 +616,7 @@ QByteArray CMakeRunPage::cachedGeneratorFromFile(const QString &cache)
|
||||
void CMakeRunPage::initializePage()
|
||||
{
|
||||
if (m_mode == Initial) {
|
||||
bool upToDateXmlFile = m_cmakeWizard->existsUpToDateXmlFile();;
|
||||
bool upToDateXmlFile = m_cmakeWizard->existsUpToDateXmlFile();
|
||||
m_buildDirectory = m_cmakeWizard->buildDirectory();
|
||||
|
||||
if (upToDateXmlFile) {
|
||||
|
||||
@@ -283,7 +283,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
|
||||
m_details->setLayout(fl);
|
||||
|
||||
QVBoxLayout *vbx = new QVBoxLayout(this);
|
||||
vbx->setMargin(0);;
|
||||
vbx->setMargin(0);
|
||||
vbx->addWidget(m_detailsContainer);
|
||||
|
||||
connect(m_workingDirectoryEdit, SIGNAL(changed(QString)),
|
||||
|
||||
@@ -237,7 +237,7 @@ void MakeStep::stdOutput(const QString &line)
|
||||
{
|
||||
if (m_percentProgress.indexIn(line) != -1) {
|
||||
bool ok = false;
|
||||
int percent = m_percentProgress.cap(1).toInt(&ok);;
|
||||
int percent = m_percentProgress.cap(1).toInt(&ok);
|
||||
if (ok)
|
||||
futureInterface()->setProgressValue(percent);
|
||||
} else if (m_ninjaProgress.indexIn(line) != -1) {
|
||||
|
||||
@@ -816,7 +816,7 @@ public slots:
|
||||
{
|
||||
const QAction *act = qobject_cast<QAction *>(sender());
|
||||
QTC_ASSERT(act, return);
|
||||
BreakpointModelId id = act->data().value<BreakpointModelId>();;
|
||||
BreakpointModelId id = act->data().value<BreakpointModelId>();
|
||||
breakHandler()->setEnabled(id, false);
|
||||
}
|
||||
|
||||
|
||||
@@ -750,9 +750,9 @@ void LldbEngineGuest::lldbEvent(lldb::SBEvent *ev)
|
||||
qDebug("unexpected ProcessEvent");
|
||||
break;
|
||||
}
|
||||
break;;
|
||||
break;
|
||||
default:
|
||||
break;;
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1905,7 +1905,7 @@ void QmlV8DebuggerClient::updateBreakpoints(const QVariant &bodyVal)
|
||||
const QVariantList actualLocations = breakpointData.value(_("actual_locations")).toList();
|
||||
foreach (const QVariant &location, actualLocations) {
|
||||
const QVariantMap locationData = location.toMap();
|
||||
br.lineNumber = locationData.value(_("line")).toInt() + 1;;
|
||||
br.lineNumber = locationData.value(_("line")).toInt() + 1;
|
||||
br.enabled = breakpointData.value(_("active")).toBool();
|
||||
br.hitCount = breakpointData.value(_("hit_count")).toInt();
|
||||
br.ignoreCount = breakpointData.value(_("ignoreCount")).toInt();
|
||||
|
||||
@@ -368,7 +368,7 @@ QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
|
||||
// free debugger expression.
|
||||
QString fixCppExpression(const QString &expIn)
|
||||
{
|
||||
QString exp = expIn.trimmed();;
|
||||
QString exp = expIn.trimmed();
|
||||
// Extract the first identifier, everything else is considered
|
||||
// too dangerous.
|
||||
int pos1 = 0, pos2 = exp.size();
|
||||
|
||||
@@ -5122,7 +5122,7 @@ bool FakeVimHandler::Private::handleExSubstituteCommand(const ExCommand &cmd)
|
||||
int pos1 = findUnescaped(separator, line, 1);
|
||||
if (pos1 == -1)
|
||||
return false;
|
||||
int pos2 = findUnescaped(separator, line, pos1 + 1);;
|
||||
int pos2 = findUnescaped(separator, line, pos1 + 1);
|
||||
if (pos2 == -1)
|
||||
pos2 = line.size();
|
||||
|
||||
|
||||
@@ -244,7 +244,7 @@ static QList<Abi> abiOf(const QByteArray &data)
|
||||
result.append(Abi(Abi::ItaniumArchitecture, os, flavor, Abi::ElfFormat, 64));
|
||||
break;
|
||||
default:
|
||||
;;
|
||||
;
|
||||
}
|
||||
} else if (((getUint8(data, 0) == 0xce || getUint8(data, 0) == 0xcf)
|
||||
&& getUint8(data, 1) == 0xfa && getUint8(data, 2) == 0xed && getUint8(data, 3) == 0xfe
|
||||
|
||||
@@ -1000,7 +1000,7 @@ ToolChain::CompilerFlags ClangToolChain::compilerFlags(const QStringList &cxxfla
|
||||
|
||||
ToolChain::WarningFlags ClangToolChain::warningFlags(const QStringList &cflags) const
|
||||
{
|
||||
WarningFlags flags = GccToolChain::warningFlags(cflags);;
|
||||
WarningFlags flags = GccToolChain::warningFlags(cflags);
|
||||
foreach (const QString &flag, cflags) {
|
||||
if (flag == QLatin1String("-Wdocumentation"))
|
||||
flags |= WarnDocumentation;
|
||||
|
||||
@@ -67,7 +67,7 @@ static QString findMsvcVer(int version)
|
||||
if (version == 10)
|
||||
return QLatin1String("msvc2010");
|
||||
if (version == 9)
|
||||
return QLatin1String("msvc2008");;
|
||||
return QLatin1String("msvc2008");
|
||||
return QLatin1String("msvc2005");
|
||||
}
|
||||
|
||||
|
||||
@@ -478,7 +478,7 @@ static QLineF mergedHorizontalLine(const QList<QLineF> &lineList)
|
||||
}
|
||||
|
||||
double y(lineList.first().y1());
|
||||
return QLineF(minimumX, y, maximumX, y);;
|
||||
return QLineF(minimumX, y, maximumX, y);
|
||||
}
|
||||
|
||||
static QLineF mergedVerticalLine(const QList<QLineF> &lineList)
|
||||
@@ -496,7 +496,7 @@ static QLineF mergedVerticalLine(const QList<QLineF> &lineList)
|
||||
}
|
||||
|
||||
double x(lineList.first().x1());
|
||||
return QLineF(x, minimumY, x, maximumY);;
|
||||
return QLineF(x, minimumY, x, maximumY);
|
||||
}
|
||||
|
||||
static QList<QLineF> mergedHorizontalLines(const QList<QLineF> &lineList)
|
||||
|
||||
@@ -90,7 +90,7 @@ void QmlApplicationWizard::createInstances(ExtensionSystem::IPlugin *plugin)
|
||||
parameters.setId(templateInfo.wizardId);
|
||||
|
||||
QStringList stringList =
|
||||
templateInfo.featuresRequired.split(QLatin1Char(','), QString::SkipEmptyParts);;
|
||||
templateInfo.featuresRequired.split(QLatin1Char(','), QString::SkipEmptyParts);
|
||||
FeatureSet features;
|
||||
foreach (const QString &string, stringList) {
|
||||
Feature feature(Id::fromString(string.trimmed()));
|
||||
|
||||
@@ -242,7 +242,7 @@ void Qt4ProjectConfigWidget::updateProblemLabel()
|
||||
}
|
||||
|
||||
if (allGood) {
|
||||
QString buildDirectory = m_buildConfiguration->target()->project()->projectDirectory();;
|
||||
QString buildDirectory = m_buildConfiguration->target()->project()->projectDirectory();
|
||||
if (m_buildConfiguration->isShadowBuild())
|
||||
buildDirectory = m_buildConfiguration->buildDirectory().toString();
|
||||
QList<ProjectExplorer::Task> issues;
|
||||
|
||||
@@ -49,7 +49,7 @@ QrcEditor::QrcEditor(QWidget *parent)
|
||||
layout->setSpacing(0);
|
||||
layout->setMargin(0);
|
||||
m_ui.centralWidget->setLayout(layout);
|
||||
m_treeview->setFrameStyle(QFrame::NoFrame);;
|
||||
m_treeview->setFrameStyle(QFrame::NoFrame);
|
||||
layout->addWidget(m_treeview);
|
||||
|
||||
connect(m_ui.removeButton, SIGNAL(clicked()), this, SLOT(onRemove()));
|
||||
|
||||
@@ -248,7 +248,7 @@ void TextEditorActionHandler::createActions()
|
||||
m_cleanWhitespaceAction = registerAction(CLEAN_WHITESPACE,
|
||||
SLOT(setTextWrapping(bool)), true, tr("Clean Whitespace"),
|
||||
QKeySequence(),
|
||||
G_EDIT_FORMAT, advancedEditMenu);;
|
||||
G_EDIT_FORMAT, advancedEditMenu);
|
||||
m_textWrappingAction = registerAction(TEXT_WRAPPING,
|
||||
SLOT(setTextWrapping(bool)), false, tr("Enable Text &Wrapping"),
|
||||
QKeySequence(Core::UseMacShortcuts ? tr("Meta+E, Meta+W") : tr("Ctrl+E, Ctrl+W")),
|
||||
|
||||
@@ -160,5 +160,5 @@ void CallgrindRunControl::slotFinished()
|
||||
|
||||
void CallgrindRunControl::slotStarted()
|
||||
{
|
||||
m_progress->setProgressValue(1);;
|
||||
m_progress->setProgressValue(1);
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ static QFileInfoList findProjectFiles(const QDir &projectDir, QString *errorMess
|
||||
*errorMessage = msgNoProjectFiles(srcDir, projectFilePatterns);
|
||||
return QFileInfoList();
|
||||
}
|
||||
return projectFiles;;
|
||||
return projectFiles;
|
||||
}
|
||||
|
||||
QString BaseCheckoutWizard::openProject(const QString &path, QString *errorMessage)
|
||||
|
||||
@@ -83,7 +83,7 @@ void FormResizer::updateGeometry()
|
||||
|
||||
const Handles::iterator hend = m_handles.end();
|
||||
for (Handles::iterator it = m_handles.begin(); it != hend; ++it) {
|
||||
SizeHandleRect *hndl = *it;;
|
||||
SizeHandleRect *hndl = *it;
|
||||
switch (hndl->dir()) {
|
||||
case SizeHandleRect::LeftTop:
|
||||
hndl->move(geom.x() - w / 2, geom.y() - h / 2);
|
||||
|
||||
Reference in New Issue
Block a user