[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kdom (silent)
From:       Rob Buis <rwlbuis () xs4all ! nl>
Date:       2005-09-06 8:54:04
Message-ID: 1125996844.963426.1525.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 457638 by buis:

SVN_SILENT: again syncing with Erics code base.


 M  +12 -0     cache/KDOMCachedObject.cpp  
 M  +1 -1      cache/KDOMCachedScript.cpp  
 M  +1 -1      cache/KDOMCachedStyleSheet.cpp  
 M  +4 -0      cache/KDOMLoader.cpp  
 M  +2 -0      kdom.h  
 M  +10 -4     scripts/cssmakeprops  
 M  +10 -4     scripts/cssmakevalues  


--- trunk/kdenonbeta/kdom/cache/KDOMCachedObject.cpp #457637:457638
@@ -123,10 +123,18 @@
     int s = buffer.size();
 
     if(s >= 3 && d[0] == 0xef && d[1] == 0xbb && d[2] == 0xbf)
+#ifdef APPLE_CHANGES
+        return QTextCodec::codecForName("utf-8"); // UTF-8
+#else
         return QTextCodec::codecForMib( 106 ); // UTF-8
+#endif
 
     if(s >= 2 && ((d[0] == 0xff && d[1] == 0xfe) || (d[0] == 0xfe && d[1] == 0xff)))
+#ifdef APPLE_CHANGES
+        return QTextCodec::codecForName("ucs-2"); // UCS-2
+#else
         return QTextCodec::codecForMib( 1000 ); // UCS-2
+#endif
 
     if(!charset.isEmpty())
     {
@@ -137,7 +145,11 @@
         return c;
     }
 
+#ifdef APPLE_CHANGES
+    return QTextCodec::codecForName("latin-1");; // latin-1
+#else
     return QTextCodec::codecForMib(4); // latin-1
+#endif
 }
     
 void CachedObject::setRequest(Request *request)
--- trunk/kdenonbeta/kdom/cache/KDOMCachedScript.cpp #457637:457638
@@ -63,7 +63,7 @@
 
     QTextCodec *c = codecForBuffer(m_charset, buffer.buffer());
     QString data = c->toUnicode( buffer.buffer().data(), m_size );
-    m_script = (data[0] == QChar::byteOrderMark) ? DOMString(data.mid(1)) : \
DOMString(data); +	m_script = (data[0].unicode() == QChar::byteOrderMark) ? \
DOMString(data.mid(1)) : DOMString(data);  m_loading = false;
     checkNotify();
 }
--- trunk/kdenonbeta/kdom/cache/KDOMCachedStyleSheet.cpp #457637:457638
@@ -88,7 +88,7 @@
     QString data = c->toUnicode(buffer.buffer().data(), m_size);
 
     // workaround Qt bugs
-    m_sheet = data[0] == QChar::byteOrderMark ? DOMString(data.mid(1)) : \
DOMString(data); +    m_sheet = data[0].unicode() == QChar::byteOrderMark ? \
DOMString(data.mid(1)) : DOMString(data);  m_loading = false;
 
     checkNotify();
--- trunk/kdenonbeta/kdom/cache/KDOMLoader.cpp #457637:457638
@@ -26,7 +26,9 @@
 */
 
 #include <kdebug.h>
+#ifndef APPLE_CHANGES
 #include <kio/scheduler.h>
+#endif
 
 #include <kdom/core/DocumentImpl.h>
 
@@ -172,9 +174,11 @@
     if(m_docObjects.find(object))
         return;
 
+#ifndef APPLE_CHANGES
     m_docObjects.insert(object, object);
     if(m_docObjects.count() > 3 * m_docObjects.size())
         m_docObjects.resize(cacheNextSeed(m_docObjects.size()));
+#endif
 }
 
 void DocumentLoader::removeCachedObject(CachedObject *object) const
--- trunk/kdenonbeta/kdom/kdom.h #457637:457638
@@ -138,7 +138,9 @@
     #define isImplicitNode(n) (false) // TODO: check that when khtml2 is ready
 
     // Debugging helper
+#ifndef APPLE_CHANGES
     inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &string) { \
return (stream << string.string()); } +#endif
     inline kdbgstream  &operator<<(kdbgstream  &stream, const DOMString &string) { \
return (stream << string.string()); }  };
 
--- trunk/kdenonbeta/kdom/scripts/cssmakeprops #457637:457638
@@ -23,11 +23,17 @@
 
 my $nsFull = $ARGV[1];
 my $ns = $nsFull; $ns =~ s/K//;
+my $basename = "cssproperties";
+if (defined($ARGV[2]) && $ARGV[2] eq "-f") {
+    my $inputfile = $ARGV[3];
+    $inputfile =~ m/(.*)\.in/;
+    $basename = $1;
+}
 
-my $filec = "cssproperties.c";
-my $fileh = "cssproperties.h";
-my $filein = "cssproperties.in";
-my $filegperf = "cssproperties.gperf";
+my $filec = "$basename.c";
+my $fileh = "$basename.h";
+my $filein = "$basename.in";
+my $filegperf = "$basename.gperf";
 
 open IN, $filein or die "Can't open $filein\n";
 open header, ">$fileh" or die "Can't open $fileh\n";
--- trunk/kdenonbeta/kdom/scripts/cssmakevalues #457637:457638
@@ -23,11 +23,17 @@
 
 my $nsFull = $ARGV[1];
 my $ns = $nsFull; $ns =~ s/K//;
+my $basename = "cssvalues";
+if (defined($ARGV[2]) && $ARGV[2] eq "-f") {
+    my $inputfile = $ARGV[3];
+    $inputfile =~ m/(.*)\.in/;
+    $basename = $1;
+}
 
-my $filec = "cssvalues.c";
-my $fileh = "cssvalues.h";
-my $filein = "cssvalues.in";
-my $filegperf = "cssvalues.gperf";
+my $filec = "$basename.c";
+my $fileh = "$basename.h";
+my $filein = "$basename.in";
+my $filegperf = "$basename.gperf";
 
 open IN, $filein or die "Can't open $filein\n";
 open header, ">$fileh" or die "Can't open $fileh\n";


[prev in list] [next in list] [prev in thread] [next in thread]