58c193f
--- digikam-2.5.0/core/digikam/album/albummanager.h	2012-01-03 02:32:41.000000000 +0200
58c193f
+++ digikam-2.5.0/core/digikam/album/albummanager.h	2012-01-05 03:18:16.291639995 +0200
58c193f
@@ -831,7 +831,7 @@
58c193f
     {
58c193f
         foreach(T* t, list)
58c193f
         {
58c193f
-            append(AlbumPointer<T>(t));
58c193f
+            this->append(AlbumPointer<T>(t));
58c193f
         }
58c193f
         return *this;
58c193f
     }
58c193f
--- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-03 02:32:26.000000000 +0200
58c193f
+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 03:01:56.965609602 +0200
58c193f
@@ -1362,7 +1362,7 @@
58c193f
             template <typename VertexType, typename GraphType>
58c193f
             void discover_vertex(VertexType u, const GraphType&) const
58c193f
             {
58c193f
-                record(u);
58c193f
+                this->record(u);
58c193f
             }
58c193f
         };
58c193f
 
58c193f
@@ -1373,7 +1373,7 @@
58c193f
             template <typename VertexType, typename GraphType>
58c193f
             void discover_vertex(VertexType u, const GraphType&) const
58c193f
             {
58c193f
-                record(u);
58c193f
+                this->record(u);
58c193f
             }
58c193f
         };
58c193f
 
58c193f
--- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp	2012-01-03 02:32:04.000000000 +0200
58c193f
+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp	2012-01-05 01:22:34.009352997 +0200
58c193f
@@ -30,6 +30,7 @@
58c193f
 extern "C"
58c193f
 {
58c193f
 #include <utime.h>
58c193f
+#include <unistd.h>
58c193f
 }
58c193f
 
58c193f
 // C++ includes
58c193f
--- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp	2012-01-03 02:31:42.000000000 +0200
58c193f
+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp	2012-01-05 02:35:01.061054821 +0200
58c193f
@@ -78,7 +78,7 @@
58c193f
 public:
58c193f
     WizardPage(KAssistantDialog* dialog, const QString& title)
58c193f
     : QWidget(dialog) {
58c193f
-        setupUi(this);
58c193f
+        this->setupUi(this);
58c193f
         layout()->setMargin(0);
58c193f
         mPage = dialog->addPage(this, title);
58c193f
     }
58c193f
--- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp	2012-01-03 02:31:34.000000000 +0200
58c193f
+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp	2012-01-05 02:17:15.249914790 +0200
58c193f
@@ -88,7 +88,7 @@
58c193f
     WizardPage ( KAssistantDialog* dialog, const QString& title )
58c193f
         : QWidget ( dialog )
58c193f
     {
58c193f
-        setupUi ( this );
58c193f
+        this->setupUi ( this );
58c193f
         layout()->setMargin ( 0 );
58c193f
         mPage = dialog->addPage ( this, title );
58c193f
     }