Remove proxy

Didn't work out...

4 files changed, 2 insertions, 80 deletions

diff --git a/BeetPlayer.pro b/BeetPlayer.pro
index dc6e019..5e319f0 100644
--- a/BeetPlayer.pro
+++ b/BeetPlayer.pro
@@ -28,15 +28,13 @@ SOURCES += main.cpp\
     configurationdialog.cpp \
     indexerwidget.cpp \
     globals.cpp \
-    playerwidget.cpp \
-    beetplayerproxy.cpp
+    playerwidget.cpp
 
 HEADERS  += beetplayer.h \
     configurationdialog.h \
     indexerwidget.h \
     globals.h \
-    playerwidget.h \
-    beetplayerproxy.h
+    playerwidget.h
 
 LIBS += -ltag
 
diff --git a/beetplayerproxy.cpp b/beetplayerproxy.cpp
deleted file mode 100644
index 574713f..0000000
--- a/beetplayerproxy.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <QModelIndex>
-#include "beetplayerproxy.h"
-
-#include <QDebug>
-
-BeetPlayerProxy::BeetPlayerProxy(QObject *parent) : QSortFilterProxyModel(parent) {
-}
-
-bool BeetPlayerProxy::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const{
-    if(filterRegExp().isEmpty()){
-        return true;
-    }
-    QRegExp filter = filterRegExp();
-    QModelIndex curIdx = sourceModel()->index(source_row, 0, source_parent);
-    return recurseChildren(curIdx);
-}
-
-bool BeetPlayerProxy::recurseChildren(QModelIndex parent) const{
-    static bool retval = false;
-    if(parent.data().toString().contains(filterRegExp())){
-        qDebug() << "found:" << parent.data();
-        retval = true;
-    }else{
-        retval = false;
-    }
-    for(int i = 0; i < sourceModel()->rowCount(parent); ++i){
-        QModelIndex cur = sourceModel()->index(i, 0, parent);
-        //qDebug() << cur.data();
-        if(cur.data().toString().contains(filterRegExp())){
-            retval = true;
-        }
-        if(sourceModel()->hasChildren(cur)){
-            recurseChildren(cur);
-        }
-    }
-    return retval;
-}
-
-bool BeetPlayerProxy::hasValidChild(QModelIndex parent) const{
-    QModelIndex curIdx = parent;
-    if(curIdx.isValid()){
-        if(curIdx.data().toString().contains(filterRegExp())){
-            qDebug() << "found:" << curIdx.data();
-            return true;
-        }
-        qDebug() << parent.data() << sourceModel()->rowCount(curIdx);
-        for(int i = 0; i < sourceModel()->rowCount(curIdx); ++i){
-            curIdx = sourceModel()->index(i, 0, curIdx);
-            //qDebug() << "in for:" << curIdx.data() << i;
-            if(sourceModel()->hasChildren(curIdx)){
-                hasValidChild(curIdx);
-            }
-        }
-    }
-    return false;
-}
diff --git a/beetplayerproxy.h b/beetplayerproxy.h
deleted file mode 100644
index 69907ae..0000000
--- a/beetplayerproxy.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef BEETPLAYERPROXY_H
-#define BEETPLAYERPROXY_H
-
-#include <QSortFilterProxyModel>
-
-class BeetPlayerProxy : public QSortFilterProxyModel {
-    Q_OBJECT
-    public:
-        BeetPlayerProxy(QObject *parent = 0);
-
-    protected:
-        virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
-
-    private:
-        bool hasValidChild(QModelIndex parent) const;
-        bool recurseChildren(QModelIndex parent) const;
-};
-
-#endif // BEETPLAYERPROXY_H
diff --git a/playerwidget.cpp b/playerwidget.cpp
index 237f0f0..1e68c36 100644
--- a/playerwidget.cpp
+++ b/playerwidget.cpp
@@ -14,7 +14,6 @@
 #include <QSqlQuery>
 
 #include "playerwidget.h"
-#include "beetplayerproxy.h"
 
 PlayerWidget::PlayerWidget(QWidget *parent) : QWidget(parent){
     setupGui();