diff --git a/src/Character.h b/src/Character.h index cd4e2300c..ced162116 100644 --- a/src/Character.h +++ b/src/Character.h @@ -92,11 +92,11 @@ public: CharacterColor _b = CharacterColor(COLOR_SPACE_DEFAULT, DEFAULT_BACK_COLOR), quint8 _r = DEFAULT_RENDITION, bool _real = true) - : character(_c) - , rendition(_r) - , foregroundColor(_f) - , backgroundColor(_b) - , isRealCharacter(_real) { } + : character(_c) + , rendition(_r) + , foregroundColor(_f) + , backgroundColor(_b) + , isRealCharacter(_real) { } /** The unicode character value for this character. * diff --git a/src/CharacterColor.h b/src/CharacterColor.h index e7ce1ed55..a0a7eb4fa 100644 --- a/src/CharacterColor.h +++ b/src/CharacterColor.h @@ -60,7 +60,7 @@ public: * @param weight Specifies the font weight to use when drawing text with this color. */ explicit ColorEntry(QColor c, FontWeight weight = UseCurrentFormat) - : color(c), fontWeight(weight) {} + : color(c), fontWeight(weight) {} /** * Constructs a new color palette entry with an undefined color, and diff --git a/src/SessionController.cpp b/src/SessionController.cpp index d3e190206..299843f17 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -282,7 +282,7 @@ void SessionController::openUrl(const KUrl& url) { // Clear shell's command line if (!_session->isForegroundProcessActive() - && _bookmarkValidProgramsToClear.contains(_session->foregroundProcessName())) { + && _bookmarkValidProgramsToClear.contains(_session->foregroundProcessName())) { _session->emulation()->sendText(QChar(0x03)); // Ctrl+C _session->emulation()->sendText(QChar('\n')); } @@ -1084,7 +1084,7 @@ void SessionController::enableSearchBar(bool showSearchBar) _searchBar->clearLineEdit(); } else { disconnect(_searchBar, SIGNAL(searchChanged(QString)), this, - SLOT(searchTextChanged(QString))); + SLOT(searchTextChanged(QString))); } } diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp index f3481744b..e10278a15 100644 --- a/src/SessionManager.cpp +++ b/src/SessionManager.cpp @@ -187,7 +187,7 @@ void SessionManager::applyProfile(Session* session, const Profile::Ptr profile , } if ( apply.shouldApply(Profile::TerminalColumns) || - apply.shouldApply(Profile::TerminalRows) ) { + apply.shouldApply(Profile::TerminalRows) ) { const int columns = profile->property(Profile::TerminalColumns); const int rows = profile->property(Profile::TerminalRows); session->setPreferredSize(QSize(columns, rows)); diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 82458aae4..5b0448717 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -1844,7 +1844,7 @@ void TerminalDisplay::mouseMoveEvent(QMouseEvent* ev) Filter::HotSpot* spot = _filterChain->hotSpotAt(charLine, charColumn); if (spot && spot->type() == Filter::HotSpot::Link) { if (_underlineLinks) { - QRegion previousHotspotArea = _mouseOverHotspotArea; + QRegion previousHotspotArea = _mouseOverHotspotArea; _mouseOverHotspotArea = QRegion(); QRect r; if (spot->startLine() == spot->endLine()) { @@ -2174,7 +2174,7 @@ void TerminalDisplay::mouseReleaseEvent(QMouseEvent* ev) if (!_mouseMarks && (ev->button() == Qt::RightButton || ev->button() == Qt::MidButton) && - !(ev->modifiers() & Qt::ShiftModifier)) { + !(ev->modifiers() & Qt::ShiftModifier)) { emit mouseSignal(3, charColumn + 1, charLine + 1 + _scrollBar->value() - _scrollBar->maximum() , @@ -2852,7 +2852,7 @@ void TerminalDisplay::bell(const QString& message) break; case Enum::NotifyBell: KNotification::event(hasFocus() ? "BellVisible" : "BellInvisible", - message, QPixmap(), this); + message, QPixmap(), this); break; case Enum::VisualBell: visualBell(); diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h index 6c7cbd301..bb192292a 100644 --- a/src/TerminalDisplay.h +++ b/src/TerminalDisplay.h @@ -185,12 +185,16 @@ public: * Specifies whether links and email addresses should be opened when * clicked with the mouse. Defaults to false. */ - void setOpenLinksByDirectClick(bool value) { _openLinksByDirectClick = value; } + void setOpenLinksByDirectClick(bool value) { + _openLinksByDirectClick = value; + } /** * Returns true if links and email addresses should be opened when * clicked with the mouse. */ - bool getOpenLinksByDirectClick() const { return _openLinksByDirectClick; } + bool getOpenLinksByDirectClick() const { + return _openLinksByDirectClick; + } void setLineSpacing(uint); diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp index 980c13005..34b37a9ac 100644 --- a/src/ViewContainer.cpp +++ b/src/ViewContainer.cpp @@ -476,30 +476,30 @@ void TabbedViewContainer::startTabDrag(int tab) if (drag->target()) { switch (action) { - case Qt::MoveAction: - // The MoveAction indicates the widget has been successfully - // moved into another tabbar/container, so remove the widget in - // current tabbar/container. - // - // Deleting the view may cause the view container to be deleted, - // which will also delete the QDrag object. This can cause a - // crash if Qt's internal drag-and-drop handling tries to delete - // it later. - // - // For now set the QDrag's parent to 0 so that it won't be - // deleted if this view container is destroyed. - // - // FIXME: Resolve this properly - drag->setParent(0); - removeView(view); - break; - case Qt::IgnoreAction: - // The IgroreAction is used by the tabbar to indicate the - // special case of dropping one tab into its existing position. - // So nothing need to do here. - break; - default: - break; + case Qt::MoveAction: + // The MoveAction indicates the widget has been successfully + // moved into another tabbar/container, so remove the widget in + // current tabbar/container. + // + // Deleting the view may cause the view container to be deleted, + // which will also delete the QDrag object. This can cause a + // crash if Qt's internal drag-and-drop handling tries to delete + // it later. + // + // For now set the QDrag's parent to 0 so that it won't be + // deleted if this view container is destroyed. + // + // FIXME: Resolve this properly + drag->setParent(0); + removeView(view); + break; + case Qt::IgnoreAction: + // The IgroreAction is used by the tabbar to indicate the + // special case of dropping one tab into its existing position. + // So nothing need to do here. + break; + default: + break; } } else { // if the tab is dragged onto something that does not accept this diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index 46fc2a9cc..753204bcc 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -620,12 +620,12 @@ ViewContainer* ViewManager::createContainer() container->setStyleSheet(_navigationStyleSheet); if (_showQuickButtons) { container->setFeatures(container->features() - | ViewContainer::QuickNewView - | ViewContainer::QuickCloseView); + | ViewContainer::QuickNewView + | ViewContainer::QuickCloseView); } else { container->setFeatures(container->features() - & ~ViewContainer::QuickNewView - & ~ViewContainer::QuickCloseView); + & ~ViewContainer::QuickNewView + & ~ViewContainer::QuickCloseView); } // connect signals and slots @@ -1082,12 +1082,12 @@ void ViewManager::setShowQuickButtons(bool show) foreach(ViewContainer* container, _viewSplitter->containers()) { if (_showQuickButtons) { container->setFeatures(container->features() - | ViewContainer::QuickNewView - | ViewContainer::QuickCloseView); + | ViewContainer::QuickNewView + | ViewContainer::QuickCloseView); } else { container->setFeatures(container->features() - & ~ViewContainer::QuickNewView - & ~ViewContainer::QuickCloseView); + & ~ViewContainer::QuickNewView + & ~ViewContainer::QuickCloseView); } } } diff --git a/src/main.cpp b/src/main.cpp index f2343d198..a416d21ca 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -194,7 +194,7 @@ void fillAboutData(KAboutData& aboutData) aboutData.addAuthor(ki18nc("@info:credit", "Kurt Hindenburg"), ki18nc("@info:credit", "General maintainer, bug fixes and general" - " improvements"), + " improvements"), "kurt.hindenburg@gmail.com"); aboutData.addAuthor(ki18nc("@info:credit", "Robert Knight"), ki18nc("@info:credit", "Previous maintainer, ported to KDE4"), @@ -231,18 +231,18 @@ void fillAboutData(KAboutData& aboutData) "Peter.A.Silva@gmail.com"); aboutData.addCredit(ki18nc("@info:credit", "Lotzi Boloni"), ki18nc("@info:credit", "Embedded Konsole\n" - "Toolbar and session names"), + "Toolbar and session names"), "boloni@cs.purdue.edu"); aboutData.addCredit(ki18nc("@info:credit", "David Faure"), ki18nc("@info:credit", "Embedded Konsole\n" - "General improvements"), + "General improvements"), "faure@kde.org"); aboutData.addCredit(ki18nc("@info:credit", "Antonio Larrosa"), ki18nc("@info:credit", "Visual effects"), "larrosa@kde.org"); aboutData.addCredit(ki18nc("@info:credit", "Matthias Ettrich"), ki18nc("@info:credit", "Code from the kvt project\n" - "General improvements"), + "General improvements"), "ettrich@kde.org"); aboutData.addCredit(ki18nc("@info:credit", "Warwick Allison"), ki18nc("@info:credit", "Schema and text selection improvements"), diff --git a/src/tests/CharacterColorTest.cpp b/src/tests/CharacterColorTest.cpp index 3c42f1541..d9d106135 100644 --- a/src/tests/CharacterColorTest.cpp +++ b/src/tests/CharacterColorTest.cpp @@ -70,11 +70,11 @@ void CharacterColorTest::testDummyConstructor() void CharacterColorTest::testColorSpaceDefault_data() { - QTest::addColumn("colorValue"); - QTest::addColumn("expected"); + QTest::addColumn("colorValue"); + QTest::addColumn("expected"); - QTest::newRow("color 0") << 0 << DefaultColorTable[0].color; - QTest::newRow("color 1") << 1 << DefaultColorTable[1].color; + QTest::newRow("color 0") << 0 << DefaultColorTable[0].color; + QTest::newRow("color 1") << 1 << DefaultColorTable[1].color; } void CharacterColorTest::testColorSpaceDefault() @@ -90,12 +90,12 @@ void CharacterColorTest::testColorSpaceDefault() void CharacterColorTest::testColorSpaceSystem_data() { - QTest::addColumn("colorValue"); - QTest::addColumn("expected"); + QTest::addColumn("colorValue"); + QTest::addColumn("expected"); - QTest::newRow("color 0") << 0 << DefaultColorTable[2+0].color; - QTest::newRow("color 1") << 1 << DefaultColorTable[2+1].color; - QTest::newRow("color 7") << 7 << DefaultColorTable[2+7].color; + QTest::newRow("color 0") << 0 << DefaultColorTable[2+0].color; + QTest::newRow("color 1") << 1 << DefaultColorTable[2+1].color; + QTest::newRow("color 7") << 7 << DefaultColorTable[2+7].color; } void CharacterColorTest::testColorSpaceSystem()