74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
|
Index: digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp
|
||
|
|
===================================================================
|
||
|
|
--- digikam-2.5.0.orig/core/utilities/cameragui/devices/gpcamera.cpp
|
||
|
|
+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp
|
||
|
|
@@ -34,6 +34,7 @@ extern "C"
|
||
|
|
|
||
|
|
// C++ includes
|
||
|
|
|
||
|
|
+#include <unistd.h>
|
||
|
|
#include <cstdio>
|
||
|
|
#include <iostream>
|
||
|
|
|
||
|
|
Index: digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp
|
||
|
|
===================================================================
|
||
|
|
--- digikam-2.5.0.orig/extra/kipi-plugins/printimages/wizard/wizard.cpp
|
||
|
|
+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp
|
||
|
|
@@ -88,7 +88,7 @@ public:
|
||
|
|
WizardPage ( KAssistantDialog* dialog, const QString& title )
|
||
|
|
: QWidget ( dialog )
|
||
|
|
{
|
||
|
|
- setupUi ( this );
|
||
|
|
+ this->setupUi ( this );
|
||
|
|
layout()->setMargin ( 0 );
|
||
|
|
mPage = dialog->addPage ( this, title );
|
||
|
|
}
|
||
|
|
Index: digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp
|
||
|
|
===================================================================
|
||
|
|
--- digikam-2.5.0.orig/extra/kipi-plugins/htmlexport/wizard.cpp
|
||
|
|
+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp
|
||
|
|
@@ -78,7 +78,7 @@ class WizardPage : public QWidget, publi
|
||
|
|
public:
|
||
|
|
WizardPage(KAssistantDialog* dialog, const QString& title)
|
||
|
|
: QWidget(dialog) {
|
||
|
|
- setupUi(this);
|
||
|
|
+ this->setupUi(this);
|
||
|
|
layout()->setMargin(0);
|
||
|
|
mPage = dialog->addPage(this, title);
|
||
|
|
}
|
||
|
|
Index: digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||
|
|
===================================================================
|
||
|
|
--- digikam-2.5.0.orig/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||
|
|
+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||
|
|
@@ -1362,7 +1362,7 @@ protected:
|
||
|
|
template <typename VertexType, typename GraphType>
|
||
|
|
void discover_vertex(VertexType u, const GraphType&) const
|
||
|
|
{
|
||
|
|
- record(u);
|
||
|
|
+ this->record(u);
|
||
|
|
}
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -1373,7 +1373,7 @@ protected:
|
||
|
|
template <typename VertexType, typename GraphType>
|
||
|
|
void discover_vertex(VertexType u, const GraphType&) const
|
||
|
|
{
|
||
|
|
- record(u);
|
||
|
|
+ this->record(u);
|
||
|
|
}
|
||
|
|
};
|
||
|
|
|
||
|
|
Index: digikam-2.5.0/core/digikam/album/albummanager.h
|
||
|
|
===================================================================
|
||
|
|
--- digikam-2.5.0.orig/core/digikam/album/albummanager.h
|
||
|
|
+++ digikam-2.5.0/core/digikam/album/albummanager.h
|
||
|
|
@@ -831,7 +831,7 @@ public:
|
||
|
|
{
|
||
|
|
foreach(T* t, list)
|
||
|
|
{
|
||
|
|
- append(AlbumPointer<T>(t));
|
||
|
|
+ this->append(AlbumPointer<T>(t));
|
||
|
|
}
|
||
|
|
return *this;
|
||
|
|
}
|