From 432af59ca3fa2e317aa0fcc99a93a33bbe4dbe22 Mon Sep 17 00:00:00 2001
From: shibakaneki <didier@sente.ch>
Date: Thu, 12 Jan 2012 15:08:29 +0100
Subject: [PATCH] resolved a conflict

---
 src/customWidgets/UBWidgetList.h | 4 ++--
 src/gui/UBTeacherBarWidget.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h
index 50823b08..865386ad 100644
--- a/src/customWidgets/UBWidgetList.h
+++ b/src/customWidgets/UBWidgetList.h
@@ -31,7 +31,7 @@ class UBWidgetList : public QScrollArea
 public:
     UBWidgetList(QWidget* parent=0, eWidgetListOrientation orientation = eWidgetListOrientation_Vertical, const char* name = "UBWidgetList");
     ~UBWidgetList();
-    void addWidget(QWidget* widget, bool isResizable = true);
+    void addWidget(QWidget* widget);
     void removeWidget(QWidget* widget);
     void setMargin(int margin);
     void setEmptyText(const QString& text);
@@ -53,7 +53,7 @@ private:
     eWidgetListOrientation mOrientation;
     int mMargin;
     int mListElementsSpacing;
-    QMap<QWidget*, sWidgetProperties> mWidgetInfo;
+    QMap<QWidget*, QSize> mWidgetInfo;
     QLabel* mpEmptyLabel;
 };
 
diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp
index 6d75471a..a718a40a 100644
--- a/src/gui/UBTeacherBarWidget.cpp
+++ b/src/gui/UBTeacherBarWidget.cpp
@@ -1031,7 +1031,7 @@ void UBTeacherBarPreviewMedia::cleanMedia()
 void UBTeacherBarPreviewMedia::loadWidgets(QList<QWidget*> pWidgetsList, bool isResizable)
 {
     foreach(QWidget*eachWidget, pWidgetsList){
-        mWidget->addWidget(eachWidget,isResizable);
+        mWidget->addWidget(eachWidget);
         mWidgetList[eachWidget]="DRAG UNAVAILABLE";
     }
 }