[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:40:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2e540d47512412e5f2299ca212ae887caa564b37
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 29 19:11:49 2001 +0000
Added these file to help khtml/css to build
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@46 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQCursor.h b/WebCore/kwq/KWQKInstance.h
similarity index 95%
copy from WebCore/kwq/KWQCursor.h
copy to WebCore/kwq/KWQKInstance.h
index ebf8cb5..c47513a 100644
--- a/WebCore/kwq/KWQCursor.h
+++ b/WebCore/kwq/KWQKInstance.h
@@ -23,10 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QCURSOR_H
-#define QCURSOR_H
+#ifndef KINSTANCE_H_
+#define KINSTANCE_H_
-class QCursor {
+class KInstance {
+public:
};
#endif
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/kwq/KWQKPartsFactory.h
similarity index 90%
copy from WebCore/kwq/KWQKJob.h
copy to WebCore/kwq/KWQKPartsFactory.h
index a7267e6..ae230f4 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/kwq/KWQKPartsFactory.h
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef JOB_H_
-#define JOB_H_
+#ifndef FACTORY_H_
+#define FACTORY_H_
-// added to help in compilation of khtml/khtml_part.h:867
-namespace KIO {
+#include "part.h"
-class Job {
+// added to help in compilation of khtml/khtml_factory.h:34
+namespace KParts {
+class Factory {
};
-
}
-
+
#endif
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKPartsHistoryProvider.h
similarity index 83%
copy from WebCore/kwq/KWQKCharsets.h
copy to WebCore/kwq/KWQKPartsHistoryProvider.h
index b2854d0..55a64fb 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKPartsHistoryProvider.h
@@ -23,17 +23,23 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCHARSETS_H_
-#define KCHARSETS_H_
+#ifndef HISTORYPROVIDER_H_
+#define HISTORYPROVIDER_H_
+
+#include "part.h"
-class QFont;
class QString;
-class KCharsets {
+// added to help in compilation of khtml/khtml_factory.h:34
+namespace KParts {
+
+class HistoryProvider {
public:
- void setQFont(QFont &f, QString charset) const;
- QString xCharsetName(QFont::CharSet) const;
- bool supportsScript(const QFont &f, QFont::CharSet charset);
+ static HistoryProvider * self();
+
+ bool contains(const QString &) const;
};
+} // namespace KParts
+
#endif
diff --git a/WebCore/kwq/KWQCursor.h b/WebCore/kwq/kdecore/kinstance.h
similarity index 95%
copy from WebCore/kwq/KWQCursor.h
copy to WebCore/kwq/kdecore/kinstance.h
index ebf8cb5..c47513a 100644
--- a/WebCore/kwq/KWQCursor.h
+++ b/WebCore/kwq/kdecore/kinstance.h
@@ -23,10 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QCURSOR_H
-#define QCURSOR_H
+#ifndef KINSTANCE_H_
+#define KINSTANCE_H_
-class QCursor {
+class KInstance {
+public:
};
#endif
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/kwq/kparts/factory.h
similarity index 90%
copy from WebCore/kwq/KWQKJob.h
copy to WebCore/kwq/kparts/factory.h
index a7267e6..ae230f4 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/kwq/kparts/factory.h
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef JOB_H_
-#define JOB_H_
+#ifndef FACTORY_H_
+#define FACTORY_H_
-// added to help in compilation of khtml/khtml_part.h:867
-namespace KIO {
+#include "part.h"
-class Job {
+// added to help in compilation of khtml/khtml_factory.h:34
+namespace KParts {
+class Factory {
};
-
}
-
+
#endif
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/kparts/historyprovider.h
similarity index 83%
copy from WebCore/kwq/KWQKCharsets.h
copy to WebCore/kwq/kparts/historyprovider.h
index b2854d0..55a64fb 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/kparts/historyprovider.h
@@ -23,17 +23,23 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCHARSETS_H_
-#define KCHARSETS_H_
+#ifndef HISTORYPROVIDER_H_
+#define HISTORYPROVIDER_H_
+
+#include "part.h"
-class QFont;
class QString;
-class KCharsets {
+// added to help in compilation of khtml/khtml_factory.h:34
+namespace KParts {
+
+class HistoryProvider {
public:
- void setQFont(QFont &f, QString charset) const;
- QString xCharsetName(QFont::CharSet) const;
- bool supportsScript(const QFont &f, QFont::CharSet charset);
+ static HistoryProvider * self();
+
+ bool contains(const QString &) const;
};
+} // namespace KParts
+
#endif
diff --git a/WebCore/kwq/KWQCursor.h b/WebCore/src/kwq/kdecore/kinstance.h
similarity index 95%
copy from WebCore/kwq/KWQCursor.h
copy to WebCore/src/kwq/kdecore/kinstance.h
index ebf8cb5..c47513a 100644
--- a/WebCore/kwq/KWQCursor.h
+++ b/WebCore/src/kwq/kdecore/kinstance.h
@@ -23,10 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QCURSOR_H
-#define QCURSOR_H
+#ifndef KINSTANCE_H_
+#define KINSTANCE_H_
-class QCursor {
+class KInstance {
+public:
};
#endif
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/src/kwq/kparts/factory.h
similarity index 90%
copy from WebCore/kwq/KWQKJob.h
copy to WebCore/src/kwq/kparts/factory.h
index a7267e6..ae230f4 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/src/kwq/kparts/factory.h
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef JOB_H_
-#define JOB_H_
+#ifndef FACTORY_H_
+#define FACTORY_H_
-// added to help in compilation of khtml/khtml_part.h:867
-namespace KIO {
+#include "part.h"
-class Job {
+// added to help in compilation of khtml/khtml_factory.h:34
+namespace KParts {
+class Factory {
};
-
}
-
+
#endif
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/src/kwq/kparts/historyprovider.h
similarity index 83%
copy from WebCore/kwq/KWQKCharsets.h
copy to WebCore/src/kwq/kparts/historyprovider.h
index b2854d0..55a64fb 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/src/kwq/kparts/historyprovider.h
@@ -23,17 +23,23 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCHARSETS_H_
-#define KCHARSETS_H_
+#ifndef HISTORYPROVIDER_H_
+#define HISTORYPROVIDER_H_
+
+#include "part.h"
-class QFont;
class QString;
-class KCharsets {
+// added to help in compilation of khtml/khtml_factory.h:34
+namespace KParts {
+
+class HistoryProvider {
public:
- void setQFont(QFont &f, QString charset) const;
- QString xCharsetName(QFont::CharSet) const;
- bool supportsScript(const QFont &f, QFont::CharSet charset);
+ static HistoryProvider * self();
+
+ bool contains(const QString &) const;
};
+} // namespace KParts
+
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list