Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
System
Dolphin
Commits
97415729
Commit
97415729
authored
Oct 23, 2020
by
Alexander Lohnau
💬
Committed by
Elvis Angelaccio
Oct 23, 2020
Browse files
Compile with QT_NO_KEYWORDS
parent
a24327cd
Changes
51
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
97415729
...
...
@@ -17,6 +17,7 @@ remove_definitions(
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII
-DQT_NO_FOREACH
-DQT_NO_KEYWORDS
)
##########################################
...
...
src/dolphinmainwindow.cpp
View file @
97415729
...
...
@@ -306,7 +306,7 @@ void DolphinMainWindow::changeUrl(const QUrl &url)
updateViewActions
();
updateGoActions
();
emit
urlChanged
(
url
);
Q_EMIT
urlChanged
(
url
);
}
void
DolphinMainWindow
::
slotTerminalDirectoryChanged
(
const
QUrl
&
url
)
...
...
@@ -341,7 +341,7 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
compareFilesAction
->
setEnabled
(
false
);
}
emit
selectionChanged
(
selection
);
Q_EMIT
selectionChanged
(
selection
);
}
void
DolphinMainWindow
::
updateHistory
()
...
...
@@ -1262,7 +1262,7 @@ void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
updateSearchAction
();
const
QUrl
url
=
viewContainer
->
url
();
emit
urlChanged
(
url
);
Q_EMIT
urlChanged
(
url
);
}
void
DolphinMainWindow
::
tabCountChanged
(
int
count
)
...
...
@@ -2108,7 +2108,7 @@ void DolphinMainWindow::refreshViews()
updateWindowTitle
();
}
emit
settingsChanged
();
Q_EMIT
settingsChanged
();
}
void
DolphinMainWindow
::
clearStatusBar
()
...
...
src/dolphinnewfilemenu.cpp
View file @
97415729
...
...
@@ -25,7 +25,7 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
void
DolphinNewFileMenu
::
slotResult
(
KJob
*
job
)
{
if
(
job
->
error
())
{
emit
errorMessage
(
job
->
errorString
());
Q_EMIT
errorMessage
(
job
->
errorString
());
}
else
{
KNewFileMenu
::
slotResult
(
job
);
}
...
...
src/dolphinpart.cpp
View file @
97415729
...
...
@@ -234,7 +234,7 @@ void DolphinPart::createGoAction(const char* name, const char* iconName,
void
DolphinPart
::
slotGoTriggered
(
QAction
*
action
)
{
const
QString
url
=
action
->
data
().
toString
();
emit
m_extension
->
openUrlRequest
(
QUrl
(
url
));
Q_EMIT
m_extension
->
openUrlRequest
(
QUrl
(
url
));
}
void
DolphinPart
::
slotSelectionChanged
(
const
KFileItemList
&
selection
)
...
...
@@ -251,8 +251,8 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
if
(
!
hasSelection
)
{
stateChanged
(
QStringLiteral
(
"has_no_selection"
));
emit
m_extension
->
enableAction
(
"cut"
,
false
);
emit
m_extension
->
enableAction
(
"copy"
,
false
);
Q_EMIT
m_extension
->
enableAction
(
"cut"
,
false
);
Q_EMIT
m_extension
->
enableAction
(
"copy"
,
false
);
deleteWithTrashShortcut
->
setEnabled
(
false
);
editMimeTypeAction
->
setEnabled
(
false
);
}
else
{
...
...
@@ -269,16 +269,16 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
deleteWithTrashShortcut
->
setEnabled
(
capabilities
.
supportsDeleting
()
&&
!
enableMoveToTrash
);
editMimeTypeAction
->
setEnabled
(
true
);
propertiesAction
->
setEnabled
(
true
);
emit
m_extension
->
enableAction
(
"cut"
,
capabilities
.
supportsMoving
());
emit
m_extension
->
enableAction
(
"copy"
,
true
);
Q_EMIT
m_extension
->
enableAction
(
"cut"
,
capabilities
.
supportsMoving
());
Q_EMIT
m_extension
->
enableAction
(
"copy"
,
true
);
}
}
void
DolphinPart
::
updatePasteAction
()
{
QPair
<
bool
,
QString
>
pasteInfo
=
m_view
->
pasteInfo
();
emit
m_extension
->
enableAction
(
"paste"
,
pasteInfo
.
first
);
emit
m_extension
->
setActionText
(
"paste"
,
pasteInfo
.
second
);
Q_EMIT
m_extension
->
enableAction
(
"paste"
,
pasteInfo
.
first
);
Q_EMIT
m_extension
->
setActionText
(
"paste"
,
pasteInfo
.
second
);
}
KAboutData
*
DolphinPart
::
createAboutData
()
...
...
@@ -302,13 +302,13 @@ bool DolphinPart::openUrl(const QUrl &url)
visibleUrl
.
setPath
(
visibleUrl
.
path
()
+
'/'
+
m_nameFilter
);
}
QString
prettyUrl
=
visibleUrl
.
toDisplayString
(
QUrl
::
PreferLocalFile
);
emit
setWindowCaption
(
prettyUrl
);
emit
m_extension
->
setLocationBarUrl
(
prettyUrl
);
emit
started
(
nullptr
);
// get the wheel to spin
Q_EMIT
setWindowCaption
(
prettyUrl
);
Q_EMIT
m_extension
->
setLocationBarUrl
(
prettyUrl
);
Q_EMIT
started
(
nullptr
);
// get the wheel to spin
m_view
->
setNameFilter
(
m_nameFilter
);
m_view
->
setUrl
(
url
);
updatePasteAction
();
emit
aboutToOpenURL
();
Q_EMIT
aboutToOpenURL
();
if
(
reload
)
m_view
->
reload
();
// Disable "Find File" and "Open Terminal" actions for non-file URLs,
...
...
@@ -323,24 +323,24 @@ bool DolphinPart::openUrl(const QUrl &url)
void
DolphinPart
::
slotMessage
(
const
QString
&
msg
)
{
emit
setStatusBarText
(
msg
);
Q_EMIT
setStatusBarText
(
msg
);
}
void
DolphinPart
::
slotErrorMessage
(
const
QString
&
msg
)
{
qCDebug
(
DolphinDebug
)
<<
msg
;
emit
canceled
(
msg
);
Q_EMIT
canceled
(
msg
);
//KMessageBox::error(m_view, msg);
}
void
DolphinPart
::
slotRequestItemInfo
(
const
KFileItem
&
item
)
{
emit
m_extension
->
mouseOverInfo
(
item
);
Q_EMIT
m_extension
->
mouseOverInfo
(
item
);
if
(
item
.
isNull
())
{
updateStatusBar
();
}
else
{
const
QString
escapedText
=
Qt
::
convertFromPlainText
(
item
.
getStatusBarInfo
());
emit
ReadOnlyPart
::
setStatusBarText
(
QStringLiteral
(
"<qt>%1</qt>"
).
arg
(
escapedText
));
Q_EMIT
ReadOnlyPart
::
setStatusBarText
(
QStringLiteral
(
"<qt>%1</qt>"
).
arg
(
escapedText
));
}
}
...
...
@@ -357,7 +357,7 @@ void DolphinPart::slotItemActivated(const KFileItem& item)
// since the idea was not to need BrowserArguments for non-browser stuff...
KParts
::
BrowserArguments
browserArgs
;
browserArgs
.
trustedSource
=
true
;
emit
m_extension
->
openUrlRequest
(
item
.
targetUrl
(),
args
,
browserArgs
);
Q_EMIT
m_extension
->
openUrlRequest
(
item
.
targetUrl
(),
args
,
browserArgs
);
}
void
DolphinPart
::
slotItemsActivated
(
const
KFileItemList
&
items
)
...
...
@@ -371,7 +371,7 @@ void DolphinPart::createNewWindow(const QUrl& url)
{
// TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
// should be moved into DolphinPart::slotItemActivated()
emit
m_extension
->
createNewWindow
(
url
);
Q_EMIT
m_extension
->
createNewWindow
(
url
);
}
void
DolphinPart
::
slotOpenContextMenu
(
const
QPoint
&
pos
,
...
...
@@ -448,7 +448,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
actionGroups
.
insert
(
QStringLiteral
(
"editactions"
),
editActions
);
emit
m_extension
->
popupMenu
(
pos
,
Q_EMIT
m_extension
->
popupMenu
(
pos
,
items
,
KParts
::
OpenUrlArguments
(),
KParts
::
BrowserArguments
(),
...
...
@@ -462,7 +462,7 @@ void DolphinPart::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUr
if
(
oldUrl
.
matches
(
url
(),
QUrl
::
StripTrailingSlash
/* #207572 */
))
{
KParts
::
ReadOnlyPart
::
setUrl
(
newUrl
);
const
QString
prettyUrl
=
newUrl
.
toDisplayString
(
QUrl
::
PreferLocalFile
);
emit
m_extension
->
setLocationBarUrl
(
prettyUrl
);
Q_EMIT
m_extension
->
setLocationBarUrl
(
prettyUrl
);
}
}
...
...
@@ -579,12 +579,12 @@ void DolphinPart::updateNewMenu()
void
DolphinPart
::
updateStatusBar
()
{
const
QString
escapedText
=
Qt
::
convertFromPlainText
(
m_view
->
statusBarText
());
emit
ReadOnlyPart
::
setStatusBarText
(
QStringLiteral
(
"<qt>%1</qt>"
).
arg
(
escapedText
));
Q_EMIT
ReadOnlyPart
::
setStatusBarText
(
QStringLiteral
(
"<qt>%1</qt>"
).
arg
(
escapedText
));
}
void
DolphinPart
::
updateProgress
(
int
percent
)
{
emit
m_extension
->
loadingProgress
(
percent
);
Q_EMIT
m_extension
->
loadingProgress
(
percent
);
}
void
DolphinPart
::
createDirectory
()
...
...
src/dolphinpart_ext.cpp
View file @
97415729
...
...
@@ -164,11 +164,11 @@ KParts::ListingNotificationExtension::NotificationEventTypes DolphinPartListingN
void
DolphinPartListingNotificationExtension
::
slotNewItems
(
const
KFileItemList
&
items
)
{
emit
listingEvent
(
KParts
::
ListingNotificationExtension
::
ItemsAdded
,
items
);
Q_EMIT
listingEvent
(
KParts
::
ListingNotificationExtension
::
ItemsAdded
,
items
);
}
void
DolphinPartListingNotificationExtension
::
slotItemsDeleted
(
const
KFileItemList
&
items
)
{
emit
listingEvent
(
KParts
::
ListingNotificationExtension
::
ItemsDeleted
,
items
);
Q_EMIT
listingEvent
(
KParts
::
ListingNotificationExtension
::
ItemsDeleted
,
items
);
}
src/dolphinrecenttabsmenu.cpp
View file @
97415729
...
...
@@ -43,7 +43,7 @@ void DolphinRecentTabsMenu::rememberClosedTab(const QUrl& url, const QByteArray&
}
else
{
insertAction
(
menu
()
->
actions
().
at
(
2
),
action
);
}
emit
closedTabsCountChanged
(
menu
()
->
actions
().
size
()
-
2
);
Q_EMIT
closedTabsCountChanged
(
menu
()
->
actions
().
size
()
-
2
);
// Assure that only up to 6 closed tabs are shown in the menu.
// 8 because of clear action + separator + 6 closed tabs
if
(
menu
()
->
actions
().
size
()
>
8
)
{
...
...
@@ -69,14 +69,14 @@ void DolphinRecentTabsMenu::handleAction(QAction* action)
for
(
int
i
=
2
;
i
<
count
;
++
i
)
{
removeAction
(
actions
.
at
(
i
));
}
emit
closedTabsCountChanged
(
0
);
Q_EMIT
closedTabsCountChanged
(
0
);
}
else
{
const
QByteArray
state
=
action
->
data
().
toByteArray
();
removeAction
(
action
);
delete
action
;
action
=
nullptr
;
emit
restoreClosedTab
(
state
);
emit
closedTabsCountChanged
(
menu
()
->
actions
().
size
()
-
2
);
Q_EMIT
restoreClosedTab
(
state
);
Q_EMIT
closedTabsCountChanged
(
menu
()
->
actions
().
size
()
-
2
);
}
if
(
menu
()
->
actions
().
count
()
<=
2
)
{
...
...
src/dolphintabbar.cpp
View file @
97415729
...
...
@@ -71,7 +71,7 @@ void DolphinTabBar::dropEvent(QDropEvent* event)
const
int
index
=
tabAt
(
event
->
pos
());
if
(
index
>=
0
&&
mimeData
->
hasUrls
())
{
emit
tabDropEvent
(
index
,
event
);
Q_EMIT
tabDropEvent
(
index
,
event
);
}
QTabBar
::
dropEvent
(
event
);
...
...
@@ -96,7 +96,7 @@ void DolphinTabBar::mouseReleaseEvent(QMouseEvent *event)
if
(
index
>=
0
&&
index
==
m_tabToBeClosedOnMiddleMouseButtonRelease
&&
event
->
button
()
==
Qt
::
MiddleButton
)
{
// Mouse middle click on a tab closes this tab.
emit
tabCloseRequested
(
index
);
Q_EMIT
tabCloseRequested
(
index
);
return
;
}
...
...
@@ -110,7 +110,7 @@ void DolphinTabBar::mouseDoubleClickEvent(QMouseEvent* event)
if
(
index
<
0
)
{
// Double click on the empty tabbar area opens a new activated tab
// with the url from the current tab.
emit
openNewActivatedTab
(
currentIndex
());
Q_EMIT
openNewActivatedTab
(
currentIndex
());
return
;
}
...
...
@@ -132,19 +132,19 @@ void DolphinTabBar::contextMenuEvent(QContextMenuEvent* event)
QAction
*
selectedAction
=
menu
.
exec
(
event
->
globalPos
());
if
(
selectedAction
==
newTabAction
)
{
emit
openNewActivatedTab
(
index
);
Q_EMIT
openNewActivatedTab
(
index
);
}
else
if
(
selectedAction
==
detachTabAction
)
{
emit
tabDetachRequested
(
index
);
Q_EMIT
tabDetachRequested
(
index
);
}
else
if
(
selectedAction
==
closeOtherTabsAction
)
{
const
int
tabCount
=
count
();
for
(
int
i
=
0
;
i
<
index
;
i
++
)
{
emit
tabCloseRequested
(
0
);
Q_EMIT
tabCloseRequested
(
0
);
}
for
(
int
i
=
index
+
1
;
i
<
tabCount
;
i
++
)
{
emit
tabCloseRequested
(
1
);
Q_EMIT
tabCloseRequested
(
1
);
}
}
else
if
(
selectedAction
==
closeTabAction
)
{
emit
tabCloseRequested
(
index
);
Q_EMIT
tabCloseRequested
(
index
);
}
return
;
...
...
src/dolphintabpage.cpp
View file @
97415729
...
...
@@ -329,15 +329,15 @@ void DolphinTabPage::slotViewActivated()
this
,
&
DolphinTabPage
::
activeViewUrlChanged
);
connect
(
newActiveView
,
&
DolphinView
::
redirection
,
this
,
&
DolphinTabPage
::
slotViewUrlRedirection
);
emit
activeViewChanged
(
activeViewContainer
());
emit
activeViewUrlChanged
(
activeViewContainer
()
->
url
());
Q_EMIT
activeViewChanged
(
activeViewContainer
());
Q_EMIT
activeViewUrlChanged
(
activeViewContainer
()
->
url
());
}
void
DolphinTabPage
::
slotViewUrlRedirection
(
const
QUrl
&
oldUrl
,
const
QUrl
&
newUrl
)
{
Q_UNUSED
(
oldUrl
)
emit
activeViewUrlChanged
(
newUrl
);
Q_EMIT
activeViewUrlChanged
(
newUrl
);
}
void
DolphinTabPage
::
switchActiveView
()
...
...
src/dolphintabwidget.cpp
View file @
97415729
...
...
@@ -258,7 +258,7 @@ void DolphinTabWidget::closeTab(const int index)
}
DolphinTabPage
*
tabPage
=
tabPageAt
(
index
);
emit
rememberClosedTab
(
tabPage
->
activeViewContainer
()
->
url
(),
tabPage
->
saveState
());
Q_EMIT
rememberClosedTab
(
tabPage
->
activeViewContainer
()
->
url
(),
tabPage
->
saveState
());
removeTab
(
index
);
tabPage
->
deleteLater
();
...
...
@@ -392,7 +392,7 @@ void DolphinTabWidget::tabUrlChanged(const QUrl& url)
// Emit the currentUrlChanged signal if the url of the current tab has been changed.
if
(
index
==
currentIndex
())
{
emit
currentUrlChanged
(
url
);
Q_EMIT
currentUrlChanged
(
url
);
}
}
}
...
...
@@ -405,8 +405,8 @@ void DolphinTabWidget::currentTabChanged(int index)
}
DolphinTabPage
*
tabPage
=
tabPageAt
(
index
);
DolphinViewContainer
*
viewContainer
=
tabPage
->
activeViewContainer
();
emit
activeViewChanged
(
viewContainer
);
emit
currentUrlChanged
(
viewContainer
->
url
());
Q_EMIT
activeViewChanged
(
viewContainer
);
Q_EMIT
currentUrlChanged
(
viewContainer
->
url
());
tabPage
->
setActive
(
true
);
m_lastViewedTab
=
index
;
}
...
...
@@ -430,7 +430,7 @@ void DolphinTabWidget::tabInserted(int index)
tabBar
()
->
show
();
}
emit
tabCountChanged
(
count
());
Q_EMIT
tabCountChanged
(
count
());
}
void
DolphinTabWidget
::
tabRemoved
(
int
index
)
...
...
@@ -443,7 +443,7 @@ void DolphinTabWidget::tabRemoved(int index)
tabBar
()
->
hide
();
}
emit
tabCountChanged
(
count
());
Q_EMIT
tabCountChanged
(
count
());
}
QString
DolphinTabWidget
::
tabName
(
DolphinTabPage
*
tabPage
)
const
...
...
src/dolphinviewcontainer.cpp
View file @
97415729
...
...
@@ -410,7 +410,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
m_searchModeEnabled
=
enabled
;
emit
searchModeEnabledChanged
(
enabled
);
Q_EMIT
searchModeEnabledChanged
(
enabled
);
}
bool
DolphinViewContainer
::
isSearchModeEnabled
()
const
...
...
@@ -658,7 +658,7 @@ void DolphinViewContainer::closeFilterBar()
{
m_filterBar
->
closeFilterBar
();
m_view
->
setFocus
();
emit
showFilterBarChanged
(
false
);
Q_EMIT
showFilterBarChanged
(
false
);
}
void
DolphinViewContainer
::
setNameFilter
(
const
QString
&
nameFilter
)
...
...
src/filterbar/filterbar.cpp
View file @
97415729
...
...
@@ -106,7 +106,7 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
switch
(
event
->
key
())
{
case
Qt
::
Key_Escape
:
if
(
m_filterInput
->
text
().
isEmpty
())
{
emit
closeRequest
();
Q_EMIT
closeRequest
();
}
else
{
m_filterInput
->
clear
();
}
...
...
@@ -114,7 +114,7 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
case
Qt
::
Key_Enter
:
case
Qt
::
Key_Return
:
emit
focusViewRequest
();
Q_EMIT
focusViewRequest
();
break
;
default:
...
...
src/kitemviews/kfileitemmodel.cpp
View file @
97415729
...
...
@@ -487,7 +487,7 @@ void KFileItemModel::setRoles(const QSet<QByteArray>& roles)
m_itemData
[
i
]
->
values
=
retrieveData
(
m_itemData
.
at
(
i
)
->
item
,
m_itemData
.
at
(
i
)
->
parent
);
}
emit
itemsChanged
(
KItemRangeList
()
<<
KItemRange
(
0
,
count
()),
changedRoles
);
Q_EMIT
itemsChanged
(
KItemRangeList
()
<<
KItemRange
(
0
,
count
()),
changedRoles
);
}
// Clear the 'values' of all filtered items. They will be re-populated with the
...
...
@@ -892,13 +892,13 @@ void KFileItemModel::resortAllItems()
movedToIndexes
.
append
(
newIndex
);
}
emit
itemsMoved
(
KItemRange
(
firstMovedIndex
,
movedItemsCount
),
movedToIndexes
);
Q_EMIT
itemsMoved
(
KItemRange
(
firstMovedIndex
,
movedItemsCount
),
movedToIndexes
);
}
else
if
(
groupedSorting
())
{
// The groups might have changed even if the order of the items has not.
const
QList
<
QPair
<
int
,
QVariant
>
>
oldGroups
=
m_groups
;
m_groups
.
clear
();
if
(
groups
()
!=
oldGroups
)
{
emit
groupsChanged
();
Q_EMIT
groupsChanged
();
}
}
...
...
@@ -934,7 +934,7 @@ void KFileItemModel::slotCompleted()
m_urlsToExpand
.
clear
();
}
emit
directoryLoadingCompleted
();
Q_EMIT
directoryLoadingCompleted
();
}
void
KFileItemModel
::
slotCanceled
()
...
...
@@ -942,7 +942,7 @@ void KFileItemModel::slotCanceled()
m_maximumUpdateIntervalTimer
->
stop
();
dispatchPendingItemsToInsert
();
emit
directoryLoadingCanceled
();
Q_EMIT
directoryLoadingCanceled
();
}
void
KFileItemModel
::
slotItemsAdded
(
const
QUrl
&
directoryUrl
,
const
KFileItemList
&
items
)
...
...
@@ -1143,7 +1143,7 @@ void KFileItemModel::slotClear()
qDeleteAll
(
m_itemData
);
m_itemData
.
clear
();
m_items
.
clear
();
emit
itemsRemoved
(
KItemRangeList
()
<<
KItemRange
(
0
,
removedCount
));
Q_EMIT
itemsRemoved
(
KItemRangeList
()
<<
KItemRange
(
0
,
removedCount
));
}
m_expandedDirs
.
clear
();
...
...
@@ -1259,7 +1259,7 @@ void KFileItemModel::insertItems(QList<ItemData*>& newItems)
// It will be re-populated with the updated indices if index(const QUrl&) is called.
m_items
.
clear
();
emit
itemsInserted
(
itemRanges
);
Q_EMIT
itemsInserted
(
itemRanges
);
#ifdef KFILEITEMMODEL_DEBUG
qCDebug
(
DolphinDebug
)
<<
"[TIME] Inserting of"
<<
newItems
.
count
()
<<
"items:"
<<
timer
.
elapsed
();
...
...
@@ -1312,7 +1312,7 @@ void KFileItemModel::removeItems(const KItemRangeList& itemRanges, RemoveItemsBe
// It will be re-populated with the updated indices if index(const QUrl&) is called.
m_items
.
clear
();
emit
itemsRemoved
(
itemRanges
);
Q_EMIT
itemsRemoved
(
itemRanges
);
}
QList
<
KFileItemModel
::
ItemData
*>
KFileItemModel
::
createItemDataList
(
const
QUrl
&
parentUrl
,
const
KFileItemList
&
items
)
const
...
...
@@ -1428,7 +1428,7 @@ void KFileItemModel::removeExpandedItems()
void
KFileItemModel
::
emitItemsChangedAndTriggerResorting
(
const
KItemRangeList
&
itemRanges
,
const
QSet
<
QByteArray
>&
changedRoles
)
{
emit
itemsChanged
(
itemRanges
,
changedRoles
);
Q_EMIT
itemsChanged
(
itemRanges
,
changedRoles
);
// Trigger a resorting if necessary. Note that this can happen even if the sort
// role has not changed at all because the file name can be used as a fallback.
...
...
@@ -2307,14 +2307,14 @@ void KFileItemModel::emitSortProgress(int resolvedCount)
resortAllItems
();
}
emit
directorySortingProgress
(
100
);
Q_EMIT
directorySortingProgress
(
100
);
}
else
if
(
itemCount
>
0
)
{
resolvedCount
=
qBound
(
0
,
resolvedCount
,
itemCount
);
const
int
progress
=
resolvedCount
*
100
/
itemCount
;
if
(
m_sortingProgressPercent
!=
progress
)
{
m_sortingProgressPercent
=
progress
;
emit
directorySortingProgress
(
progress
);
Q_EMIT
directorySortingProgress
(
progress
);
}
}
}
...
...
src/kitemviews/kitemlistcontroller.cpp
View file @
97415729
...
...
@@ -110,7 +110,7 @@ void KItemListController::setModel(KItemModelBase* model)
m_selectionManager
->
setModel
(
m_model
);
emit
modelChanged
(
m_model
,
oldModel
);
Q_EMIT
modelChanged
(
m_model
,
oldModel
);
}
KItemModelBase
*
KItemListController
::
model
()
const
...
...
@@ -145,7 +145,7 @@ void KItemListController::setView(KItemListView* view)
updateExtendedSelectionRegion
();
}
emit
viewChanged
(
m_view
,
oldView
);
Q_EMIT
viewChanged
(
m_view
,
oldView
);
}
KItemListView
*
KItemListController
::
view
()
const
...
...
@@ -373,11 +373,11 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
case
Qt
::
Key_Return
:
{
const
KItemSet
selectedItems
=
m_selectionManager
->
selectedItems
();
if
(
selectedItems
.
count
()
>=
2
)
{
emit
itemsActivated
(
selectedItems
);
Q_EMIT
itemsActivated
(
selectedItems
);
}
else
if
(
selectedItems
.
count
()
==
1
)
{
emit
itemActivated
(
selectedItems
.
first
());
Q_EMIT
itemActivated
(
selectedItems
.
first
());
}
else
{
emit
itemActivated
(
index
);
Q_EMIT
itemActivated
(
index
);
}
break
;
}
...
...
@@ -398,9 +398,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
if
(
index
>=
0
)
{
const
QRectF
contextRect
=
m_view
->
itemContextRect
(
index
);
const
QPointF
pos
(
m_view
->
scene
()
->
views
().
first
()
->
mapToGlobal
(
contextRect
.
bottomRight
().
toPoint
()));
emit
itemContextMenuRequested
(
index
,
pos
);
Q_EMIT
itemContextMenuRequested
(
index
,
pos
);
}
else
{
emit
viewContextMenuRequested
(
QCursor
::
pos
());
Q_EMIT
viewContextMenuRequested
(
QCursor
::
pos
());
}
break
;
}
...
...
@@ -410,7 +410,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
m_selectionManager
->
clearSelection
();
}
m_keyboardManager
->
cancelSearch
();
emit
escapePressed
();
Q_EMIT
escapePressed
();
break
;
case
Qt
::
Key_Space
:
...
...
@@ -524,7 +524,7 @@ void KItemListController::slotAutoActivationTimeout()
const
bool
expanded
=
m_model
->
isExpanded
(
index
);
m_model
->
setExpanded
(
index
,
!
expanded
);
}
else
if
(
m_autoActivationBehavior
!=
ExpansionOnly
)
{
emit
itemActivated
(
index
);
Q_EMIT
itemActivated
(
index
);
}
}
}
...
...
@@ -642,7 +642,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
return
false
;
}
emit
mouseButtonReleased
(
m_pressedIndex
,
event
->
buttons
());
Q_EMIT
mouseButtonReleased
(
m_pressedIndex
,
event
->
buttons
());
return
onRelease
(
transform
.
map
(
event
->
pos
()),
event
->
modifiers
(),
event
->
button
(),
false
);
}
...
...
@@ -664,13 +664,13 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
m_selectionManager
->
clearSelection
();
if
(
index
>=
0
)
{
m_selectionManager
->
setSelected
(
index
);
emit
itemContextMenuRequested
(
index
,
event
->
screenPos
());
Q_EMIT
itemContextMenuRequested
(
index
,
event
->
screenPos
());
}
else
{
const
QRectF
headerBounds
=
m_view
->
headerBoundaries
();
if
(
headerBounds
.
contains
(
event
->
pos
()))
{
emit
headerContextMenuRequested
(
event
->
screenPos
());
Q_EMIT
headerContextMenuRequested
(
event
->
screenPos
());
}
else
{
emit
viewContextMenuRequested
(
event
->
screenPos
());
Q_EMIT
viewContextMenuRequested
(
event
->
screenPos
());
}
}
return
true
;
...
...
@@ -680,7 +680,7 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
(
event
->
button
()
&
Qt
::
LeftButton
)
&&
index
>=
0
&&
index
<
m_model
->
count
();
if
(
emitItemActivated
)
{
emit
itemActivated
(
index
);
Q_EMIT
itemActivated
(
index
);
}
return
false
;
}
...
...
@@ -707,7 +707,7 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con
KItemListWidget
*
widget
=
hoveredWidget
();
if
(
widget
)
{
widget
->
setHovered
(
false
);
emit
itemUnhovered
(
widget
->
index
());
Q_EMIT
itemUnhovered
(
widget
->
index
());
}
return
false
;
}
...
...
@@ -730,7 +730,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
if
(
oldHoveredWidget
)
{
oldHoveredWidget
->
setHovered
(
false
);
emit
itemUnhovered
(
oldHoveredWidget
->
index
());
Q_EMIT
itemUnhovered
(
oldHoveredWidget
->
index
());
}
}
...
...
@@ -753,7 +753,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
m_view
->
hideDropIndicator
();
if
(
!
newHoveredWidget
->
isHovered
())
{
newHoveredWidget
->
setHovered
(
true
);
emit
itemHovered
(
index
);
Q_EMIT
itemHovered
(
index
);
}
if
(
!
m_autoActivationTimer
->
isActive
()
&&
m_autoActivationTimer
->
interval
()
>=
0
)
{
...
...
@@ -765,7 +765,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
m_autoActivationTimer
->
stop
();
if
(
newHoveredWidget
&&
newHoveredWidget
->
isHovered
())
{
newHoveredWidget
->
setHovered
(
false
);
emit
itemUnhovered
(
index
);
Q_EMIT
itemUnhovered
(
index
);
}
}
}
else
{
...
...
@@ -802,10 +802,10 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT
if
(
dropAboveIndex
>=
0
)
{
// Something has been dropped between two items.
m_view
->
hideDropIndicator
();
emit
aboveItemDropEvent
(
dropAboveIndex
,
event
);
Q_EMIT
aboveItemDropEvent
(
dropAboveIndex
,
event
);
}
else
if
(
!
event
->
mimeData
()
->
hasFormat
(
m_model
->
blacklistItemDropEventMimeType
()))
{
// Something has been dropped on an item or on an empty part of the view.
emit
itemDropEvent
(
m_view
->
itemAt
(
pos
),
event
);