mirror of
git://slackware.nl/current.git
synced 2025-01-10 05:25:51 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
--- a/part/search/kateregexp.cpp
|
|
+++ b/part/search/kateregexp.cpp
|
|
@@ -96,7 +96,7 @@
|
|
|
|
case L'n':
|
|
stillMultiLine = true;
|
|
- // FALLTROUGH
|
|
+ __attribute__((fallthrough));
|
|
|
|
default:
|
|
// copy "\?" unmodified
|
|
@@ -164,7 +164,7 @@
|
|
|
|
case L'n':
|
|
stillMultiLine = true;
|
|
- // FALLTROUGH
|
|
+ __attribute__((fallthrough));
|
|
|
|
default:
|
|
// copy "\?" unmodified
|
|
--- a/part/view/kateview.cpp
|
|
+++ b/part/view/kateview.cpp
|
|
@@ -310,7 +310,7 @@
|
|
if (factory())
|
|
factory()->removeClient (this);
|
|
|
|
- KTextEditor::ViewBarContainer *viewBarContainer=qobject_cast<KTextEditor::ViewBarContainer*>( KateGlobal::self()->container() );
|
|
+ KTextEditor::ViewBarContainer *viewBarContainer=qobject_cast<KTextEditor::ViewBarContainer*>( KateGlobal::self()->container() );
|
|
if (viewBarContainer) {
|
|
viewBarContainer->deleteViewBarForView(this,KTextEditor::ViewBarContainer::BottomBar);
|
|
m_bottomViewBar=0;
|
|
--- a/part/view/kateviewaccessible.h
|
|
+++ b/part/view/kateviewaccessible.h
|
|
@@ -248,7 +248,8 @@
|
|
|
|
virtual int navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface **target) const
|
|
{
|
|
- if ((relation == QAccessible::Child || QAccessible::FocusChild) && entry == KateCursorAccessible::ChildId) {
|
|
+ if ((relation == QAccessible::Child || relation == QAccessible::FocusChild) &&
|
|
+ entry == KateCursorAccessible::ChildId) {
|
|
*target = new KateCursorAccessible(view());
|
|
return KateCursorAccessible::ChildId;
|
|
}
|
|
--- a/part/view/kateviewhelpers.cpp
|
|
+++ b/part/view/kateviewhelpers.cpp
|
|
@@ -1703,7 +1703,7 @@
|
|
if (realLine > -1) {
|
|
if (m_viewInternal->cache()->viewLine(z).startCol() == 0) {
|
|
if (m_viRelLineNumbersOn && m_view->viInputMode()) {
|
|
- int diff = abs(realLine - currentLine);
|
|
+ int diff = abs(static_cast<int>(realLine - currentLine));
|
|
if (diff > 0) {
|
|
p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h,
|
|
Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg(diff) );
|