--- kpackage/kpackage.h.orig	Thu Apr  4 12:53:43 2002
+++ kpackage/kpackage.h	Thu Apr  4 12:53:55 2002
@@ -54,7 +54,7 @@
 //////////////////////////////////////////////////////////////////////////////
 class KPACKAGE : public QWidget
 {
-  Q_OBJECT;
+  Q_OBJECT
 
   ///////////// METHODS ------------------------------------------------------
 public:
@@ -201,7 +201,7 @@
 
 class KPKG : public KMainWindow
 {
-  Q_OBJECT;
+  Q_OBJECT
 
   enum { Tback = 1,
 	 Tforward = 2,
--- kpackage/managementWidget.h.orig	Thu Apr  4 12:54:02 2002
+++ kpackage/managementWidget.h	Thu Apr  4 12:54:08 2002
@@ -42,7 +42,7 @@
 
 class managementWidget : public QFrame
 {
-  Q_OBJECT;
+  Q_OBJECT
 
   ///////////// METHODS ------------------------------------------------------
 public:
--- kpackage/procbuf.h.orig	Thu Apr  4 12:54:12 2002
+++ kpackage/procbuf.h	Thu Apr  4 12:54:21 2002
@@ -21,7 +21,7 @@
 
 class procbuf: public QObject
 {
-  Q_OBJECT;
+  Q_OBJECT
 
 public:
   procbuf();
--- kpackage/pkgInterface.h.orig	Thu Apr  4 12:54:27 2002
+++ kpackage/pkgInterface.h	Thu Apr  4 12:54:37 2002
@@ -119,7 +119,7 @@
 				  bool &test);
 
   ///////////// DATA ///////////////////////
-  pkgOptions *uninstallation, *installation;;
+  pkgOptions *uninstallation, *installation;
 
   QString icon;
   // name icon file
--- kpackage/kpTerm.h.orig	Thu Apr  4 12:54:43 2002
+++ kpackage/kpTerm.h	Thu Apr  4 12:54:50 2002
@@ -43,7 +43,7 @@
 
 class kpRun: public KDialogBase
 {
-  Q_OBJECT;
+  Q_OBJECT
 
 public:
   kpRun(QWidget *parent = 0);
--- kpackage/pkgOptions.h.orig	Thu Apr  4 12:54:57 2002
+++ kpackage/pkgOptions.h	Thu Apr  4 12:55:35 2002
@@ -30,7 +30,7 @@
 
 class pkgOptions : public KDialog
 {
-  Q_OBJECT;
+  Q_OBJECT
 public:
   pkgOptions( pkgInterface *pki, QWidget *parent=0);
   ~pkgOptions();
@@ -96,7 +96,7 @@
 ///////////////////////////////////////////////////////////////////////////
 class pkgOptionsI: public pkgOptions
 {
-  Q_OBJECT;
+  Q_OBJECT
 public:
   pkgOptionsI(pkgInterface *pkg, QWidget *parent = 0);
   QString doPackages(int installFlags, QPtrList<packageInfo> *p, bool &test);
@@ -106,7 +106,7 @@
 ///////////////////////////////////////////////////////////////////////////
 class pkgOptionsU: public pkgOptions
 {
-  Q_OBJECT;
+  Q_OBJECT
 public:
   pkgOptionsU(pkgInterface *pkg, QWidget *parent = 0);
   QString doPackages(int installFlags, QPtrList<packageInfo> *p, bool &test);
--- kpackage/packageDisplay.h.orig	Thu Apr  4 12:56:17 2002
+++ kpackage/packageDisplay.h	Thu Apr  4 12:56:24 2002
@@ -37,7 +37,7 @@
 
 class packageDisplayWidget : public QTabWidget
 {
-  Q_OBJECT;
+  Q_OBJECT
 
   ///////////// METHODS ------------------------------------------------------
 public:
--- kpackage/packageProperties.h.orig	Thu Apr  4 12:56:29 2002
+++ kpackage/packageProperties.h	Thu Apr  4 12:56:41 2002
@@ -32,7 +32,7 @@
 
 class packagePropertiesWidget : public QTextBrowser
 {
-  Q_OBJECT;
+  Q_OBJECT
   ///////////// METHODS ------------------------------------------------------
 public:
 
--- kpackage/updateLoc.h.orig	Thu Apr  4 13:00:01 2002
+++ kpackage/updateLoc.h	Thu Apr  4 13:00:31 2002
@@ -106,7 +106,7 @@
   QGroupBox *fbase;
   QVBoxLayout* vbase;
 
-  static const int PNUM = 40;
+  enum { PNUM = 40 };
   int numLines;
   dpanel *dp[PNUM];
   KComboBox *combo[PNUM];
@@ -146,7 +146,7 @@
 void restore();
 
 int numPanels;
-static const int PANNUM = 10;
+enum { PANNUM = 10 };
 updateLoc *pn[PANNUM];
 
 public slots:
--- kwuftpd/ftpaccess.cpp.orig	Thu Apr  4 13:06:16 2002
+++ kwuftpd/ftpaccess.cpp	Thu Apr  4 13:19:14 2002
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <qtextstream.h>
 #include <qregexp.h>
 
@@ -9,7 +13,7 @@
 #ifdef __DECCXX
 #define _RWSTD_NO_NAMESPACE
 #endif
-#include <strstream.h>
+#include <strstream>
 #include <ctype.h>
 #include <stdio.h>
 
@@ -1011,7 +1015,7 @@
 {
 	char *h=(char *) malloc(128);
 	memset(h,0,128);
-	strstream id(h,128);
+	std::strstream id(h,128);
 	id.seekp(0);
 	if(isAny())
 		id << "Any";