--- kio/kfile/kfiletreebranch.h.orig	Mon Mar 18 12:43:08 2002
+++ kio/kfile/kfiletreebranch.h	Thu Mar 28 17:06:46 2002
@@ -31,8 +31,6 @@
 #include <kio/job.h>
 #include <kfiletreeviewitem.h>
 
-class KURL;
-class KURL::List;
 class KFileTreeView;
 
 
--- kdecore/kwinmodule.cpp.orig	Sun Sep 23 23:05:16 2001
+++ kdecore/kwinmodule.cpp	Thu Mar 28 17:06:45 2002
@@ -283,7 +283,7 @@
 
 	a = a.intersect(r);
     }
-    return a;
+    return QRect(a);
 }
 
 
--- khtml/misc/khtmllayout.h.orig	Sun Jan 27 16:02:22 2002
+++ khtml/misc/khtmllayout.h	Thu Mar 28 17:06:46 2002
@@ -51,11 +51,11 @@
         Length(const Length &l) : value(l.value), type(l.type) {}
 
         Length& operator=(const Length& o)
-            { *((Q_UINT32 *)this) = *((Q_UINT32 *)&o); return *this; }
+            { value = o.value; type = o.type; return *this; }
         bool operator==(const Length& o) const
-            { return *((Q_UINT32 *)this) == *((Q_UINT32 *)&o); }
+            { return value == o.value && type == o.type; }
         bool operator!=(const Length& o) const
-            { return *((Q_UINT32 *)this) != *((Q_UINT32 *)&o); }
+            { return ! operator == (o); }
 
 
 	/*
@@ -100,8 +100,8 @@
         bool isFixed() const { return (type == Fixed); }
         bool isStatic() const { return (type == Static); }
 
-        int value : 29;
-        LengthType type : 3;
+        int value;
+        LengthType type;
     };
 
 };
--- kdewidgets/kdewidgets.cpp.orig	Fri Mar 22 02:25:37 2002
+++ kdewidgets/kdewidgets.cpp	Thu Mar 28 17:06:46 2002
@@ -398,4 +398,6 @@
 	return 0;
 }
 
+#if 0
 Q_EXPORT_PLUGIN(KDEWidgetsPlugin)
+#endif
--- kdewidgets/Makefile.am.orig	Mon Mar 18 12:42:57 2002
+++ kdewidgets/Makefile.am	Thu Mar 28 17:06:46 2002
@@ -24,7 +24,7 @@
 INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
 kde_widget_LTLIBRARIES = kdewidgets.la
 kdewidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kdewidgets_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kdewidgets_la_LIBADD = 
 kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp 
 
 make-kdewidgets: kde.widgets
--- kparts/componentfactory.h.orig	Sat Feb  9 01:56:55 2002
+++ kparts/componentfactory.h	Thu Mar 28 17:06:46 2002
@@ -10,7 +10,7 @@
 
     // this is a namespace and not a class because stupid egcs 1.1.2 doesn't grok
     // static template methods in classes. !@%@#$!
-    namespace ComponentFactory
+    struct ComponentFactory
     {
         /**
          * This enum type defines the possible error cases that can happen
--- khtml/rendering/font.h.orig	Thu Mar 28 22:26:53 2002
+++ khtml/rendering/font.h	Thu Mar 28 22:33:16 2002
@@ -56,7 +56,7 @@
     bool italic 		: 1;
     bool smallCaps 		: 1;
     unsigned int weight 		: 8;
-    mutable bool hasNbsp : 1;
+    mutable bool hasNbsp;
 };