* 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 0291fa8975a20b1633476e48a2654f7d255b4c48..a0fdc1a1ba342c4de211c13047dda7a7f0bfd0b6 100644 (file)
--- 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 bf79d3a6fd80c104dc53b7cc80952444ed600597..cb93a7f071c219137170186c96b6784f76dcd2cc 100644 (file)
--- 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 fa9af1380a0152fbdc2a3c96c43394ea11e2d777..5d4ffcaeef2e70b99cf92f6e6bd4ba643d1e500f 100644 (file)
--- a/src/kfilepreviewgenerator.h
+++ b/src/kfilepreviewgenerator.h
@@ -22,7 +22,7 @@
 
 #include <QObject>
 
-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();