From: Peter Penz Date: Wed, 24 Sep 2008 12:18:52 +0000 (+0000) Subject: * renamed AbstractViewAdapter to KAbstractViewAdapter X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/73f095cc5ebe64aeec6ec1ffaa9878f5ebc1fff4?ds=sidebyside * renamed AbstractViewAdapter to KAbstractViewAdapter * added virtual destructor to KAbstractViewAdapter svn path=/trunk/KDE/kdebase/apps/; revision=864301 --- diff --git a/src/kabstractviewadapter_p.h b/src/kabstractviewadapter_p.h index 0291fa897..a0fdc1a1b 100644 --- a/src/kabstractviewadapter_p.h +++ b/src/kabstractviewadapter_p.h @@ -33,12 +33,13 @@ class QSize; * for files. The interface allows KFilePreviewGenerator to be * independent from the view implementation. */ -class AbstractViewAdapter : public QObject +class KAbstractViewAdapter : public QObject { public: enum Signal { ScrollBarValueChanged }; - AbstractViewAdapter(QObject *parent) : QObject(parent) {} + KAbstractViewAdapter(QObject *parent) : QObject(parent) {} + virtual ~KAbstractViewAdapter() {} virtual QObject *createMimeTypeResolver(KDirModel*) const = 0; virtual QSize iconSize() const = 0; virtual QPalette palette() const = 0; diff --git a/src/kfilepreviewgenerator.cpp b/src/kfilepreviewgenerator.cpp index bf79d3a6f..cb93a7f07 100644 --- a/src/kfilepreviewgenerator.cpp +++ b/src/kfilepreviewgenerator.cpp @@ -50,7 +50,7 @@ * Implementation of the view adapter for the default case when * an instance of QAbstractItemView is used as view. */ -class DefaultViewAdapter : public AbstractViewAdapter +class DefaultViewAdapter : public KAbstractViewAdapter { public: DefaultViewAdapter(QAbstractItemView* view, QObject* parent); @@ -66,7 +66,7 @@ private: }; DefaultViewAdapter::DefaultViewAdapter(QAbstractItemView* view, QObject* parent) : - AbstractViewAdapter(parent), + KAbstractViewAdapter(parent), m_view(view) { } @@ -152,7 +152,7 @@ class KFilePreviewGenerator::Private { public: Private(KFilePreviewGenerator* parent, - AbstractViewAdapter* viewAdapter, + KAbstractViewAdapter* viewAdapter, QAbstractProxyModel* model); ~Private(); @@ -258,7 +258,7 @@ public: int m_pendingVisiblePreviews; - AbstractViewAdapter* m_viewAdapter; + KAbstractViewAdapter* m_viewAdapter; QAbstractItemView* m_itemView; QTimer* m_previewTimer; QTimer* m_scrollAreaTimer; @@ -289,7 +289,7 @@ private: }; KFilePreviewGenerator::Private::Private(KFilePreviewGenerator* parent, - AbstractViewAdapter* viewAdapter, + KAbstractViewAdapter* viewAdapter, QAbstractProxyModel* model) : m_showPreview(true), m_clearItemQueues(true), @@ -334,7 +334,7 @@ KFilePreviewGenerator::Private::Private(KFilePreviewGenerator* parent, m_scrollAreaTimer->setInterval(200); connect(m_scrollAreaTimer, SIGNAL(timeout()), q, SLOT(resumePreviews())); - m_viewAdapter->connect(AbstractViewAdapter::ScrollBarValueChanged, + m_viewAdapter->connect(KAbstractViewAdapter::ScrollBarValueChanged, q, SLOT(pausePreviews())); } @@ -786,7 +786,7 @@ KFilePreviewGenerator::KFilePreviewGenerator(QAbstractItemView* parent, QAbstrac d->m_itemView = parent; } -KFilePreviewGenerator::KFilePreviewGenerator(AbstractViewAdapter* parent, QAbstractProxyModel* model) : +KFilePreviewGenerator::KFilePreviewGenerator(KAbstractViewAdapter* parent, QAbstractProxyModel* model) : QObject(parent), d(new Private(this, parent, model)) { diff --git a/src/kfilepreviewgenerator.h b/src/kfilepreviewgenerator.h index fa9af1380..5d4ffcaee 100644 --- a/src/kfilepreviewgenerator.h +++ b/src/kfilepreviewgenerator.h @@ -22,7 +22,7 @@ #include -class AbstractViewAdapter; +class KAbstractViewAdapter; class KDirModel; class QAbstractItemView; class QAbstractProxyModel; @@ -58,7 +58,7 @@ public: KFilePreviewGenerator(QAbstractItemView* parent, QAbstractProxyModel* model); /** @internal */ - KFilePreviewGenerator(AbstractViewAdapter* parent, QAbstractProxyModel* model); + KFilePreviewGenerator(KAbstractViewAdapter* parent, QAbstractProxyModel* model); virtual ~KFilePreviewGenerator();