diff options
| author | Peter Penz <[email protected]> | 2012-02-23 17:26:51 +0100 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2012-02-23 17:28:03 +0100 |
| commit | 21a5a890b3010e591e139724d5c6f555df4481f9 (patch) | |
| tree | fb48c65173c9163cdf81c2bc8bc064af3ac0eff3 /src/views | |
| parent | a6627b9f2345eac9cc650aa9f87f9c69db8c707f (diff) | |
Whitespace cleanups and documentation fixes
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/dolphinitemlistcontainer.cpp | 14 | ||||
| -rw-r--r-- | src/views/dolphinitemlistcontainer.h | 2 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 4 | ||||
| -rw-r--r-- | src/views/dolphinview.h | 6 | ||||
| -rw-r--r-- | src/views/draganddrophelper.cpp | 2 | ||||
| -rw-r--r-- | src/views/tooltips/tooltipmanager.cpp | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp index ec1af9549..3b0a9c6b5 100644 --- a/src/views/dolphinitemlistcontainer.cpp +++ b/src/views/dolphinitemlistcontainer.cpp @@ -48,7 +48,7 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister, controller()->setModel(new KFileItemModel(dirLister, this)); m_fileItemListView = new KFileItemListView(); - m_fileItemListView->setWidgetCreator(new KItemListWidgetCreator<DolphinFileItemListWidget>()); + m_fileItemListView->setWidgetCreator(new KItemListWidgetCreator<DolphinFileItemListWidget>()); m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); controller()->setView(m_fileItemListView); @@ -60,7 +60,7 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister, DolphinItemListContainer::~DolphinItemListContainer() { writeSettings(); - + controller()->setView(0); delete m_fileItemListView; m_fileItemListView = 0; @@ -191,7 +191,7 @@ void DolphinItemListContainer::readSettings() } void DolphinItemListContainer::writeSettings() -{ +{ IconsModeSettings::self()->writeConfig(); CompactModeSettings::self()->writeConfig(); DetailsModeSettings::self()->writeConfig(); @@ -217,7 +217,7 @@ void DolphinItemListContainer::updateGridSize() case KFileItemListView::IconsLayout: { const int minItemWidth = 48; itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64; - + if (previewsShown()) { // Optimize the width for previews with a 3:2 aspect ratio instead // of a 1:1 ratio to avoid wasting too much vertical space when @@ -225,12 +225,12 @@ void DolphinItemListContainer::updateGridSize() const int minWidth = iconSize * 3 / 2; itemWidth = qMax(itemWidth, minWidth); } - + if (itemWidth < iconSize + padding * 2) { itemWidth = iconSize + padding * 2; } itemHeight = padding * 3 + iconSize + styleOption.fontMetrics.height(); - + horizontalMargin = 4; verticalMargin = 8; break; @@ -239,7 +239,7 @@ void DolphinItemListContainer::updateGridSize() itemWidth = padding * 4 + iconSize + styleOption.fontMetrics.height() * 5; const int textLinesCount = m_fileItemListView->visibleRoles().count(); itemHeight = padding * 2 + qMax(iconSize, textLinesCount * styleOption.fontMetrics.height()); - + horizontalMargin = 8; break; } diff --git a/src/views/dolphinitemlistcontainer.h b/src/views/dolphinitemlistcontainer.h index fa816b48c..c5a30ad74 100644 --- a/src/views/dolphinitemlistcontainer.h +++ b/src/views/dolphinitemlistcontainer.h @@ -64,7 +64,7 @@ public: void beginTransaction(); void endTransaction(); - void readSettings(); + void readSettings(); void writeSettings(); private: diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 700427ed7..ea7441600 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -451,11 +451,11 @@ void DolphinView::stopLoading() void DolphinView::readSettings() { const int oldZoomLevel = m_container->zoomLevel(); - + GeneralSettings::self()->readConfig(); m_container->readSettings(); applyViewProperties(); - + const int newZoomLevel = m_container->zoomLevel(); if (newZoomLevel != oldZoomLevel) { emit zoomLevelChanged(newZoomLevel, oldZoomLevel); diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 42ad26098..7b7db3f9f 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -269,7 +269,7 @@ public: * font, ...). */ void readSettings(); - + /** * Saves the current settings (e.g. icons size, font, ..). */ @@ -551,7 +551,7 @@ protected: /** @reimp */ virtual void hideEvent(QHideEvent* event); - + private slots: /** * Marks the view as active (DolphinView:isActive() will return true) @@ -766,7 +766,7 @@ private: KUrl m_createdItemUrl; // URL for a new item that got created by the "Create New..." menu QList<KUrl> m_selectedUrls; // Used for making the view to remember selections after F5 - + VersionControlObserver* m_versionControlObserver; // For unit tests diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 2cd1e86e0..45e5076f6 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -49,7 +49,7 @@ QString DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destU return i18nc("@info:status", "A folder cannot be dropped into itself"); } } - + KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow()); } else { KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow()); diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 3c262b749..ed0a9c512 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -44,9 +44,9 @@ ToolTipManager::ToolTipManager(QWidget* parent) : m_itemRect() { if (parent) { - m_margin = qMax(m_margin, parent->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth)); + m_margin = qMax(m_margin, parent->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth)); } - + m_showToolTipTimer = new QTimer(this); m_showToolTipTimer->setSingleShot(true); m_showToolTipTimer->setInterval(500); |
