From: Peter Penz Date: Fri, 26 Nov 2010 18:37:37 +0000 (+0000) Subject: SVN_SILENT: Don't inline the setter/getters X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/056bbd061df0426f7a28ecd9b093afd64a22ecf1 SVN_SILENT: Don't inline the setter/getters svn path=/trunk/KDE/kdebase/apps/; revision=1201095 --- diff --git a/src/views/dolphincolumnview.cpp b/src/views/dolphincolumnview.cpp index 4b3a9f582..4acdd97b5 100644 --- a/src/views/dolphincolumnview.cpp +++ b/src/views/dolphincolumnview.cpp @@ -149,7 +149,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, updateDecorationSize(dolphinView->showPreview()); updateBackground(); - + DolphinViewController* dolphinViewController = m_container->m_dolphinViewController; m_extensionsFactory = new ViewExtensionsFactory(this, dolphinViewController, viewModeController); m_extensionsFactory->fileItemDelegate()->setMinimizedNameColumn(true); @@ -166,6 +166,7 @@ DolphinColumnView::~DolphinColumnView() m_dirLister = 0; // deleted by m_dolphinModel } + void DolphinColumnView::setActive(bool active) { if (m_active != active) { @@ -179,6 +180,31 @@ void DolphinColumnView::setActive(bool active) } } +bool DolphinColumnView::isActive() const +{ + return m_active; +} + +void DolphinColumnView::setChildUrl(const KUrl& url) +{ + m_childUrl = url; +} + +KUrl DolphinColumnView::childUrl() const +{ + return m_childUrl; +} + +void DolphinColumnView::setUrl(const KUrl& url) +{ + m_url = url; +} + +KUrl DolphinColumnView::url() const +{ + return m_url; +} + void DolphinColumnView::updateBackground() { // TODO: The alpha-value 150 is copied from DolphinView::setActive(). When @@ -313,7 +339,7 @@ void DolphinColumnView::mousePressEvent(QMouseEvent* event) } void DolphinColumnView::keyPressEvent(QKeyEvent* event) -{ +{ DolphinTreeView::keyPressEvent(event); DolphinViewController* controller = m_container->m_dolphinViewController; @@ -564,7 +590,7 @@ void DolphinColumnView::deactivate() selectionModel()->setCurrentIndex(current, QItemSelectionModel::NoUpdate); connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(requestActivation())); - + updateBackground(); } diff --git a/src/views/dolphincolumnview.h b/src/views/dolphincolumnview.h index c3953e253..72130c8f4 100644 --- a/src/views/dolphincolumnview.h +++ b/src/views/dolphincolumnview.h @@ -146,29 +146,4 @@ private: friend class DolphinColumnViewContainer; }; -inline bool DolphinColumnView::isActive() const -{ - return m_active; -} - -inline void DolphinColumnView::setChildUrl(const KUrl& url) -{ - m_childUrl = url; -} - -inline KUrl DolphinColumnView::childUrl() const -{ - return m_childUrl; -} - -inline void DolphinColumnView::setUrl(const KUrl& url) -{ - m_url = url; -} - -inline KUrl DolphinColumnView::url() const -{ - return m_url; -} - #endif