[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/utils/krusader/krusader/Panel
From:       Jan Lepper <dehtris () yahoo ! de>
Date:       2010-03-01 0:47:18
Message-ID: 1267404438.028357.2970.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097365 by janlepper:

KrInterBriefView: remove members that are implemented KrInterView already

 M  +28 -27    krinterbriefview.cpp  
 M  +15 -10    krinterbriefview.h  


--- trunk/extragear/utils/krusader/krusader/Panel/krinterbriefview.cpp #1097364:1097365
@@ -32,6 +32,7 @@
 #include <klocale.h>
 #include <kdirlister.h>
 
+#include "krinterviewitem.h"
 #include "krviewfactory.h"
 #include "krinterviewitemdelegate.h"
 #include "krviewitem.h"
@@ -41,7 +42,7 @@
 #include "../VFS/krpermhandler.h"
 #include "../defaults.h"
 #include "../GUI/krstyleproxy.h"
-
+#if 0
 // dummy. remove this class when no longer needed
 class KrInterBriefViewItem: public KrViewItem
 {
@@ -76,12 +77,12 @@
     vfile *_vfile;
     KrInterBriefView * _view;
 };
+#endif
 
-
 // code used to register the view
 #define INTERBRIEFVIEW_ID 1
 KrViewInstance interBriefView(INTERBRIEFVIEW_ID, i18n("&Brief View"), Qt::ALT + Qt::SHIFT + Qt::Key_B,
-                              KrInterBriefView::create, KrInterBriefViewItem::itemHeightChanged);
+                              KrInterBriefView::create, KrInterViewItem::itemHeightChanged);
 // end of register code
 
 KrInterBriefView::KrInterBriefView(QWidget *parent, bool &left, KConfig *cfg):
@@ -91,8 +92,8 @@
     _header = 0;
 
     // fix the context menu problem
-    int j = QFontMetrics(font()).height() * 2;
-    _mouseHandler = new KrMouseHandler(this, j);
+//     int j = QFontMetrics(font()).height() * 2;
+//     _mouseHandler = new KrMouseHandler(this, j);
     connect(_mouseHandler, SIGNAL(renameCurrentItem()), this, SLOT(renameCurrentItem()));
     setWidget(this);
     _nameInKConfig = QString("KrInterBriefView") + QString((left ? "Left" : "Right")) ;
@@ -101,9 +102,9 @@
     KConfigGroup grpSvr(_config, "Look&Feel");
     _viewFont = grpSvr.readEntry("Filelist Font", *_FilelistFont);
 
-    _model = new KrVfsModel(this);
+//     _model = new KrVfsModel(this);
     this->setModel(_model);
-    _model->sort(KrVfsModel::Name, Qt::AscendingOrder);
+//     _model->sort(KrVfsModel::Name, Qt::AscendingOrder);
     _model->setExtensionEnabled(false);
     _model->setAlternatingTable(true);
     //header()->installEventFilter( this );
@@ -126,14 +127,14 @@
     delete _operator;
     _operator = 0;
     setModel(0);
-    delete _model;
-    delete _mouseHandler;
-    QHashIterator< vfile *, KrInterBriefViewItem *> it(_itemHash);
-    while (it.hasNext())
-        delete it.next().value();
-    _itemHash.clear();
+//     delete _model;
+//     delete _mouseHandler;
+//     QHashIterator< vfile *, KrInterBriefViewItem *> it(_itemHash);
+//     while (it.hasNext())
+//         delete it.next().value();
+//     _itemHash.clear();
 }
-
+#if 0
 KrViewItem* KrInterBriefView::findItemByName(const QString &name)
 {
     if (!_model->ready())
@@ -144,7 +145,7 @@
         return 0;
     return getKrInterViewItem(ndx);
 }
-
+#endif
 void KrInterBriefView::currentChanged(const QModelIndex & current, const QModelIndex & previous)
 {
     if (_model->ready()) {
@@ -153,7 +154,7 @@
     }
     QAbstractItemView::currentChanged(current, previous);
 }
-
+#if 0
 QString KrInterBriefView::getCurrentItem() const
 {
     if (!_model->ready())
@@ -276,7 +277,7 @@
     setPalette(p);
     viewport()->update();
 }
-
+#endif
 void KrInterBriefView::restoreSettings()
 {
     _numOfColumns = _properties->numberOfColumns;
@@ -298,7 +299,7 @@
     group.writeEntry("Sort Indicator Column", (int)_model->getLastSortOrder());
     group.writeEntry("Ascending Sort Order", (_model->getLastSortDir() == Qt::AscendingOrder));
 }
-
+#if 0
 void KrInterBriefView::setCurrentItem(const QString& name)
 {
     QModelIndex ndx = _model->nameIndex(name);
@@ -324,7 +325,7 @@
     //if ( renameLineEdit() ->isVisible() )
     //renameLineEdit() ->clearFocus();
 }
-
+#endif
 int KrInterBriefView::itemsPerPage()
 {
     int height = getItemHeight();
@@ -333,16 +334,16 @@
     int numRows = viewport()->height() / height;
     return numRows;
 }
-
+#if 0
 void KrInterBriefView::sort()
 {
     _model->sort();
 }
-
+#endif
 void KrInterBriefView::updateView()
 {
 }
-
+#if 0
 void KrInterBriefView::updateItem(vfile * item)
 {
     if (item == 0)
@@ -380,7 +381,7 @@
     if (!nameToMakeCurrent().isEmpty())
         setCurrentItem(nameToMakeCurrent());
 }
-
+#endif
 void KrInterBriefView::setup()
 {
     _header = new QHeaderView(Qt::Horizontal, this);
@@ -443,7 +444,7 @@
 
         if (newCurrent) {
             setCurrentKrViewItem(newCurrent);
-            slotMakeCurrentVisible();
+            makeCurrentVisible();
         }
         if (e->modifiers() & Qt::ShiftModifier)
             op()->emitSelectionChanged();
@@ -473,7 +474,7 @@
 
         if (newCurrent) {
             setCurrentKrViewItem(newCurrent);
-            slotMakeCurrentVisible();
+            makeCurrentVisible();
         }
         if (e->modifiers() & Qt::ShiftModifier)
             op()->emitSelectionChanged();
@@ -543,7 +544,7 @@
     _mouseHandler->otherEvent(e);
     return QAbstractItemView::event(e);
 }
-
+#if 0
 KrInterBriefViewItem * KrInterBriefView::getKrInterViewItem(const QModelIndex & ndx)
 {
     if (!ndx.isValid())
@@ -560,7 +561,7 @@
     }
     return *it;
 }
-
+#endif
 void KrInterBriefView::selectRegion(KrViewItem *i1, KrViewItem *i2, bool select)
 {
     vfile* vf1 = (vfile *)i1->getVfile();
--- trunk/extragear/utils/krusader/krusader/Panel/krinterbriefview.h #1097364:1097365
@@ -38,7 +38,7 @@
 public:
     KrInterBriefView(QWidget *parent, bool &left, KConfig *cfg = krConfig);
     virtual ~KrInterBriefView();
-
+/*
     virtual void addItems(vfs* v, bool addUpDir = true);
     virtual KrViewItem* findItemByName(const QString &name);
     virtual QString getCurrentItem() const;
@@ -52,13 +52,17 @@
     virtual KrViewItem* preAddItem(vfile *vf);
     virtual bool preDelItem(KrViewItem *item);
     virtual void redraw();
+*/
     virtual void restoreSettings();
     virtual void saveSettings();
+/*
     virtual void setCurrentItem(const QString& name);
     virtual void setCurrentKrViewItem(KrViewItem *current);
     virtual void sort();
     virtual void clear();
+*/
     virtual void updateView();
+/*
     virtual void updateItem(vfile* item);
     virtual void updateItem(KrViewItem* item);
     virtual QModelIndex getCurrentIndex() {
@@ -67,15 +71,16 @@
     virtual bool isSelected(const QModelIndex &ndx) {
         return selectionModel()->isSelected(ndx);
     }
+*/
     virtual void selectRegion(KrViewItem *, KrViewItem *, bool);
-    KrInterBriefViewItem * getKrInterViewItem(const QModelIndex &);
+//     KrInterBriefViewItem * getKrInterViewItem(const QModelIndex &);
 
     static KrView* create(QWidget *parent, bool &left, KConfig *cfg) {
         return new KrInterBriefView(parent, left, cfg);
     }
 
-    virtual void prepareForActive();
-    virtual void prepareForPassive();
+//     virtual void prepareForActive();
+//     virtual void prepareForPassive();
     virtual bool ensureVisibilityAfterSelect() {
         return false;
     }
@@ -96,11 +101,11 @@
     virtual void updateGeometries();
     virtual QRect mapToViewport(const QRect &rect) const;
 
-public slots:
-    virtual void refreshColors();
+// public slots:
+//     virtual void refreshColors();
 
 protected slots:
-    void slotMakeCurrentVisible();
+//     void slotMakeCurrentVisible();
     virtual void renameCurrentItem();
     virtual void currentChanged(const QModelIndex & current, const QModelIndex & previous);
 
@@ -130,9 +135,9 @@
     void intersectionSet(const QRect &, QVector<QModelIndex> &);
 
 private:
-    KrVfsModel *_model;
-    KrMouseHandler *_mouseHandler;
-    QHash<vfile *, KrInterBriefViewItem*> _itemHash;
+//     KrVfsModel *_model;
+//     KrMouseHandler *_mouseHandler;
+//     QHash<vfile *, KrInterBriefViewItem*> _itemHash;
     QFont _viewFont;
     int _numOfColumns;
     QHeaderView * _header;
[prev in list] [next in list] [prev in thread] [next in thread]