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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 061fc32b0131dd09ce1250f95d1f14190fec2b66
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 30 22:48:24 2001 +0000

    Fine tune of commit for khtml/misc
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/misc/.cvsignore b/WebCore/khtml/misc/.cvsignore
index 282522d..e930125 100644
--- a/WebCore/khtml/misc/.cvsignore
+++ b/WebCore/khtml/misc/.cvsignore
@@ -1,2 +1,11 @@
 Makefile
 Makefile.in
+*.kde
+*.moc
+khtmldata.h
+htmltags.c
+htmltags.h
+htmltags.gperf
+htmlattrs.c
+htmlattrs.h
+htmlattrs.gperf
diff --git a/WebCore/khtml/misc/Makefile.in.apple b/WebCore/khtml/misc/Makefile.in.apple
index 67deb42..7732531 100644
--- a/WebCore/khtml/misc/Makefile.in.apple
+++ b/WebCore/khtml/misc/Makefile.in.apple
@@ -34,7 +34,7 @@ ATTRSFILES = \
 
 CFILES = $(TAGFILES) $(ATTRSFILES)
 
-OBJECTS = $(CFILES) $(CXXOBJECTS)
+OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
 
 LIBRARY = libkhtmlmisc.a
 
@@ -71,6 +71,9 @@ loader.cpp: loader.moc
 loader.moc:
 	touch loader.moc
 
+khtmldata.h:
+	touch $@
+
 $(TAGFILES):
 	./maketags
 
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/kdecore/kicontheme.h
similarity index 86%
copy from WebCore/kwq/KWQApplication.h
copy to WebCore/kwq/kdecore/kicontheme.h
index c8aa841..0a7f054 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/kdecore/kicontheme.h
@@ -23,16 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QAPPLICATION_H_
-#define QAPPLICATION_H_
+#ifndef KICONTHEME_H_
+#define KICONTHEME_H_
 
-class QPalette;
-class QWidget;
-
-class QApplication {
+class KIcon {
 public:
-    static QPalette palette(const QWidget* = 0);
-    static QWidget *desktop();
+    enum Context { Any, Action, Application, Device, FileSystem, MimeType };
+    enum States { DefaultState, ActiveState, DisabledState, LastState };
 };
 
 #endif
diff --git a/WebCore/src/kdelibs/khtml/misc/.cvsignore b/WebCore/src/kdelibs/khtml/misc/.cvsignore
index 282522d..e930125 100644
--- a/WebCore/src/kdelibs/khtml/misc/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/misc/.cvsignore
@@ -1,2 +1,11 @@
 Makefile
 Makefile.in
+*.kde
+*.moc
+khtmldata.h
+htmltags.c
+htmltags.h
+htmltags.gperf
+htmlattrs.c
+htmlattrs.h
+htmlattrs.gperf
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
index 67deb42..7732531 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
@@ -34,7 +34,7 @@ ATTRSFILES = \
 
 CFILES = $(TAGFILES) $(ATTRSFILES)
 
-OBJECTS = $(CFILES) $(CXXOBJECTS)
+OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
 
 LIBRARY = libkhtmlmisc.a
 
@@ -71,6 +71,9 @@ loader.cpp: loader.moc
 loader.moc:
 	touch loader.moc
 
+khtmldata.h:
+	touch $@
+
 $(TAGFILES):
 	./maketags
 
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/src/kwq/kdecore/kicontheme.h
similarity index 86%
copy from WebCore/kwq/KWQApplication.h
copy to WebCore/src/kwq/kdecore/kicontheme.h
index c8aa841..0a7f054 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/src/kwq/kdecore/kicontheme.h
@@ -23,16 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QAPPLICATION_H_
-#define QAPPLICATION_H_
+#ifndef KICONTHEME_H_
+#define KICONTHEME_H_
 
-class QPalette;
-class QWidget;
-
-class QApplication {
+class KIcon {
 public:
-    static QPalette palette(const QWidget* = 0);
-    static QWidget *desktop();
+    enum Context { Any, Action, Application, Device, FileSystem, MimeType };
+    enum States { DefaultState, ActiveState, DisabledState, LastState };
 };
 
 #endif

-- 
WebKit Debian packaging