Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
System
Dolphin
Commits
2523442d
Commit
2523442d
authored
Mar 05, 2018
by
Elvis Angelaccio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix some compile warnings"
This reverts commit
533f0508
. D10995 has not been approved.
parent
48b58f83
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
8 deletions
+6
-8
src/dolphincontextmenu.cpp
src/dolphincontextmenu.cpp
+0
-1
src/dolphinmainwindow.cpp
src/dolphinmainwindow.cpp
+0
-2
src/dolphintabwidget.cpp
src/dolphintabwidget.cpp
+0
-3
src/kitemviews/kfileitemmodel.cpp
src/kitemviews/kfileitemmodel.cpp
+4
-0
src/kitemviews/kitemlistcontroller.cpp
src/kitemviews/kitemlistcontroller.cpp
+2
-2
No files found.
src/dolphincontextmenu.cpp
View file @
2523442d
...
...
@@ -428,7 +428,6 @@ void DolphinContextMenu::addShowMenuBarAction()
bool
DolphinContextMenu
::
placeExists
(
const
QUrl
&
url
)
const
{
Q_UNUSED
(
url
)
// Creating up a PlacesItemModel to find out if 'url' is one of the Places
// can be expensive because the model asks Solid for the devices which are
// available, which can take some time.
...
...
src/dolphinmainwindow.cpp
View file @
2523442d
...
...
@@ -410,8 +410,6 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
case
QDialogButtonBox
::
No
:
// Close only the current tab
m_tabWidget
->
closeTab
();
// Do not quit, ignore quit event
// fall through
default:
event
->
ignore
();
return
;
...
...
src/dolphintabwidget.cpp
View file @
2523442d
...
...
@@ -92,10 +92,7 @@ void DolphinTabWidget::readProperties(const KConfigGroup& group)
}
else
{
// Tab state created with Dolphin <= 4.14.x
const
QByteArray
state
=
group
.
readEntry
(
"Tab "
%
QString
::
number
(
i
),
QByteArray
());
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
tabPageAt
(
i
)
->
restoreStateV1
(
state
);
#pragma GCC diagnostic pop
}
}
...
...
src/kitemviews/kfileitemmodel.cpp
View file @
2523442d
...
...
@@ -246,6 +246,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
// Copyright (C) 2006 David Faure <faure@kde.org>
QList
<
QUrl
>
urls
;
QList
<
QUrl
>
mostLocalUrls
;
bool
canUseMostLocalUrls
=
true
;
const
ItemData
*
lastAddedItem
=
nullptr
;
for
(
int
index
:
indexes
)
{
...
...
@@ -268,6 +269,9 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
bool
isLocal
;
mostLocalUrls
<<
item
.
mostLocalUrl
(
isLocal
);
if
(
!
isLocal
)
{
canUseMostLocalUrls
=
false
;
}
}
}
...
...
src/kitemviews/kitemlistcontroller.cpp
View file @
2523442d
...
...
@@ -433,8 +433,8 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
}
}
}
//
f
all through
// to the default case and add the Space to the current search string.
//
F
all through
to the default case and add the Space to the current search string.
default:
m_keyboardManager
->
addKeys
(
event
->
text
());
// Make sure unconsumed events get propagated up the chain. #302329
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment