[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[gramps]

The following commit has been merged in the debian/unstable branch:
commit babee7bf1e0a4e07d48d1a87a8397422ba7f95a1
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 31 15:38:18 2001 +0000

    More changes to get this beast to compile
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFile.h b/WebCore/kwq/KWQFile.h
index 2c2992c..29c57a4 100644
--- a/WebCore/kwq/KWQFile.h
+++ b/WebCore/kwq/KWQFile.h
@@ -26,20 +26,16 @@
 #ifndef QFILE_H_
 #define QFILE_H_
 
-class QString;
-
-QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+#include "qstring.h"
 
 class QFile {
 public:
     QFile();
-    QFile(const QString &name);
-
+    QFile(const QString &);
     bool open(int);
     void close();
     uint size() const;
-
-    int readBlock(char *data, uint len);
+    int readBlock(char *, uint);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKStandardDirs.h b/WebCore/kwq/KWQKStandardDirs.h
index 9000d06..675cf9c 100644
--- a/WebCore/kwq/KWQKStandardDirs.h
+++ b/WebCore/kwq/KWQKStandardDirs.h
@@ -26,9 +26,14 @@
 #ifndef KSTDDIRS_H_
 #define KSTDDIRS_H_
 
+#include <qstring.h>
+#include "kglobal.h"
+
 class KStandardDirs {
 public:
-    QString saveLocation(const char *type, const QString& suffix = QString::null, bool create = true) const;
+    QString saveLocation(const char *, const QString &suffix = QString::null, bool create = true) const;
 };
 
+QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+
 #endif
diff --git a/WebCore/kwq/kdecore/kstddirs.h b/WebCore/kwq/kdecore/kstddirs.h
index 9000d06..675cf9c 100644
--- a/WebCore/kwq/kdecore/kstddirs.h
+++ b/WebCore/kwq/kdecore/kstddirs.h
@@ -26,9 +26,14 @@
 #ifndef KSTDDIRS_H_
 #define KSTDDIRS_H_
 
+#include <qstring.h>
+#include "kglobal.h"
+
 class KStandardDirs {
 public:
-    QString saveLocation(const char *type, const QString& suffix = QString::null, bool create = true) const;
+    QString saveLocation(const char *, const QString &suffix = QString::null, bool create = true) const;
 };
 
+QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+
 #endif
diff --git a/WebCore/kwq/qt/qfile.h b/WebCore/kwq/qt/qfile.h
index 2c2992c..29c57a4 100644
--- a/WebCore/kwq/qt/qfile.h
+++ b/WebCore/kwq/qt/qfile.h
@@ -26,20 +26,16 @@
 #ifndef QFILE_H_
 #define QFILE_H_
 
-class QString;
-
-QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+#include "qstring.h"
 
 class QFile {
 public:
     QFile();
-    QFile(const QString &name);
-
+    QFile(const QString &);
     bool open(int);
     void close();
     uint size() const;
-
-    int readBlock(char *data, uint len);
+    int readBlock(char *, uint);
 };
 
 #endif
diff --git a/WebCore/src/kwq/kdecore/kstddirs.h b/WebCore/src/kwq/kdecore/kstddirs.h
index 9000d06..675cf9c 100644
--- a/WebCore/src/kwq/kdecore/kstddirs.h
+++ b/WebCore/src/kwq/kdecore/kstddirs.h
@@ -26,9 +26,14 @@
 #ifndef KSTDDIRS_H_
 #define KSTDDIRS_H_
 
+#include <qstring.h>
+#include "kglobal.h"
+
 class KStandardDirs {
 public:
-    QString saveLocation(const char *type, const QString& suffix = QString::null, bool create = true) const;
+    QString saveLocation(const char *, const QString &suffix = QString::null, bool create = true) const;
 };
 
+QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+
 #endif
diff --git a/WebCore/src/kwq/qt/qfile.h b/WebCore/src/kwq/qt/qfile.h
index 2c2992c..29c57a4 100644
--- a/WebCore/src/kwq/qt/qfile.h
+++ b/WebCore/src/kwq/qt/qfile.h
@@ -26,20 +26,16 @@
 #ifndef QFILE_H_
 #define QFILE_H_
 
-class QString;
-
-QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+#include "qstring.h"
 
 class QFile {
 public:
     QFile();
-    QFile(const QString &name);
-
+    QFile(const QString &);
     bool open(int);
     void close();
     uint size() const;
-
-    int readBlock(char *data, uint len);
+    int readBlock(char *, uint);
 };
 
 #endif

-- 
WebKit Debian packaging