[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdevelop/5.3] /: Clean-up duplicated ;;
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-08-15 16:03:01
Message-ID: E1fpyGD-0006PT-AF () code ! kde ! org
[Download RAW message or body]
Git commit dff6fe84eef3141cb6495864dcdbfcef51ed210d by Friedrich W. H. Kossebau.
Committed on 15/08/2018 at 16:01.
Pushed by kossebau into branch '5.3'.
Clean-up duplicated ;;
M +1 -1 app/plasma/runner/kdevelopsessions.cpp
M +1 -1 kdevplatform/language/codegen/templateclassgenerator.cpp
M +1 -1 kdevplatform/language/duchain/topducontextdynamicdata.cpp
M +1 -1 kdevplatform/outputview/tests/test_filteringstrategy.cpp
M +1 -1 kdevplatform/serialization/itemrepository.h
M +1 -1 kdevplatform/shell/tests/test_problemmodel.cpp
M +1 -1 plugins/cmake/cmakeextraargumentshistory.cpp
M +1 -1 plugins/debuggercommon/midebugsession.cpp
M +2 -2 plugins/documentswitcher/documentswitcherplugin.cpp
M +5 -5 plugins/quickopen/duchainitemquickopen.cpp
M +1 -1 plugins/quickopen/expandingtree/expandingtree.cpp
https://commits.kde.org/kdevelop/dff6fe84eef3141cb6495864dcdbfcef51ed210d
diff --git a/app/plasma/runner/kdevelopsessions.cpp \
b/app/plasma/runner/kdevelopsessions.cpp index 112dac49f8..6ce16e74f8 100644
--- a/app/plasma/runner/kdevelopsessions.cpp
+++ b/app/plasma/runner/kdevelopsessions.cpp
@@ -102,7 +102,7 @@ void KDevelopSessions::loadSessions()
session.id = sessionfile.section('/', -2, -2);
KConfig cfg(sessionfile, KConfig::SimpleConfig);
KConfigGroup group = cfg.group(QString());
- session.name = group.readEntry("SessionPrettyContents");;
+ session.name = group.readEntry("SessionPrettyContents");
m_sessions << session;
}
std::sort(m_sessions.begin(), m_sessions.end(), \
kdevelopsessions_runner_compare_sessions);
diff --git a/kdevplatform/language/codegen/templateclassgenerator.cpp \
b/kdevplatform/language/codegen/templateclassgenerator.cpp index \
03af3b1d0c..d3f3027dbe 100644
--- a/kdevplatform/language/codegen/templateclassgenerator.cpp
+++ b/kdevplatform/language/codegen/templateclassgenerator.cpp
@@ -212,7 +212,7 @@ QString TemplateClassGenerator::identifier() const
void TemplateClassGenerator::setIdentifier(const QString& identifier)
{
- d->renderer.addVariable(QStringLiteral("identifier"), identifier);;
+ d->renderer.addVariable(QStringLiteral("identifier"), identifier);
const QStringList separators{
QStringLiteral("::"),
QStringLiteral("."),
diff --git a/kdevplatform/language/duchain/topducontextdynamicdata.cpp \
b/kdevplatform/language/duchain/topducontextdynamicdata.cpp index \
64b43b9ef5..698f4b2220 100644
--- a/kdevplatform/language/duchain/topducontextdynamicdata.cpp
+++ b/kdevplatform/language/duchain/topducontextdynamicdata.cpp
@@ -378,7 +378,7 @@ Item \
TopDUContextDynamicData::DUChainItemStorage<Item>::getItemForIndex(uint \
ind
qCWarning(LANGUAGE) << "item index out of bounds:" << index << "count:" << \
items.size(); return {};
}
- const uint realIndex = index - 1;;
+ const uint realIndex = index - 1;
const auto& item = items.at(realIndex);
if (item) {
//Shortcut, because this is the most common case
diff --git a/kdevplatform/outputview/tests/test_filteringstrategy.cpp \
b/kdevplatform/outputview/tests/test_filteringstrategy.cpp index \
e6d76779bc..88ce65d890 100644
--- a/kdevplatform/outputview/tests/test_filteringstrategy.cpp
+++ b/kdevplatform/outputview/tests/test_filteringstrategy.cpp
@@ -341,7 +341,7 @@ void \
TestFilteringStrategy::testStaticAnalysisFilterStrategy_data()
<< buildCppCheckInformationLine() << FilteredItem::InvalidItem << \
FilteredItem::InvalidItem << UnixFilePathNoSpaces;
for (TestPathType pathType : {UnixFilePathNoSpaces, UnixFilePathWithSpaces}) {
QTest::newRowForPathType("cppcheck-error-line", pathType)
- << buildCppCheckErrorLine(pathType) << FilteredItem::ErrorItem << \
FilteredItem::InvalidItem << pathType;; + << buildCppCheckErrorLine(pathType) \
<< FilteredItem::ErrorItem << FilteredItem::InvalidItem << pathType; \
QTest::newRowForPathType("krazy2-error-line", pathType)
<< buildKrazyErrorLine(pathType) << FilteredItem::ErrorItem << \
FilteredItem::InvalidItem << pathType;
QTest::newRowForPathType("krazy2-error-line-two-colons", pathType)
diff --git a/kdevplatform/serialization/itemrepository.h \
b/kdevplatform/serialization/itemrepository.h index e42903d70b..96e9f30ef2 100644
--- a/kdevplatform/serialization/itemrepository.h
+++ b/kdevplatform/serialization/itemrepository.h
@@ -2107,7 +2107,7 @@ class ItemRepository : public AbstractItemRepository {
offset += BucketStartOffset;
m_file->seek(offset);
uint monsterBucketExtent;
- m_file->read((char*)(&monsterBucketExtent), sizeof(unsigned int));;
+ m_file->read((char*)(&monsterBucketExtent), sizeof(unsigned int));
m_file->seek(offset);
///FIXME: use the data here instead of copying it again in prepareChange
QByteArray data = m_file->read((1+monsterBucketExtent) * \
MyBucket::DataSize);
diff --git a/kdevplatform/shell/tests/test_problemmodel.cpp \
b/kdevplatform/shell/tests/test_problemmodel.cpp index f0fc3f82a5..4c689637cf 100644
--- a/kdevplatform/shell/tests/test_problemmodel.cpp
+++ b/kdevplatform/shell/tests/test_problemmodel.cpp
@@ -250,7 +250,7 @@ void TestProblemModel::testPathGrouping()
// Hint filtering
m_model->setSeverities(IProblem::Hint);
- QCOMPARE(m_model->rowCount(), 1);;
+ QCOMPARE(m_model->rowCount(), 1);
QVERIFY(checkPathGroup(0, m_problems[2]));
// Error + Hint filtering
diff --git a/plugins/cmake/cmakeextraargumentshistory.cpp \
b/plugins/cmake/cmakeextraargumentshistory.cpp index fada39d4ec..14f5e87b15 100644
--- a/plugins/cmake/cmakeextraargumentshistory.cpp
+++ b/plugins/cmake/cmakeextraargumentshistory.cpp
@@ -34,7 +34,7 @@ CMakeExtraArgumentsHistory::CMakeExtraArgumentsHistory(KComboBox* \
widget) {
if (m_arguments) {
KConfigGroup config = \
KSharedConfig::openConfig()->group("CMakeBuildDirChooser");
- QStringList lastExtraArguments = config.readEntry("LastExtraArguments", \
QStringList());; + QStringList lastExtraArguments = \
config.readEntry("LastExtraArguments", QStringList()); \
m_arguments->addItem(QString()); m_arguments->addItems(lastExtraArguments);
m_arguments->setInsertPolicy(QComboBox::InsertAtTop);
diff --git a/plugins/debuggercommon/midebugsession.cpp \
b/plugins/debuggercommon/midebugsession.cpp index 1f7c54a37e..11a1520102 100644
--- a/plugins/debuggercommon/midebugsession.cpp
+++ b/plugins/debuggercommon/midebugsession.cpp
@@ -1089,7 +1089,7 @@ void MIDebugSession::slotInferiorStopped(const MI::AsyncRecord& \
r) const MI::Value& frame = r[QStringLiteral("frame")];
QString file, line, addr;
- if (frame.hasField(QStringLiteral("fullname"))) file = \
frame[QStringLiteral("fullname")].literal();; + if \
(frame.hasField(QStringLiteral("fullname"))) file = \
frame[QStringLiteral("fullname")].literal();
if (frame.hasField(QStringLiteral("line"))) line = \
frame[QStringLiteral("line")].literal();
if (frame.hasField(QStringLiteral("addr"))) addr = \
frame[QStringLiteral("addr")].literal();
diff --git a/plugins/documentswitcher/documentswitcherplugin.cpp \
b/plugins/documentswitcher/documentswitcherplugin.cpp index a746743a0f..e6c538fab1 \
100644
--- a/plugins/documentswitcher/documentswitcherplugin.cpp
+++ b/plugins/documentswitcher/documentswitcherplugin.cpp
@@ -375,7 +375,7 @@ void DocumentSwitcherPlugin::changeView( Sublime::View* view )
documentLists[mainwindow][area].removeAt( idx );
}
qCDebug(PLUGIN_DOCUMENTSWITCHER) << "moving view to front, list should now not \
contain this view anymore" << view << view->document()->title();
- qCDebug(PLUGIN_DOCUMENTSWITCHER) << "current area is:" << area << area->title() \
<< "mainwnidow:" << mainwindow << mainwindow->windowTitle();; + \
qCDebug(PLUGIN_DOCUMENTSWITCHER) << "current area is:" << area << area->title() << \
"mainwindow:" << mainwindow << mainwindow->windowTitle();
qCDebug(PLUGIN_DOCUMENTSWITCHER) << "idx of this view in list:" << \
documentLists[mainwindow][area].indexOf( view ); \
documentLists[mainwindow][area].prepend( view ); enableActions();
@@ -398,7 +398,7 @@ void DocumentSwitcherPlugin::removeView( Sublime::View* view )
}
qCDebug(PLUGIN_DOCUMENTSWITCHER) << "removing view, list should now not contain \
this view anymore" << view << view->document()->title();
- qCDebug(PLUGIN_DOCUMENTSWITCHER) << "current area is:" << area << area->title() \
<< "mainwnidow:" << mainwindow << mainwindow->windowTitle();; + \
qCDebug(PLUGIN_DOCUMENTSWITCHER) << "current area is:" << area << area->title() << \
"mainwindow:" << mainwindow << mainwindow->windowTitle();
qCDebug(PLUGIN_DOCUMENTSWITCHER) << "idx of this view in list:" << \
documentLists[mainwindow][area].indexOf( view ); enableActions();
}
diff --git a/plugins/quickopen/duchainitemquickopen.cpp \
b/plugins/quickopen/duchainitemquickopen.cpp index 633d4adc1f..25e28c2251 100644
--- a/plugins/quickopen/duchainitemquickopen.cpp
+++ b/plugins/quickopen/duchainitemquickopen.cpp
@@ -44,7 +44,7 @@ DUChainItemData::DUChainItemData(const DUChainItem& file, bool \
openDefinition)
QString DUChainItemData::text() const
{
- DUChainReadLocker lock;;
+ DUChainReadLocker lock;
Declaration* decl = m_item.m_item.data();
if (!decl) {
return i18n("Not available any more: %1", m_item.m_text);
@@ -72,7 +72,7 @@ QString DUChainItemData::text() const
QList<QVariant> DUChainItemData::highlighting() const
{
- DUChainReadLocker lock;;
+ DUChainReadLocker lock;
Declaration* decl = m_item.m_item.data();
if (!decl) {
@@ -130,7 +130,7 @@ QString DUChainItemData::htmlDescription() const
return QString();
}
- DUChainReadLocker lock;;
+ DUChainReadLocker lock;
Declaration* decl = m_item.m_item.data();
if (!decl) {
return i18n("Not available any more");
@@ -154,7 +154,7 @@ QString DUChainItemData::htmlDescription() const
bool DUChainItemData::execute(QString& /*filterText*/)
{
- DUChainReadLocker lock;;
+ DUChainReadLocker lock;
Declaration* decl = m_item.m_item.data();
if (!decl) {
return false;
@@ -188,7 +188,7 @@ bool DUChainItemData::isExpandable() const
QWidget* DUChainItemData::expandingWidget() const
{
- DUChainReadLocker lock;;
+ DUChainReadLocker lock;
Declaration* decl = dynamic_cast<KDevelop::Declaration*>(m_item.m_item.data());
if (!decl || !decl->context()) {
diff --git a/plugins/quickopen/expandingtree/expandingtree.cpp \
b/plugins/quickopen/expandingtree/expandingtree.cpp index 7db1ed93c3..e41a222458 \
100644
--- a/plugins/quickopen/expandingtree/expandingtree.cpp
+++ b/plugins/quickopen/expandingtree/expandingtree.cpp
@@ -59,7 +59,7 @@ void ExpandingTree::drawRow(QPainter* painter, const \
QStyleOptionViewItem& optio QAbstractTextDocumentLayout::PaintContext ctx;
// since arbitrary HTML can be shown use a black on white color scheme \
here ctx.palette = QPalette(Qt::black, Qt::white);
- ctx.clip = QRectF(0, 0, rect.width(), rect.height());;
+ ctx.clip = QRectF(0, 0, rect.width(), rect.height());
painter->setViewTransformEnabled(true);
painter->translate(rect.left(), rect.top());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic