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

4 files changed, 30 insertions, 3 deletions

diff --git a/misc/basket/distinfo b/misc/basket/distinfo
index 091c6c9521d..0706472efc4 100644
--- a/misc/basket/distinfo
+++ b/misc/basket/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/11/25 22:07:34 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/03/28 21:43:09 joerg Exp $
 
 SHA1 (basket-1.0.2.tar.gz) = 8f227c45d84e3739750d39b32700b3329b8c3c84
 RMD160 (basket-1.0.2.tar.gz) = 02e5a9bea054f0dc2aaa5c7f916a106dc970a1fd
@@ -6,3 +6,4 @@ Size (basket-1.0.2.tar.gz) = 6046068 bytes
 SHA1 (patch-aa) = 204154819ad1d53ec8d8c2e7ff25c6f508e9b311
 SHA1 (patch-src_backup.cpp) = 6f788a8ee4890a2c30ebc0ce669653d21938d581
 SHA1 (patch-src_bnpview.cpp) = e55093b14a1563e0018a53c447e5e44d9f645466
+SHA1 (patch-src_notefactory.h) = 349b8fcd86afc782e7501c92a3c7d7871cf56ba6
diff --git a/misc/basket/patches/patch-src_notefactory.h b/misc/basket/patches/patch-src_notefactory.h
new file mode 100644
index 00000000000..1e572ba437f
--- /dev/null
+++ b/misc/basket/patches/patch-src_notefactory.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_notefactory.h,v 1.1 2013/03/28 21:43:09 joerg Exp $
+
+--- src/notefactory.h.orig	2013-03-28 12:33:12.000000000 +0000
++++ src/notefactory.h
+@@ -32,8 +32,6 @@ class QColor;
+ class Basket;
+ class Note;
+ 
+-enum NoteType::Id;
+-
+ /** Factory class to create (new, drop, past) or load BasketIem, and eventuelly save them (?)
+   * @author Sébastien Laoût
+   */
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 85b237a8342..4706613507c 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2013/03/26 23:27:09 joerg Exp $
+$NetBSD: distinfo,v 1.54 2013/03/28 21:43:09 joerg Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -20,8 +20,9 @@ SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
 SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
-SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201
 SHA1 (patch-filters_kword_msword_graphicshandler.cpp) = a49e22d237c3b968b066ba56fa98fe34e67893dd
+SHA1 (patch-filters_kword_mswrite_mswriteimport.h) = b2ca756c351aad2ce4b41c3badebb87c896e3a6f
+SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201
 SHA1 (patch-kexi_plugins_forms_widgets_kexidblabel_cpp) = 39bf8dcc00a024461cc54b4991f1dfb8a7bdc41b
 SHA1 (patch-kexi_plugins_forms_widgets_kexiframe_cpp) = 8a19ef7efc3a15d0e54ae84c0df822a8c12caba6
 SHA1 (patch-kexi_plugins_importexport_csv_kexicsvexport_cpp) = d8e82dd72e29fcd50f0670d70cbf48550fa5d2be
diff --git a/misc/koffice/patches/patch-filters_kword_mswrite_mswriteimport.h b/misc/koffice/patches/patch-filters_kword_mswrite_mswriteimport.h
new file mode 100644
index 00000000000..eb9233cdfee
--- /dev/null
+++ b/misc/koffice/patches/patch-filters_kword_mswrite_mswriteimport.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-filters_kword_mswrite_mswriteimport.h,v 1.1 2013/03/28 21:43:09 joerg Exp $
+
+--- filters/kword/mswrite/mswriteimport.h.orig	2013-03-28 15:51:07.000000000 +0000
++++ filters/kword/mswrite/mswriteimport.h
+@@ -23,7 +23,6 @@
+ #include <KoFilter.h>
+ 
+ class WRIDevice;
+-class MSWrite::InternalParser;
+ class KWordGenerator;
+ 
+ class MSWriteImport : public KoFilter