Forward declaration must not be qualified with a namespace. Adjust.

14 files changed, 134 insertions, 5 deletions

diff --git a/graphics/cinepaint/distinfo b/graphics/cinepaint/distinfo
index 171dd0c680a..e4c1528f25a 100644
--- a/graphics/cinepaint/distinfo
+++ b/graphics/cinepaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2012/08/12 22:04:47 wiz Exp $
+$NetBSD: distinfo,v 1.18 2013/03/28 21:43:06 joerg Exp $
 
 SHA1 (cinepaint-0.22-1.tar.gz) = 717580b9b8b1044d76f1f0e4330e1c8104e2a206
 RMD160 (cinepaint-0.22-1.tar.gz) = 1f8e06486ed5e74ad483abec305d4fcef0538572
@@ -15,6 +15,7 @@ SHA1 (patch-app_gradient.c) = 9b6d38f1d3a5c417b3f69f4107637ec1ec33da0c
 SHA1 (patch-app_layers__dialog.c) = a9c4459edc83bd7e3faf1c90d9f4cff5d5e69a19
 SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp) = e5e457d8f8ceb0ae3b4b965cbc740969b4ed81d4
 SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp) = a369c351d8bb05e79afa6c19592fbc148143d985
+SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__examin.h) = eb4dba58efd6ff19c5eae770361b49fdacd4b375
 SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h) = a5a72d106b655f79932b0d2d032136a32acbeafb
 SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp) = 2e733a0c557236a735b97a7174795965b4bd4e0c
 SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__speicher.h) = 1eef5be81fe36c2eb9ecf50606ecb294644e15f4
diff --git a/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__examin.h b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__examin.h
new file mode 100644
index 00000000000..96a610608f9
--- /dev/null
+++ b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__examin.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__examin.h,v 1.1 2013/03/28 21:43:06 joerg Exp $
+
+--- plug-ins/icc_examin/icc_examin/icc_examin.h.orig	2013-03-28 13:10:09.000000000 +0000
++++ plug-ins/icc_examin/icc_examin/icc_examin.h
+@@ -47,7 +47,6 @@ class  ICCwaehler;
+ class  ICCexamin;
+ extern ICCexamin *icc_examin;
+ class  ICCexaminIO;
+-class  icc_examin_ns::EinModell;
+ 
+ namespace icc_examin_ns {
+     enum IccGamutFormat {
diff --git a/graphics/digikam-kde3/distinfo b/graphics/digikam-kde3/distinfo
index bfa37e08f26..7650d87e359 100644
--- a/graphics/digikam-kde3/distinfo
+++ b/graphics/digikam-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/07/03 18:08:58 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:43:06 joerg Exp $
 
 SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 8f19dd6698647434bb20f222ef25024473a7ff2d
 SHA1 (patch-af) = d34710baea502e96cd8254164157ef68a4ef276f
 SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c
 SHA1 (patch-digikam_digikam_albummanager.cpp) = 49df2695fd8aae3b13257efaf07af96adac6a638
+SHA1 (patch-digikam_digikam_albumwidgetstack.h) = ee709372079cedbe0cb020caaf8aa1631376ec9d
diff --git a/graphics/digikam-kde3/patches/patch-digikam_digikam_albumwidgetstack.h b/graphics/digikam-kde3/patches/patch-digikam_digikam_albumwidgetstack.h
new file mode 100644
index 00000000000..0edf86bf9dd
--- /dev/null
+++ b/graphics/digikam-kde3/patches/patch-digikam_digikam_albumwidgetstack.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-digikam_digikam_albumwidgetstack.h,v 1.1 2013/03/28 21:43:06 joerg Exp $
+
+--- digikam/digikam/albumwidgetstack.h.orig	2013-03-28 12:25:46.000000000 +0000
++++ digikam/digikam/albumwidgetstack.h
+@@ -35,8 +35,6 @@
+ 
+ #include "digikam_export.h"
+ 
+-class KURL::List;
+-
+ namespace Digikam
+ {
+ 
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 5f050974ed0..51671a41f20 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2012/12/30 10:31:14 adam Exp $
+$NetBSD: distinfo,v 1.46 2013/03/28 21:43:07 joerg Exp $
 
 SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c
 RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8
@@ -23,6 +23,7 @@ SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40
 SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 02742a022a8a55852d7f0a39969153bf7f24f17e
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b
+SHA1 (patch-src_libvpsc_csolve__VPSC.h) = 33aa27678fa9e802af6ab95b9ea28b69d822c4cb
 SHA1 (patch-src_ui_dialog_inkscape-preferences.cpp) = f95af6d326ddf7512b67f68efe0b23bc3ebe651e
 SHA1 (patch-src_ui_widget_registered-widget.h) = a5c16bcd28a015959121ed8b92423762f182a71b
 SHA1 (patch-src_widgets_desktop-widget.h) = 6528b3105590bfa8b5d33d428aa8c9cbc3561225
diff --git a/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h b/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h
new file mode 100644
index 00000000000..44f430cd6cf
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libvpsc_csolve__VPSC.h,v 1.1 2013/03/28 21:43:07 joerg Exp $
+
+--- src/libvpsc/csolve_VPSC.h.orig	2013-03-27 22:12:45.000000000 +0000
++++ src/libvpsc/csolve_VPSC.h
+@@ -11,10 +11,6 @@
+ #ifndef _CSOLVE_VPSC_H_
+ #define _CSOLVE_VPSC_H_
+ #ifdef __cplusplus
+-class vpsc::Variable;
+-class vpsc::Constraint;
+-class vpsc::Solver;
+-class vpsc::IncSolver;
+ using namespace vpsc;
+ extern "C" {
+ #else
diff --git a/graphics/kipi-plugins-kde3/distinfo b/graphics/kipi-plugins-kde3/distinfo
index 4f607b3a38a..47d13c23a46 100644
--- a/graphics/kipi-plugins-kde3/distinfo
+++ b/graphics/kipi-plugins-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2013/02/26 11:12:53 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/03/28 21:43:07 joerg Exp $
 
 SHA1 (kipi-plugins-0.1.7.tar.bz2) = 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216
 RMD160 (kipi-plugins-0.1.7.tar.bz2) = f66473c11e66f9e06aa6772c7952b640b565def9
@@ -8,7 +8,11 @@ SHA1 (patch-ab) = 777834238d49c0b02c7e1d5c63dbdf0d27f13e24
 SHA1 (patch-ac) = 0022166061696e3db820c97be64e2780a63e8b4c
 SHA1 (patch-ad) = b33efd502e1bd305242debe0e9837903ab34021f
 SHA1 (patch-ae) = 6e12d87f6169d3ba1687eaa202c2edb1ac5ec7a4
+SHA1 (patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h) = 699e11538538ae06232ecdd495cce0ce59240dd1
 SHA1 (patch-kipi-plugins_flickrexport_imageslist.cpp) = 43b3a56f1b686253e94eab921670447822c1695b
 SHA1 (patch-kipi-plugins_imageviewer_viewerwidget.cpp) = 173a70306d89fec21e27bb3cf6a14198b4eeffca
+SHA1 (patch-kipi-plugins_mpegencoder_kimg2mpg.h) = 8a594ee6610e2cb3726dd4179505c0450c1443ef
 SHA1 (patch-kipi-plugins_printwizard_cropframe.cpp) = 308813ad515ef0f9e9d7f863c456dd968ca78d39
 SHA1 (patch-kipi-plugins_rawconverter_rawdecodingiface.cpp) = 2105ef9bee4f4c64f1205ff40431fec2ef1517a5
+SHA1 (patch-kipi-plugins_sendimages_listimageserrordialog.h) = 0763f257034d7aa7f59129743b5a1b98cefae529
+SHA1 (patch-kipi-plugins_sendimages_plugin__sendimages.h) = 1340bc3e8d9c6972ae622bcb9592b5d3aaecec74
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h
new file mode 100644
index 00000000000..a530cf81f23
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h,v 1.1 2013/03/28 21:43:07 joerg Exp $
+
+--- kipi-plugins/batchprocessimages/plugin_batchprocessimages.h.orig	2013-03-27 16:29:57.000000000 +0000
++++ kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
+@@ -33,15 +33,6 @@
+ 
+ class KAction;
+ 
+-class KIPIBatchProcessImagesPlugin::BorderImagesDialog;
+-class KIPIBatchProcessImagesPlugin::ColorImagesDialog;
+-class KIPIBatchProcessImagesPlugin::ConvertImagesDialog;
+-class KIPIBatchProcessImagesPlugin::EffectImagesDialog;
+-class KIPIBatchProcessImagesPlugin::FilterImagesDialog;
+-class KIPIBatchProcessImagesPlugin::RenameImagesDialog;
+-class KIPIBatchProcessImagesPlugin::RecompressImagesDialog;
+-class KIPIBatchProcessImagesPlugin::ResizeImagesDialog;
+-
+ class Plugin_BatchProcessImages : public KIPI::Plugin
+ {
+ Q_OBJECT
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_mpegencoder_kimg2mpg.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_mpegencoder_kimg2mpg.h
new file mode 100644
index 00000000000..078de84731c
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_mpegencoder_kimg2mpg.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-kipi-plugins_mpegencoder_kimg2mpg.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- kipi-plugins/mpegencoder/kimg2mpg.h.orig	2013-03-27 16:36:59.000000000 +0000
++++ kipi-plugins/mpegencoder/kimg2mpg.h
+@@ -66,7 +66,6 @@ class KColorButton;
+ class KListBox;
+ class KButtonBox;
+ class KProgress;
+-class KURL::List;
+ 
+ namespace KIPIMPEGEncoderPlugin
+ {
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_listimageserrordialog.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_listimageserrordialog.h
new file mode 100644
index 00000000000..d3c6b7c3a2f
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_listimageserrordialog.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-kipi-plugins_sendimages_listimageserrordialog.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- kipi-plugins/sendimages/listimageserrordialog.h.orig	2013-03-27 16:40:27.000000000 +0000
++++ kipi-plugins/sendimages/listimageserrordialog.h
+@@ -28,7 +28,6 @@
+ #include <kdialogbase.h>
+ 
+ class KListView;
+-class KURL::List;
+ 
+ namespace KIPISendimagesPlugin
+ {
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_plugin__sendimages.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_plugin__sendimages.h
new file mode 100644
index 00000000000..aa8e03657ec
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_plugin__sendimages.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-kipi-plugins_sendimages_plugin__sendimages.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- kipi-plugins/sendimages/plugin_sendimages.h.orig	2013-03-27 16:41:39.000000000 +0000
++++ kipi-plugins/sendimages/plugin_sendimages.h
+@@ -30,7 +30,6 @@
+ class QCustomEvent;
+ 
+ class KAction;
+-class KIPISendimagesPlugin::SendImages;
+ 
+ namespace KIPI
+ {
diff --git a/graphics/showimg/distinfo b/graphics/showimg/distinfo
index c4ce84048f9..52df4d768d2 100644
--- a/graphics/showimg/distinfo
+++ b/graphics/showimg/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/01/29 22:00:59 markd Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:43:08 joerg Exp $
 
 SHA1 (showimg-0.9.5.tar.bz2) = 59d3a1f1a22761e0576d98e6cc6f430cc3822643
 RMD160 (showimg-0.9.5.tar.bz2) = 150dc74f400b72a22f6a117aa3acd8201a059a39
 Size (showimg-0.9.5.tar.bz2) = 4117897 bytes
 SHA1 (patch-aa) = 90d10f0989e66c29e8a9bae4ee51527818bc0cb1
 SHA1 (patch-ab) = 0d90531ac8edc44cff1d6533548f5d564e2e373f
+SHA1 (patch-showimg_showimg_listitemview.h) = 50b54d099ce66fc25ef76311df30d5e97fe8a7cf
+SHA1 (patch-showimg_showimg_mainwindow.h) = a8f2e37f1e3d6c2455f5417a0ab4b70bac669c2f
diff --git a/graphics/showimg/patches/patch-showimg_showimg_listitemview.h b/graphics/showimg/patches/patch-showimg_showimg_listitemview.h
new file mode 100644
index 00000000000..643c31a9c93
--- /dev/null
+++ b/graphics/showimg/patches/patch-showimg_showimg_listitemview.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-showimg_showimg_listitemview.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- showimg/showimg/listitemview.h.orig	2013-03-28 12:11:17.000000000 +0000
++++ showimg/showimg/listitemview.h
+@@ -38,7 +38,6 @@ class KAction;
+ class KDirWatch;
+ class KListView;
+ class KPopupMenu;
+-class KIO::Job;
+ 
+ class QDragEnterEvent;
+ class QDropEvent;
diff --git a/graphics/showimg/patches/patch-showimg_showimg_mainwindow.h b/graphics/showimg/patches/patch-showimg_showimg_mainwindow.h
new file mode 100644
index 00000000000..f54acb8bd47
--- /dev/null
+++ b/graphics/showimg/patches/patch-showimg_showimg_mainwindow.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-showimg_showimg_mainwindow.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- showimg/showimg/mainwindow.h.orig	2013-03-28 12:13:26.000000000 +0000
++++ showimg/showimg/mainwindow.h
+@@ -113,7 +113,6 @@ class KHistoryCombo;
+ class KSqueezedTextLabel;
+ class KMdiChildView;
+ class KMdiToolViewAccessor;
+-class KParts::ReadOnlyPart;
+ 
+ class SHOWIMGCORE_EXPORT MainWindow : public KParts::DockMainWindow, public KBookmarkOwner
+ {