Merge with branch1.2

1 files changed, 5 insertions, 1 deletions

diff --git a/src/modlistview.h b/src/modlistview.h
index e501a660..6cd114b0 100644
--- a/src/modlistview.h
+++ b/src/modlistview.h
@@ -3,6 +3,7 @@
 

 #include <QTreeView>

 #include <QDragEnterEvent>

+#include "viewmarkingscrollbar.h"

 

 class ModListView : public QTreeView

 {

@@ -10,11 +11,14 @@ class ModListView : public QTreeView
 public:

   explicit ModListView(QWidget *parent = 0);

   virtual void dragEnterEvent(QDragEnterEvent *event);

+  virtual void setModel(QAbstractItemModel *model);

 signals:

   void dropModeUpdate(bool dropOnRows);

   

 public slots:

-  

+private:

+

+  ViewMarkingScrollBar *m_Scrollbar;

 };

 

 #endif // MODLISTVIEW_H