From 32199de9d912291b77166343f608c6e1a77ab06e Mon Sep 17 00:00:00 2001 From: Roquette Date: Mon, 1 Feb 2010 11:56:52 +0100 Subject: [PATCH 1/6] Added semicolon after } when creating unnamed enumeration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTCREATORBUG-643 Merge-request: 109 Reviewed-by: Thorbjørn Lindeijer --- src/libs/cplusplus/MatchingText.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index 6e4c791511f..fe390cb9b3b 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -271,7 +271,7 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &tc) const // anonymous namespace return QLatin1String("}"); - } else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION)) { + } else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION) || token.is(T_ENUM)) { if (tk[index - 2].is(T_TYPEDEF)) { // recognized: // typedef struct { From 1d6c5d73d925caa851a4f8e0d418dc8abb343353 Mon Sep 17 00:00:00 2001 From: Alexander Antsev Date: Mon, 1 Feb 2010 17:51:31 +0100 Subject: [PATCH 2/6] Fixed errors in description of locator's key combinations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 108 Reviewed-by: Thorbjørn Lindeijer --- doc/qtcreator.qdoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index ee92ae025e0..a160be4b557 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -967,7 +967,7 @@ \o \image qtcreator-locator-symbols.png \row \o Go to a help topic. - \o Ctrl+K, ?, Space, and the topic + \o Ctrl+K, ?, Space, and the topic name \o \image qtcreator-locator-help.png \row \o Go to an opened document. @@ -979,11 +979,11 @@ \o \image qtcreator-locator-filesystem.png \row \o Go to a file in any project currently loaded. - \o Ctrl+K, a, Space, and the function name + \o Ctrl+K, a, Space, and the file name \o \image qtcreator-locator-files.png \row \o Go to a file in the current project. - \o Ctrl+K, p, Space, and the function name + \o Ctrl+K, p, Space, and the file name \o \image qtcreator-locator-current-project.png \row \o Go to a class definition. @@ -991,7 +991,7 @@ \o \image qtcreator-locator-classes.png \row \o Go to a method definition. - \o Ctrl+K, m, Space, and the class name + \o Ctrl+K, m, Space, and the method name \o \image qtcreator-locator-methods.png \endtable From 939b4d89c2730289ae051a3e821bf9128d5ed7b4 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 1 Feb 2010 21:19:53 +0100 Subject: [PATCH 3/6] Fixed translation typos QTCREATORBUG-646 and QTCREATORBUG-647. --- share/qtcreator/translations/qtcreator_de.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index f03c99734a4..7c4770d8985 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -1164,7 +1164,7 @@ Populate source file view automatically - Quelldatei-Ansicht wird automatisch aktualisieren + Quelldatei-Ansicht automatisch aktualisieren @@ -5013,7 +5013,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen. Select widget to watch - Widget zwecks Überwachung ausgewählen + Widget zur Überwachung auswählen From e25b457b5938dea65340583bfdd95fe1430c6c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 2 Feb 2010 16:46:43 +0100 Subject: [PATCH 4/6] Avoid drawing a black rectangle due to invalid background for disabled code Regression in commit ab3d3cf413955afabe845bd80676cd468ebbaa80 Reviewed-by: Daniel Molkentin --- src/plugins/texteditor/basetexteditor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index dad53a0c59f..589745315dc 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -1999,13 +1999,13 @@ void BaseTextEditor::paintEvent(QPaintEvent *e) lineX = fontMetrics().averageCharWidth() * d->m_visibleWrapColumn + offset.x() + 4; if (lineX < viewportRect.width()) { - const QColor backgroundColor = d->m_ifdefedOutFormat.background().color(); + const QBrush background = d->m_ifdefedOutFormat.background(); painter.fillRect(QRectF(lineX, er.top(), viewportRect.width() - lineX, er.height()), - backgroundColor); + background); const QColor col = (palette().base().color().value() > 128) ? Qt::black : Qt::white; const QPen pen = painter.pen(); - painter.setPen(blendColors(backgroundColor, col, 32)); + painter.setPen(blendColors(background.color(), col, 32)); painter.drawLine(QPointF(lineX, er.top()), QPointF(lineX, er.bottom())); painter.setPen(pen); } From 0662ba391fdcd6638ca54fdb6193d54d9cb452c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 4 Feb 2010 13:01:50 +0100 Subject: [PATCH 5/6] Fixed the background color of "disabled code" in the grayscale scheme This background color is also used for right margin background and folded code popup. Not setting any resulted in weird affects in those places. --- share/qtcreator/styles/grayscale.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/styles/grayscale.xml b/share/qtcreator/styles/grayscale.xml index 75d92688ece..d56f6f6f908 100644 --- a/share/qtcreator/styles/grayscale.xml +++ b/share/qtcreator/styles/grayscale.xml @@ -5,7 +5,6 @@