[Qt] Fix small glitches, issues, because of previous commits.

[vlc] / modules / gui / qt4 / components / info_panels.hpp

diff --git a/modules/gui/qt4/components/info_panels.hpp b/modules/gui/qt4/components/info_panels.hpp
index e8098998c0393a41cc5251d70873ed29846901df..ed2d8d51d40418c99d9ba0fd6551e5c8cee9a39b 100644 (file)
--- a/modules/gui/qt4/components/info_panels.hpp
+++ b/modules/gui/qt4/components/info_panels.hpp
@@ -26,14 +26,17 @@
 #ifndef _INFOPANELS_H_
 #define _INFOPANELS_H_
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_meta.h>
 
 #include <QWidget>
+#include <QLabel>
 
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#endif
+#include <limits.h>
 
 #define setSpinBounds( spinbox ) {               \
     spinbox->setRange( 0, INT_MAX );             \
@@ -46,7 +49,7 @@ class QTreeWidgetItem;
 class QTreeView;
 class QSpinBox;
 class QLineEdit;
-class QLabel;
+class CoverArtLabel;
 
 class MetaPanel: public QWidget
 {
@@ -55,7 +58,6 @@ public:
     MetaPanel( QWidget *, intf_thread_t * );
     virtual ~MetaPanel();
     void saveMeta();
-    void setInput( input_item_t * );
 
     bool isInEditMode();
     void setEditMode( bool );
@@ -65,7 +67,6 @@ private:
     intf_thread_t *p_intf;
     bool b_inEditMode;
 
-    QLineEdit *uri_text;
     QLineEdit *title_text;
     QLineEdit *artist_text;
     QLineEdit *genre_text;
@@ -80,7 +81,7 @@ private:
     QLineEdit *nowplaying_text;
     QLineEdit *publisher_text;
 //    QLineEdit *encodedby_text;
-    QLabel *art_cover;
+    CoverArtLabel *art_cover;
 
 public slots:
     void update( input_item_t * );
@@ -158,4 +159,5 @@ public slots:
     void update( input_item_t * );
     void clear();
 };
+
 #endif