Fix template lookup. Don't add default arguments at implementation time.

4 files changed, 43 insertions, 1 deletions

diff --git a/graphics/kipi-plugins/distinfo b/graphics/kipi-plugins/distinfo
index 4b8c5e8d410..f3acabe276a 100644
--- a/graphics/kipi-plugins/distinfo
+++ b/graphics/kipi-plugins/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.27 2012/03/21 21:03:50 markd Exp $
+$NetBSD: distinfo,v 1.28 2013/03/02 18:08:48 joerg Exp $
 
 SHA1 (digikam-2.5.0.tar.bz2) = 6cadb838669d1bdcbd6abb677889f7d68d696383
 RMD160 (digikam-2.5.0.tar.bz2) = 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb
 Size (digikam-2.5.0.tar.bz2) = 54976375 bytes
+SHA1 (patch-htmlexport_wizard.cpp) = 0fa8c9a6fe315bc228e016aba2cd49f502a403c9
+SHA1 (patch-printimages_wizard_cropframe.cpp) = fc3cd2ec0175539d5d6013a2994a8b9bde0ecc57
+SHA1 (patch-printimages_wizard_wizard.cpp) = 18cae2452cab382923f2dbc5254a4ee6e27ad96b
diff --git a/graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp b/graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp
new file mode 100644
index 00000000000..455b46f27e4
--- /dev/null
+++ b/graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-htmlexport_wizard.cpp,v 1.1 2013/03/02 18:08:48 joerg Exp $
+
+--- htmlexport/wizard.cpp.orig	2013-02-28 12:13:45.000000000 +0000
++++ 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);
+     }
diff --git a/graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp b/graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp
new file mode 100644
index 00000000000..da9d2d08502
--- /dev/null
+++ b/graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-printimages_wizard_cropframe.cpp,v 1.1 2013/03/02 18:08:48 joerg Exp $
+
+--- printimages/wizard/cropframe.cpp.orig	2013-02-28 12:07:37.000000000 +0000
++++ printimages/wizard/cropframe.cpp
+@@ -41,7 +41,7 @@
+ namespace KIPIPrintImagesPlugin
+ {
+ 
+-CropFrame::CropFrame(QWidget* parent=0)
++CropFrame::CropFrame(QWidget* parent)
+     : QWidget(parent)
+ {
+     m_mouseDown = false;
diff --git a/graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp b/graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp
new file mode 100644
index 00000000000..9d679e678f4
--- /dev/null
+++ b/graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-printimages_wizard_wizard.cpp,v 1.1 2013/03/02 18:08:48 joerg Exp $
+
+--- printimages/wizard/wizard.cpp.orig	2013-02-28 12:09:11.000000000 +0000
++++ 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 );
+     }