diff options
| -rw-r--r-- | cmake/DbusInterfaceMacros.cmake | 2 | ||||
| -rw-r--r-- | src/dolphinui.rc | 2 | ||||
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 2 | ||||
| -rw-r--r-- | src/panels/information/pixmapviewer.cpp | 4 | ||||
| -rw-r--r-- | src/panels/places/placespanel.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake index 71ad9067d..1083dfd44 100644 --- a/cmake/DbusInterfaceMacros.cmake +++ b/cmake/DbusInterfaceMacros.cmake @@ -6,7 +6,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu add_custom_target( ${output_xml_file}_target SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} - ) + ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} diff --git a/src/dolphinui.rc b/src/dolphinui.rc index 282ea63e5..076aafa96 100644 --- a/src/dolphinui.rc +++ b/src/dolphinui.rc @@ -6,7 +6,7 @@ <Action name="file_new" /> <Action name="new_tab" /> <Action name="file_close" /> - <Action name="undo_close_tab" /> + <Action name="undo_close_tab" /> <Separator/> <Action name="renamefile" /> <Action name="movetotrash" /> diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 42d8986fc..8145a00f1 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -304,9 +304,9 @@ QString KFileItemModel::roleDescription(const QByteArray& role) const int count = 0; const RoleInfoMap* map = rolesInfoMap(count); for (int i = 0; i < count; ++i) { - if (!map[i].roleTranslation) { - continue; - } + if (!map[i].roleTranslation) { + continue; + } description.insert(map[i].role, i18nc(map[i].roleTranslationContext, map[i].roleTranslation)); } } diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index f56f68ac5..15c01726f 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1225,7 +1225,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() textInfo->staticText.setText(elidedText); requiredWidth = m_customizedFontMetrics.width(elidedText); } else if (role == "rating") { - // Use the width of the rating pixmap, because the rating text is empty. + // Use the width of the rating pixmap, because the rating text is empty. requiredWidth = m_rating.width(); } } diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp index fb0aa032b..311995ec2 100644 --- a/src/panels/information/pixmapviewer.cpp +++ b/src/panels/information/pixmapviewer.cpp @@ -97,14 +97,14 @@ void PixmapViewer::paintEvent(QPaintEvent* event) const bool useOldPixmap = (m_transition == SizeTransition) && (m_oldPixmap.width() > m_pixmap.width()); const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap; - if (!largePixmap.isNull()) { + if (!largePixmap.isNull()) { const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth, scaledHeight, Qt::IgnoreAspectRatio, Qt::FastTransformation); style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, scaledPixmap); - } + } } else { style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, m_pixmap); } diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 224eb0c64..41f50e740 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -93,8 +93,8 @@ bool PlacesPanel::urlChanged() void PlacesPanel::readSettings() { if (m_controller) { - const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1; - m_controller->setAutoActivationDelay(delay); + const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1; + m_controller->setAutoActivationDelay(delay); } } |