# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1278419366 -10800
# Node ID dde80bf4a8c7629b42a7a8b1cde3d532ad48b2c8
# Parent  15f034b8a3b5be8be0f5107f3a48c761601abf86
Revision: 201025
Kit: 2010127

diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/ganeswidgets.pro
--- a/ganeswidgets/ganeswidgets.pro	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/ganeswidgets.pro	Tue Jul 06 15:29:26 2010 +0300
@@ -28,14 +28,17 @@
     -llibOpenVGU.dll
 symbian { 
     TARGET.EPOCALLOWDLLDATA = 1
+    
+    #the def files are located in the root of hgwidgets so this is needed
+    defFilePath=..
 }
 
 # Input
 SOURCES += src/hgwidgets.cpp \
     src/hgwidgets_p.cpp \
-    src/HgContainer.cpp \
+    src/hgcontainer.cpp \
     src/hgwidgetitem.cpp \
-    src/HgScrollBufferManager.cpp \
+    src/hgscrollbuffermanager.cpp \
     src/hgquad.cpp \
     src/hgquadrenderer.cpp \
     src/hgvgquadrenderer.cpp \
@@ -43,7 +46,7 @@
     src/hgmediawallrenderer.cpp \
     src/hgspring.cpp \
     src/hgdrag.cpp \
-    src/HgImageFader.cpp \
+    src/hgimagefader.cpp \
     src/hglongpressvisualizer.cpp \
     src/hgcoverflowcontainer.cpp \
     src/hggridcontainer.cpp \
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/inc/hgcoverflowcontainer.h
--- a/ganeswidgets/inc/hgcoverflowcontainer.h	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/inc/hgcoverflowcontainer.h	Tue Jul 06 15:29:26 2010 +0300
@@ -19,7 +19,7 @@
 #define HGCOVERFLOWCONTAINER_H
 
 #include <hgwidgets/hgmediawall.h>
-#include "HgContainer.h"
+#include "hgcontainer.h"
 
 class HgCenterItemArea;
 
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/inc/hggridcontainer.h
--- a/ganeswidgets/inc/hggridcontainer.h	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/inc/hggridcontainer.h	Tue Jul 06 15:29:26 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef HGGRIDCONTAINER_H
 #define HGGRIDCONTAINER_H
 
-#include "HgContainer.h"
+#include "hgcontainer.h"
 
 class HbLabel;
 class HgWidgetItem;
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/HgContainer.cpp
--- a/ganeswidgets/src/HgContainer.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/HgContainer.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -19,7 +19,7 @@
 #include <QPainter>
 #include <QTimer>
 #include <HbMainWindow>
-#include "HgContainer.h"
+#include "hgcontainer.h"
 #include "hgmediawallrenderer.h"
 #include "hgquad.h"
 #include "hgvgquadrenderer.h"
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/HgImageFader.cpp
--- a/ganeswidgets/src/HgImageFader.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/HgImageFader.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -14,7 +14,7 @@
 * Description:
 *
 */
-#include "HgImageFader.h"
+#include "hgimagefader.h"
 #include "hgimage.h"
 
 HgImageFader::HgImageFader()
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/HgScrollBufferManager.cpp
--- a/ganeswidgets/src/HgScrollBufferManager.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/HgScrollBufferManager.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <QTimer>
 
-#include "HgScrollBufferManager.h"
+#include "hgscrollbuffermanager.h"
 #include "trace.h"
 
 // -----------------------------------------------------------------------------
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/hgmediawallrenderer.cpp
--- a/ganeswidgets/src/hgmediawallrenderer.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/hgmediawallrenderer.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -19,7 +19,7 @@
 #include "hgquadrenderer.h"
 #include "hgquad.h"
 #include "hgimage.h"
-#include "HgImageFader.h"
+#include "hgimagefader.h"
 #include "hgvgquadrenderer.h"
 #include "hgqtquadrenderer.h"
 #include <QVector3D>
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/hgvgimage.cpp
--- a/ganeswidgets/src/hgvgimage.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/hgvgimage.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include "hgvgimage.h"
-#include "HgImageFader.h"
+#include "hgimagefader.h"
 #include "hgvgquadrenderer.h"
 
 const int KMaxMirrorWidth(128);
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/hgvgquadrenderer.cpp
--- a/ganeswidgets/src/hgvgquadrenderer.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/hgvgquadrenderer.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -20,7 +20,7 @@
 #include "hgquad.h"
 #include "hgvgimage.h"
 #include "trace.h"
-#include "HgImageFader.h"
+#include "hgimagefader.h"
 
 #include <VG/openvg.h>
 #include <VG/vgu.h>
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/hgwidgets.cpp
--- a/ganeswidgets/src/hgwidgets.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/hgwidgets.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -23,9 +23,9 @@
 #include <HbStyleLoader>
 
 #include "hgwidgets_p.h"
-#include "HgContainer.h"
+#include "hgcontainer.h"
 #include "hgwidgetitem.h"
-#include "HgScrollBufferManager.h"
+#include "hgscrollBufferManager.h"
 #include "hggridcontainer.h"
 #include "trace.h"
 
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/src/hgwidgets_p.cpp
--- a/ganeswidgets/src/hgwidgets_p.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/src/hgwidgets_p.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -20,9 +20,9 @@
 #include <hgwidgets/hgwidgets.h>
 
 #include "hgwidgets_p.h"
-#include "HgContainer.h"
+#include "hgcontainer.h"
 #include "hgcoverflowcontainer.h"
-#include "HgScrollBufferManager.h"
+#include "hgscrollbuffermanager.h"
 #include "hgwidgetitem.h"
 #include "trace.h"
 //#include "hgindexfeedback.h"
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/tsrc/fute/HgWidgetTest/inc/hgwidgettestdatamodel.h
--- a/ganeswidgets/tsrc/fute/HgWidgetTest/inc/hgwidgettestdatamodel.h	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/tsrc/fute/HgWidgetTest/inc/hgwidgettestdatamodel.h	Tue Jul 06 15:29:26 2010 +0300
@@ -98,13 +98,13 @@
     QPixmap                         mDefaultPixmap;
     bool                            mSilentDataFetch;
 
-    ThumbnailManager* mWrapper;
-    QStringList mWaitingThumbnails;
-    bool mThumbnailRequestPending;
-    int mThumbnailRequestIndex;
-    int mThumbnailRequestID;
+    ThumbnailManager*               mWrapper;
+    QStringList                     mWaitingThumbnails;
+    bool                            mThumbnailRequestPending;
+    int                             mThumbnailRequestIndex;
+    int                             mThumbnailRequestID;
 
-    QFileInfoList mFileInfoList;
+    QFileInfoList                   mFileInfoList;
 };
 
 #endif // HgWidgetTestDataModel_H
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/tsrc/fute/HgWidgetTest/inc/hgwidgettestview.h
--- a/ganeswidgets/tsrc/fute/HgWidgetTest/inc/hgwidgettestview.h	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/tsrc/fute/HgWidgetTest/inc/hgwidgettestview.h	Tue Jul 06 15:29:26 2010 +0300
@@ -112,11 +112,11 @@
     QModelIndex             mFlippedIndex;
     HbLabel*                mFrontItem;
     HbView*                 mOptionsView;
-    HgItemSizeDialog*       mItemSizeDialog;
-    HgItemSizeDialog*       mItemPosDialog;
-    QParallelAnimationGroup* mAnimationGroup;
-    HbDialog*               mDialog;
-    HgCoverItem*            mCoverItem;
+    HgItemSizeDialog        *mItemSizeDialog;
+    HgItemSizeDialog        *mItemPosDialog;
+    QParallelAnimationGroup *mAnimationGroup;
+    HbDialog                *mDialog;
+    HgCoverItem             *mCoverItem;
 };
 
 
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/tsrc/fute/HgWidgetTest/src/hgcoveritem.cpp
--- a/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgcoveritem.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgcoveritem.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -23,6 +23,7 @@
 
 void HgCoverItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     {
+    Q_UNUSED(event);
     emit close();
     }
 
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestdatamodel.cpp
--- a/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestdatamodel.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestdatamodel.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -57,12 +57,12 @@
       mImageType(ImageTypeNone),
 //      mDefaultIcon((":/images/default.svg")),
       mUseLowResImages(false),
+      mBufferManager(0),
+      mSilentDataFetch(false),
       mWrapper( new ThumbnailManager() ),
       mThumbnailRequestPending(false),
       mThumbnailRequestIndex(-1),
-      mThumbnailRequestID(-1),
-      mBufferManager(0),
-      mSilentDataFetch(false)
+      mThumbnailRequestID(-1)
 {
     FUNC_LOG;
     mWrapper->setQualityPreference( ThumbnailManager::OptimizeForPerformance );
@@ -596,6 +596,8 @@
 
 void HgWidgetTestDataModel::thumbnailReady( QPixmap pixmap, void* data, int /*id*/, int error )
 {
+    Q_UNUSED(data);
+    
     if (!error && !pixmap.isNull() ){
 //        int idx = reinterpret_cast<int>(data);
         if (mImageType == ImageTypeQPixmap || mImageType == ImageTypeHbIcon)
diff -r 15f034b8a3b5 -r dde80bf4a8c7 ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestview.cpp
--- a/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestview.cpp	Wed Jun 23 19:25:46 2010 +0300
+++ b/ganeswidgets/tsrc/fute/HgWidgetTest/src/hgwidgettestview.cpp	Tue Jul 06 15:29:26 2010 +0300
@@ -56,9 +56,9 @@
     mOptionsView(0),
     mItemSizeDialog(0),
     mItemPosDialog(0),
+    mAnimationGroup(0),
     mDialog(0),
-    mCoverItem(0),
-    mAnimationGroup(0)
+    mCoverItem(0)
 {    
     mModel = new HgWidgetTestDataModel(this);
     mSelectionModel = new QItemSelectionModel(mModel, this);
diff -r 15f034b8a3b5 -r dde80bf4a8c7 hgcacheproxymodel/hgcacheproxymodel.pro
--- a/hgcacheproxymodel/hgcacheproxymodel.pro	Wed Jun 23 19:25:46 2010 +0300
+++ b/hgcacheproxymodel/hgcacheproxymodel.pro	Tue Jul 06 15:29:26 2010 +0300
@@ -19,6 +19,9 @@
 symbian {
 	TARGET.EPOCALLOWDLLDATA = 1
 	TARGET.CAPABILITY = ALL -TCB
+	
+	#the def files are located in the root of hgwidgets so this is needed
+	defFilePath=..
 }
 
 DEFINES += BUILD_CACHEPROXYMODEL