From d752f3e6952a487155aac504d7b70098534782d7 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 24 Sep 2008 12:32:55 +0000 Subject: [PATCH] rename setter/getter for showing previews to be naming guidelines conform svn path=/trunk/KDE/kdebase/apps/; revision=864303 --- src/dolphincolumnwidget.cpp | 4 ++-- src/dolphinview.cpp | 6 +++--- src/kfilepreviewgenerator.cpp | 22 +++++++++++----------- src/kfilepreviewgenerator.h | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index 9db1891df..176431b65 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -133,7 +133,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, } m_previewGenerator = new KFilePreviewGenerator(this, m_proxyModel); - m_previewGenerator->setShowPreview(m_view->m_controller->dolphinView()->showPreview()); + m_previewGenerator->setPreviewShown(m_view->m_controller->dolphinView()->showPreview()); if (DolphinSettings::instance().generalSettings()->showToolTips()) { new ToolTipManager(this, m_proxyModel); @@ -214,7 +214,7 @@ void DolphinColumnWidget::setShowHiddenFiles(bool show) void DolphinColumnWidget::setShowPreview(bool show) { - m_previewGenerator->setShowPreview(show); + m_previewGenerator->setPreviewShown(show); m_dirLister->stop(); m_dirLister->openUrl(m_url, KDirLister::Reload); diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index b5ea609f0..c5e637c16 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -657,7 +657,7 @@ void DolphinView::setShowPreview(bool show) props.setShowPreview(show); m_showPreview = show; - m_previewGenerator->setShowPreview(show); + m_previewGenerator->setPreviewShown(show); const int oldZoomLevel = m_controller->zoomLevel(); emit showPreviewChanged(); @@ -1107,7 +1107,7 @@ void DolphinView::applyViewProperties(const KUrl& url) const bool showPreview = props.showPreview(); if (showPreview != m_showPreview) { m_showPreview = showPreview; - m_previewGenerator->setShowPreview(showPreview); + m_previewGenerator->setPreviewShown(showPreview); const int oldZoomLevel = m_controller->zoomLevel(); emit showPreviewChanged(); @@ -1182,7 +1182,7 @@ void DolphinView::createView() view->setSelectionMode(QAbstractItemView::ExtendedSelection); m_previewGenerator = new KFilePreviewGenerator(view, m_proxyModel); - m_previewGenerator->setShowPreview(m_showPreview); + m_previewGenerator->setPreviewShown(m_showPreview); if (DolphinSettings::instance().generalSettings()->showToolTips()) { m_toolTipManager = new ToolTipManager(view, m_proxyModel); diff --git a/src/kfilepreviewgenerator.cpp b/src/kfilepreviewgenerator.cpp index cb93a7f07..c3f50ce12 100644 --- a/src/kfilepreviewgenerator.cpp +++ b/src/kfilepreviewgenerator.cpp @@ -243,7 +243,7 @@ public: QPixmap pixmap; }; - bool m_showPreview; + bool m_previewShown; /** * True, if m_pendingItems and m_dispatchedItems should be @@ -291,7 +291,7 @@ private: KFilePreviewGenerator::Private::Private(KFilePreviewGenerator* parent, KAbstractViewAdapter* viewAdapter, QAbstractProxyModel* model) : - m_showPreview(true), + m_previewShown(true), m_clearItemQueues(true), m_hasCutSelection(false), m_pendingVisiblePreviews(0), @@ -310,7 +310,7 @@ KFilePreviewGenerator::Private::Private(KFilePreviewGenerator* parent, q(parent) { if (!m_viewAdapter->iconSize().isValid()) { - m_showPreview = false; + m_previewShown = false; } m_dirModel = static_cast(m_proxyModel->sourceModel()); @@ -353,7 +353,7 @@ void KFilePreviewGenerator::Private::generatePreviews(const KFileItemList& items { applyCutItemEffect(); - if (!m_showPreview) { + if (!m_previewShown) { return; } @@ -369,7 +369,7 @@ void KFilePreviewGenerator::Private::generatePreviews(const KFileItemList& items void KFilePreviewGenerator::Private::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap) { - if (!m_showPreview) { + if (!m_previewShown) { // the preview has been canceled in the meantime return; } @@ -797,7 +797,7 @@ KFilePreviewGenerator::~KFilePreviewGenerator() delete d; } -void KFilePreviewGenerator::setShowPreview(bool show) +void KFilePreviewGenerator::setPreviewShown(bool show) { if (show && !d->m_viewAdapter->iconSize().isValid()) { // the view must provide an icon size, otherwise the showing @@ -805,8 +805,8 @@ void KFilePreviewGenerator::setShowPreview(bool show) return; } - if (d->m_showPreview != show) { - d->m_showPreview = show; + if (d->m_previewShown != show) { + d->m_previewShown = show; d->m_cutItemsCache.clear(); d->updateCutItems(); if (show) { @@ -825,14 +825,14 @@ void KFilePreviewGenerator::setShowPreview(bool show) } } -bool KFilePreviewGenerator::showPreview() const +bool KFilePreviewGenerator::isPreviewShown() const { - return d->m_showPreview; + return d->m_previewShown; } void KFilePreviewGenerator::updatePreviews() { - if (!d->m_showPreview) { + if (!d->m_previewShown) { return; } diff --git a/src/kfilepreviewgenerator.h b/src/kfilepreviewgenerator.h index 5d4ffcaee..ac373650a 100644 --- a/src/kfilepreviewgenerator.h +++ b/src/kfilepreviewgenerator.h @@ -69,8 +69,8 @@ public: * specifies an icon size by QAbstractItemView::setIconSize(), otherwise * KFilePreviewGenerator::showPreview() will always return false. */ - void setShowPreview(bool show); - bool showPreview() const; + void setPreviewShown(bool show); + bool isPreviewShown() const; /** * Updates the previews for all already available items. Usually it is only -- 2.47.3