Merge views.hpp in customwidgets

modules/gui/qt4/Modules.am

@@ -37,7 +37,6 @@ TOMOC = main_interface \
 	components/playlist/panels \
 	components/playlist/selector \
 	util/input_slider \
-	util/views \
 	util/customwidgets
 MOCCPP = $(TOMOC:%=%.moc.cpp)
 
@@ -62,7 +61,6 @@ nodist_SOURCES_qt4 = \
 		components/playlist/panels.moc.cpp \
 		components/playlist/selector.moc.cpp \
 		util/input_slider.moc.cpp \
-		util/views.moc.cpp \
 		util/customwidgets.moc.cpp \
 		resources.cpp
 
@@ -134,7 +132,6 @@ EXTRA_DIST += \
 	components/playlist/selector.hpp \
 	util/input_slider.hpp \
 	util/directslider.hpp \
-	util/views.hpp \
 	util/customwidgets.hpp \
 	util/qvlcframe.hpp \
 	ui/input_stats.ui \

modules/gui/qt4/components/playlist/standardpanel.cpp

@@ -35,7 +35,6 @@
 #include <QToolBar>
 #include <QLabel>
 #include <QSpacerItem>
-#include "util/views.hpp"
 #include "util/customwidgets.hpp"
 
 StandardPLPanel::StandardPLPanel( QWidget *_parent, intf_thread_t *_p_intf,

modules/gui/qt4/util/customwidgets.hpp

@@ -55,4 +55,33 @@ private:
     bool mDrawClickMsg;
 };
 
-#endif // CLICKLINEEDIT_H
+/*****************************************************************
+ * Custom views
+ *****************************************************************/
+#include <QMouseEvent>
+#include <QTreeView>
+#include <QCursor>
+#include <QPoint>
+#include <QModelIndex>
+
+class QVLCTreeView : public QTreeView
+{
+    Q_OBJECT;
+public:
+    QVLCTreeView( QWidget * parent ) : QTreeView( parent )
+    {
+    };
+    virtual ~QVLCTreeView()   {};
+
+    void mouseReleaseEvent(QMouseEvent* e )
+    {
+        if( e->button() & Qt::RightButton )
+        {
+            emit rightClicked( indexAt( QPoint( e->x(), e->y() ) ),
+                               QCursor::pos() );
+        }
+    }
+signals:
+    void rightClicked( QModelIndex, QPoint  );
+};
+#endif

modules/gui/qt4/util/views.hpp

-/*****************************************************************************
- * views.hpp : Custom views
- ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
- * $Id: qvlcframe.hpp 16283 2006-08-17 18:16:09Z zorglub $
- *
- * Authors: Clément Stenac <zorglub@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
-
-#ifndef _QVLCVIEWS_H_
-#define _QVLCVIEWS_H_
-
-#include <QMouseEvent>
-#include <QTreeView>
-#include <QCursor>
-#include <QPoint>
-#include <QModelIndex>
-
-class QVLCTreeView : public QTreeView
-{
-    Q_OBJECT;
-public:
-    QVLCTreeView( QWidget * parent ) : QTreeView( parent )
-    {
-    };
-    virtual ~QVLCTreeView()   {};
-
-    void mouseReleaseEvent(QMouseEvent* e )
-    {
-        if( e->button() & Qt::RightButton )
-        {
-            emit rightClicked( indexAt( QPoint( e->x(), e->y() ) ), QCursor::pos() );
-        }
-    }
-signals:
-    void rightClicked( QModelIndex, QPoint  );
-};
-#endif