commit kdewebdev3

24 May 2006

Hello community,

here is the log from the commit of package kdewebdev3
checked in at Thu May 25 00:39:49 CEST 2006.

--------

--- KDE/kdewebdev3/kdewebdev3.changes	2006-05-22 16:27:32.000000000 +0200
+++ kdewebdev3/kdewebdev3.changes	2006-05-24 13:26:31.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 24 10:34:58 CEST 2006 - stbinner@suse.de
+
+- update to 3.5.3
+   * Several fixes for Quanta and klinkstatus
+
+-------------------------------------------------------------------

Old:
----
  kdewebdev-3.5.2.tar.bz2

New:
----
  kdewebdev-3.5.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdewebdev3.spec ++++++
--- /var/tmp/diff_new_pack.lYjAHd/_old	2006-05-25 00:39:17.000000000 +0200
+++ /var/tmp/diff_new_pack.lYjAHd/_new	2006-05-25 00:39:17.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package kdewebdev3 (Version 3.5.2)
+# spec file for package kdewebdev3 (Version 3.5.3)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -18,8 +18,8 @@
 License:        GPL
 Group:          Productivity/Publishing/HTML/Editors
 Summary:        KDE Web Development Suite
-Version:        3.5.2
-Release:        3
+Version:        3.5.3
+Release:        1
 # should not be a hard require
 Requires:       tidy
 Obsoletes:      quanta
@@ -116,6 +116,9 @@
 %lang(en) %doc /opt/kde3/share/doc/HTML/en/*
 
 %changelog -n kdewebdev3
+* Wed May 24 2006 - stbinner@suse.de
+- update to 3.5.3
+  * Several fixes for Quanta and klinkstatus
 * Mon May 22 2006 - adrian@suse.de
 - fix build for 10.0 in openSUSE build service
 * Mon Mar 20 2006 - stbinner@suse.de

++++++ kdewebdev-3.5.2.tar.bz2 -> kdewebdev-3.5.3.tar.bz2 ++++++
++++    1927 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/VERSION new/kdewebdev-3.5.3/VERSION
--- old/kdewebdev-3.5.2/VERSION	2006-03-17 11:14:49.000000000 +0100
+++ new/kdewebdev-3.5.3/VERSION	2006-05-22 20:09:47.000000000 +0200
@@ -1 +1 @@
-KDE WebDev 3.5.2
\ No newline at end of file
+KDE WebDev 3.5.3
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/acinclude.m4 new/kdewebdev-3.5.3/acinclude.m4
--- old/kdewebdev-3.5.2/acinclude.m4	2006-03-18 15:05:13.000000000 +0100
+++ new/kdewebdev-3.5.3/acinclude.m4	2006-05-23 22:53:09.000000000 +0200
@@ -784,7 +784,7 @@
    # CoreAudio framework
    AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
      AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
+     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
    ])
 
    AC_CHECK_RES_INIT
@@ -3023,8 +3023,8 @@
   [
   kde_cv_opt_noinline_match=irrelevant
   dnl if we don't use both -O2 and -fno-inline, this check is moot
-  if echo "$CFLAGS" | grep -qe -O2 \
-     && echo "$CFLAGS" | grep -qe -fno-inline ; then
+  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
+     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
 
     ac_cflags_save="$CFLAGS"
     CFLAGS="$CFLAGS -D_USE_GNU"
@@ -3501,7 +3501,7 @@
 [
     kdelibsuff="$kde_libs_suffix"
     if test -z "$kdelibsuff"; then
-       kdelibsuff="auto"
+       kdelibsuff="no"
     fi
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
@@ -3516,13 +3516,16 @@
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"`
+        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+    s,.*/lib\([[^\/]]*\)/.*,\1, 
+    p 
+}'`
 	rm -rf conftest.*
     fi	
 	
-    if test "$kdelibsuff" = "no"; then
+    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
        kdelibsuff=
-    fi    
+    fi
     if test -z "$kdelibsuff"; then
         AC_MSG_RESULT([not using lib directory suffix])
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
@@ -4998,7 +5001,7 @@
                     ])
   fi
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-  kde_libs_suffix=`$KDECONFIG --libsuffix`
+  kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
 
   AC_MSG_CHECKING([where to install])
   if test "x$prefix" = "xNONE"; then
@@ -5374,7 +5377,7 @@
   JAVAC=$kde_java_bindir/javac
   JAVAH=$kde_java_bindir/javah
   JAR=$kde_java_bindir/jar
-  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
+  JVMLIBS="-Wl,-framework,JavaVM"
 
   AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
   AC_MSG_RESULT([Apple Java Framework])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/admin/acinclude.m4.in new/kdewebdev-3.5.3/admin/acinclude.m4.in
--- old/kdewebdev-3.5.2/admin/acinclude.m4.in	2006-03-17 22:44:50.000000000 +0100
+++ new/kdewebdev-3.5.3/admin/acinclude.m4.in	2006-05-23 14:58:57.000000000 +0200
@@ -784,7 +784,7 @@
    # CoreAudio framework
    AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
      AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
+     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
    ])
 
    AC_CHECK_RES_INIT
@@ -3023,8 +3023,8 @@
   [
   kde_cv_opt_noinline_match=irrelevant
   dnl if we don't use both -O2 and -fno-inline, this check is moot
-  if echo "$CFLAGS" | grep -qe -O2 \
-     && echo "$CFLAGS" | grep -qe -fno-inline ; then
+  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
+     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
 
     ac_cflags_save="$CFLAGS"
     CFLAGS="$CFLAGS -D_USE_GNU"
@@ -3501,7 +3501,7 @@
 [
     kdelibsuff="$kde_libs_suffix"
     if test -z "$kdelibsuff"; then
-       kdelibsuff="auto"
+       kdelibsuff="no"
     fi
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
@@ -3516,13 +3516,16 @@
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"`
+        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+    s,.*/lib\([[^\/]]*\)/.*,\1, 
+    p 
+}'`
 	rm -rf conftest.*
     fi	
 	
-    if test "$kdelibsuff" = "no"; then
+    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
        kdelibsuff=
-    fi    
+    fi
     if test -z "$kdelibsuff"; then
         AC_MSG_RESULT([not using lib directory suffix])
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
@@ -4998,7 +5001,7 @@
                     ])
   fi
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-  kde_libs_suffix=`$KDECONFIG --libsuffix`
+  kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
 
   AC_MSG_CHECKING([where to install])
   if test "x$prefix" = "xNONE"; then
@@ -5374,7 +5377,7 @@
   JAVAC=$kde_java_bindir/javac
   JAVAH=$kde_java_bindir/javah
   JAR=$kde_java_bindir/jar
-  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
+  JVMLIBS="-Wl,-framework,JavaVM"
 
   AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
   AC_MSG_RESULT([Apple Java Framework])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/admin/cvs.sh new/kdewebdev-3.5.3/admin/cvs.sh
--- old/kdewebdev-3.5.2/admin/cvs.sh	2006-03-17 22:44:50.000000000 +0100
+++ new/kdewebdev-3.5.3/admin/cvs.sh	2006-05-23 14:58:57.000000000 +0200
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.2\""
+     VERSION="\"3.5.3\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/configure.in new/kdewebdev-3.5.3/configure.in
--- old/kdewebdev-3.5.2/configure.in	2006-03-18 15:05:15.000000000 +0100
+++ new/kdewebdev-3.5.3/configure.in	2006-05-23 22:53:10.000000000 +0200
@@ -40,7 +40,7 @@
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdewebdev, "3.5.2") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdewebdev, "3.5.3") dnl searches for some needed programs
 
 KDE_SET_PREFIX
 
@@ -75,7 +75,7 @@
 dnl  - change the bin_PROGRAMS and the _SOURCES, _LDADD, _METASOURCES, _LDFLAGS
 dnl    below it in the quanta/src/Makefile.am, so it reflects the new executable name
 
-AM_INIT_AUTOMAKE(kdewebdev, "3.5.2")
+AM_INIT_AUTOMAKE(kdewebdev, "3.5.3")
 KDE_ENABLE_HIDDEN_VISIBILITY
 
 quanta_datadir='${kde_datadir}/quanta'
Binary files old/kdewebdev-3.5.2/doc/kfilereplace/index.cache.bz2 and new/kdewebdev-3.5.3/doc/kfilereplace/index.cache.bz2 differ
Binary files old/kdewebdev-3.5.2/doc/klinkstatus/index.cache.bz2 and new/kdewebdev-3.5.3/doc/klinkstatus/index.cache.bz2 differ
Binary files old/kdewebdev-3.5.2/doc/kommander/index.cache.bz2 and new/kdewebdev-3.5.3/doc/kommander/index.cache.bz2 differ
Binary files old/kdewebdev-3.5.2/doc/kxsldbg/index.cache.bz2 and new/kdewebdev-3.5.3/doc/kxsldbg/index.cache.bz2 differ
Binary files old/kdewebdev-3.5.2/doc/quanta/index.cache.bz2 and new/kdewebdev-3.5.3/doc/quanta/index.cache.bz2 differ
Binary files old/kdewebdev-3.5.2/doc/xsldbg/index.cache.bz2 and new/kdewebdev-3.5.3/doc/xsldbg/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kdewebdev.lsm new/kdewebdev-3.5.3/kdewebdev.lsm
--- old/kdewebdev-3.5.2/kdewebdev.lsm	2006-03-17 22:33:11.000000000 +0100
+++ new/kdewebdev-3.5.3/kdewebdev.lsm	2006-05-22 20:09:47.000000000 +0200
@@ -1,7 +1,7 @@
 Begin4
 Title:          kdewebdev
-Version:        3.5.2
-Entered-date:   2006-03-17
+Version:        3.5.3
+Entered-date:   2006-05-23
 Description:    Web Development Applications for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kimagemapeditor/kimedialogs.cpp new/kdewebdev-3.5.3/kimagemapeditor/kimedialogs.cpp
--- old/kdewebdev-3.5.2/kimagemapeditor/kimedialogs.cpp	2005-09-10 10:23:17.000000000 +0200
+++ new/kdewebdev-3.5.3/kimagemapeditor/kimedialogs.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -413,7 +413,10 @@
 // : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,parent,"")
 //	: KDialogBase(parent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true)
 {
-  if (!a) slotCancel();
+  if (!a) {
+   slotCancel();
+   return;  
+  }
 
   _document=parent;
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/engine/linkchecker.h new/kdewebdev-3.5.3/klinkstatus/src/engine/linkchecker.h
--- old/kdewebdev-3.5.2/klinkstatus/src/engine/linkchecker.h	2005-10-10 17:01:01.000000000 +0200
+++ new/kdewebdev-3.5.3/klinkstatus/src/engine/linkchecker.h	2006-05-22 20:09:46.000000000 +0200
@@ -49,7 +49,7 @@
     void check();
     void setSearchManager(SearchManager* search_manager);
 
-    LinkStatus const* const linkStatus() const;
+    LinkStatus const* linkStatus() const;
 
     static bool hasAnchor(KHTMLPart* html_part, QString const& anchor);
 
@@ -95,7 +95,7 @@
     static int count_; // debug attribute that counts how many links were checked
 };
 
-inline LinkStatus const* const LinkChecker::linkStatus() const
+inline LinkStatus const* LinkChecker::linkStatus() const
 {
     return linkstatus_;
 }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/engine/searchmanager.cpp new/kdewebdev-3.5.3/klinkstatus/src/engine/searchmanager.cpp
--- old/kdewebdev-3.5.2/klinkstatus/src/engine/searchmanager.cpp	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/engine/searchmanager.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -840,7 +840,7 @@
     // <depth>
     child_element = element.ownerDocument().createElement("depth");
     child_element.appendChild(element.ownerDocument().
-            createTextNode(searchMode() == domain ? "Unlimited" : QString::number(depth_)));
+            createTextNode(searchMode() == domain ? QString("Unlimited") : QString::number(depth_)));
     element.appendChild(child_element);
 
     // <check_parent_folders>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/parser/htmlparser.cpp new/kdewebdev-3.5.3/klinkstatus/src/parser/htmlparser.cpp
--- old/kdewebdev-3.5.2/klinkstatus/src/parser/htmlparser.cpp	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/parser/htmlparser.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -120,8 +120,6 @@
             i = 0;
         }
     }
-
-    return aux_;
 }
 
 int HtmlParser::endOfTag(QString const& s, int index, QChar end_of_tag)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/parser/url.cpp new/kdewebdev-3.5.3/klinkstatus/src/parser/url.cpp
--- old/kdewebdev-3.5.2/klinkstatus/src/parser/url.cpp	2005-10-10 17:01:00.000000000 +0200
+++ new/kdewebdev-3.5.3/klinkstatus/src/parser/url.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -24,6 +24,8 @@
 #include "mstring.h"
 #include "../utils/utils.h"
 
+#include <kcharsets.h>
+
 
 Node::LinkType Url::resolveLinkType(QString const& url)
 {
@@ -88,15 +90,16 @@
 
         url.cleanPath();
 
-//         kdDebug(23100) <<  url.url() << endl;
+//         kdDebug(23100) << "Normalized URL: " 
+//                 << KCharsets::resolveEntities(KURL::decode_string(url.url())) << endl;
 
-        return url;
+        return KURL(KCharsets::resolveEntities(KURL::decode_string(url.url())));
     }
 }
 
 KURL Url::normalizeUrl(QString const& string_url)
 {
-    QString qs_url = string_url.stripWhiteSpace();
+    QString qs_url(KCharsets::resolveEntities(string_url.stripWhiteSpace()));
 
     if(qs_url[0] == '/')
     {
@@ -172,7 +175,7 @@
     if(v2[0] == "www")
         aux2 = 1;
 
-    if((size2 - aux < size1 - aux) && restrict) // e.g. paradigma.co.pt < linkstatus.paradigma.co.pt
+    if((size2 - aux2 < size1 - aux) && restrict) // e.g. paradigma.co.pt < linkstatus.paradigma.co.pt
         return false;
 
     if(restrict && (size2 - aux2 > size1 - aux)) // e.g. linkstatus.paradigma.co.pt > paradigma.co.pt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/ui/resultview.cpp new/kdewebdev-3.5.3/klinkstatus/src/ui/resultview.cpp
--- old/kdewebdev-3.5.2/klinkstatus/src/ui/resultview.cpp	2005-09-10 10:23:22.000000000 +0200
+++ new/kdewebdev-3.5.3/klinkstatus/src/ui/resultview.cpp	2006-05-22 20:09:47.000000000 +0200
@@ -123,7 +123,7 @@
     return column_index_;
 }
 
-LinkStatus const* const ResultViewItem::linkStatus() const
+LinkStatus const* ResultViewItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/ui/resultview.h new/kdewebdev-3.5.3/klinkstatus/src/ui/resultview.h
--- old/kdewebdev-3.5.2/klinkstatus/src/ui/resultview.h	2006-03-17 11:14:48.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/ui/resultview.h	2006-05-22 20:09:47.000000000 +0200
@@ -89,7 +89,7 @@
     virtual int columnIndex() const;
 
     virtual QString toolTip() const = 0;
-    LinkStatus const* const linkStatus() const;
+    LinkStatus const* linkStatus() const;
 
 protected:
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/ui/sessionwidget.cpp new/kdewebdev-3.5.3/klinkstatus/src/ui/sessionwidget.cpp
--- old/kdewebdev-3.5.2/klinkstatus/src/ui/sessionwidget.cpp	2006-03-17 11:14:48.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/ui/sessionwidget.cpp	2006-05-22 20:09:47.000000000 +0200
@@ -581,6 +581,7 @@
     }
     
     to_start_ = true;
+    slotLoadSettings(true);
     slotCheck();
     resetPendingActions();
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/ui/treeview.cpp new/kdewebdev-3.5.3/klinkstatus/src/ui/treeview.cpp
--- old/kdewebdev-3.5.2/klinkstatus/src/ui/treeview.cpp	2006-03-17 11:14:48.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/ui/treeview.cpp	2006-05-22 20:09:47.000000000 +0200
@@ -411,7 +411,10 @@
     {
         TreeColumnViewItem item(linkstatus, i + 1);
         column_items_.push_back(item);
-        setText(item.columnIndex() - 1, KCharsets::resolveEntities(item.text(i + 1)));
+        
+        setText(item.columnIndex() - 1, KURL::decode_string(
+                KCharsets::resolveEntities(item.text(i + 1))));
+        
         setPixmap(item.columnIndex() - 1, item.pixmap(i + 1));
     }
 }
@@ -439,7 +442,7 @@
     return text(column);
 }
 
-LinkStatus const* const TreeViewItem::linkStatus() const
+LinkStatus const* TreeViewItem::linkStatus() const
 {
     return column_items_[0].linkStatus();
 }
@@ -483,7 +486,7 @@
     return column_index_;
 }
 
-LinkStatus const* const TreeColumnViewItem::linkStatus() const
+LinkStatus const* TreeColumnViewItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/ui/treeview.h new/kdewebdev-3.5.3/klinkstatus/src/ui/treeview.h
--- old/kdewebdev-3.5.2/klinkstatus/src/ui/treeview.h	2006-03-17 11:14:48.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/ui/treeview.h	2006-05-22 20:09:47.000000000 +0200
@@ -101,7 +101,7 @@
     QListViewItem* lastChild() const;
     
     QString key(int column, bool) const;
-    LinkStatus const* const linkStatus() const;
+    LinkStatus const* linkStatus() const;
 
 protected:
     virtual void paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align);
@@ -129,7 +129,7 @@
 
     //void setColumnIndex(int i);
     int columnIndex() const;
-    LinkStatus const* const linkStatus() const;
+    LinkStatus const* linkStatus() const;
     QColor const& textStatusColor() const;
     QString text(int column) const;
     QPixmap pixmap(int column) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/klinkstatus/src/utils/Makefile.am new/kdewebdev-3.5.3/klinkstatus/src/utils/Makefile.am
--- old/kdewebdev-3.5.2/klinkstatus/src/utils/Makefile.am	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/klinkstatus/src/utils/Makefile.am	2006-05-22 20:09:46.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDES = -I/usr/include/libxml2 $(all_includes)
+INCLUDES = $(LIBXSLT_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 libutils_la_LDFLAGS = $(all_libraries)
 noinst_LTLIBRARIES =  libutils.la
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kommander/editor/formfile.cpp new/kdewebdev-3.5.3/kommander/editor/formfile.cpp
--- old/kdewebdev-3.5.2/kommander/editor/formfile.cpp	2005-09-10 10:23:30.000000000 +0200
+++ new/kdewebdev-3.5.3/kommander/editor/formfile.cpp	2006-05-22 20:09:47.000000000 +0200
@@ -176,7 +176,7 @@
     case KMessageBox::Yes:
       if (!save())
         return false;
-    case KMessageBox::No:
+    case KMessageBox::No: //fall through
       MainWindow::self->workspace()->update();
       break;
     case KMessageBox::Cancel:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kommander/widgets/closebutton.cpp new/kdewebdev-3.5.3/kommander/widgets/closebutton.cpp
--- old/kdewebdev-3.5.2/kommander/widgets/closebutton.cpp	2005-09-10 10:23:31.000000000 +0200
+++ new/kdewebdev-3.5.3/kommander/widgets/closebutton.cpp	2006-05-22 20:09:47.000000000 +0200
@@ -135,7 +135,7 @@
     fputs(buffer, stdout);
     fflush(stdout);
   }
-  delete buffer;
+  delete[] buffer;
 }
 
 void CloseButton::endProcess(KProcess *a_process)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kommander/widgets/subdialog.cpp new/kdewebdev-3.5.3/kommander/widgets/subdialog.cpp
--- old/kdewebdev-3.5.2/kommander/widgets/subdialog.cpp	2005-09-10 10:23:31.000000000 +0200
+++ new/kdewebdev-3.5.3/kommander/widgets/subdialog.cpp	2006-05-22 20:09:47.000000000 +0200
@@ -25,6 +25,7 @@
 #include <qdialog.h>
 
 /* OTHER INCLUDES */
+#include <kdebug.h>
 #include <kommanderfactory.h>
 #include <kommanderwidget.h>
 #include <specials.h>
@@ -100,10 +101,12 @@
   KommanderFactory::loadPlugins();
   m_dialog = (QDialog *)KommanderFactory::create(kmdrFile());
   if(!m_dialog)
-    qWarning("Creation of sub dialog failed ..");
-  connect(m_dialog, SIGNAL(finished()), this, SLOT(slotFinished()));
+  {
+    kdWarning() << "Creation of sub dialog failed .." << endl;
+    connect(m_dialog, SIGNAL(finished()), this, SLOT(slotFinished()));
 
-  m_dialog->exec();
+    m_dialog->exec();
+  }
 }
 
 void SubDialog::slotFinished()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
--- old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp	2005-09-10 10:23:15.000000000 +0200
+++ new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -616,7 +616,8 @@
         } else {
             xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").arg(xsldbgText(arg)));
         }
-        ctxt->pctxt->node = NULL;
+        if (ctxt->pctxt)
+          ctxt->pctxt->node = NULL;
     }
     return result;
 }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp
--- old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp	2005-09-10 10:23:15.000000000 +0200
+++ new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -109,7 +109,7 @@
 
     const char *result = NULL;
 
-    if ((fileNumber < 0) || ((fileNumber + 1) > (int) sizeof(tempNames))){
+    if ((fileNumber < 0) || ((fileNumber + 1) > 2)){ //don't use > (int) sizeof(tempNames), it depends on the platform and is wrong even on i586
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
         xsltGenericError(xsltGenericErrorContext,
                          "Error: Unable to allocate temporary file %d for xsldbg\n",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
--- old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp	2005-09-10 10:23:16.000000000 +0200
+++ new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -150,7 +150,7 @@
 void XsldbgConfigImpl::addParam(QString name, QString value)
 {
 	LibxsltParam *param;
-	if ((name.length() == 0) | (value.length() == 0))
+	if ((name.length() == 0) || (value.length() == 0))
 		return;
 
 	param = getParam(name);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
--- old/kdewebdev-3.5.2/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp	2005-09-10 10:23:16.000000000 +0200
+++ new/kdewebdev-3.5.3/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -94,7 +94,7 @@
 {
 	/* This function runs in the application's thread */
 
-	if (e == 0L && (e->timerId() != updateTimerID))
+	if (e == 0L || (e->timerId() != updateTimerID))
 		return;
 
 	if  ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/lib/qextfileinfo.cpp new/kdewebdev-3.5.3/lib/qextfileinfo.cpp
--- old/kdewebdev-3.5.2/lib/qextfileinfo.cpp	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/lib/qextfileinfo.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -48,8 +48,8 @@
     return s;
   } else
   {
-    dir.cdUp();
-    QString s = dir.path() + "/";
+    KURL u = KURL::fromPathOrURL(path).upURL();
+    QString s = u.path(-1) + "/";
     QString s2 = path.mid(s.length());
     s2 = QExtFileInfo::canonicalPath(s) + s2;
     return s2;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/ChangeLog new/kdewebdev-3.5.3/quanta/ChangeLog
--- old/kdewebdev-3.5.2/quanta/ChangeLog	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/ChangeLog	2006-05-22 20:09:46.000000000 +0200
@@ -1,6 +1,18 @@
 This files contains the changes since Quanta 2.0 until the current 3.5.x series.
 
-Version 3.5.2 (Release date: xx-02-2006; Started 23-01-2005):
+Version 3.5.3 (Release date: 23-05-2006; Started 18-03-2005):
+ - bugfixes:
+      - another round of VPL fixes. Requires KDE 3.5.3 to work properly [#125434]
+      - don't crash when viewing remote files in VPL [#126314]
+      - silently ignore files from a project view that do not exist anymore [#126588 ]
+      - show a correct error message if a file does not exist [#126588 ]
+      - make the img and script tags standard compliant [#125596]
+      - don't loose important spaces when applying source indentation [#125213]
+
+- improvements:
+      - add input button to the Forms toolbar [#125202]
+	
+Version 3.5.2 (Release date: 17-03-2006; Started 23-01-2005):
  - bugfixes:
         - allow opening of read-only remote files, like from http:// [#120632]
         - fix insertion of files to the project [#120629]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/VERSION new/kdewebdev-3.5.3/quanta/VERSION
--- old/kdewebdev-3.5.2/quanta/VERSION	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/VERSION	2006-05-22 20:09:46.000000000 +0200
@@ -1 +1 @@
-Quanta v3.5.2
+Quanta v3.5.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/components/debugger/dbgp/dbgpnetwork.cpp new/kdewebdev-3.5.3/quanta/components/debugger/dbgp/dbgpnetwork.cpp
--- old/kdewebdev-3.5.2/quanta/components/debugger/dbgp/dbgpnetwork.cpp	2005-10-10 17:00:55.000000000 +0200
+++ new/kdewebdev-3.5.3/quanta/components/debugger/dbgp/dbgpnetwork.cpp	2006-05-22 20:09:42.000000000 +0200
@@ -45,7 +45,7 @@
 
   if(m_useproxy)
   {
-    if(!m_socket)
+    if(m_socket)
     {
 //       m_socket->setBufferSize(-1);
       connect(m_socket, SIGNAL(gotError(int)), this, SLOT(slotError(int)));
@@ -131,7 +131,7 @@
   if(m_server && m_server->error())
   {
     kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
-    emit networkError(m_socket->errorString(), true);
+    emit networkError(m_server->errorString(), true);
   }
 }
 
@@ -236,7 +236,7 @@
       // Put it in the fifo buffer
       m_fifo.append(buffer, bytes);
 
-      delete buffer;
+      delete[] buffer;
     }
 
     while(1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/components/debugger/gubed/quantadebuggergubed.cpp new/kdewebdev-3.5.3/quanta/components/debugger/gubed/quantadebuggergubed.cpp
--- old/kdewebdev-3.5.2/quanta/components/debugger/gubed/quantadebuggergubed.cpp	2006-01-19 17:52:36.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/components/debugger/gubed/quantadebuggergubed.cpp	2006-05-22 20:09:41.000000000 +0200
@@ -375,7 +375,7 @@
       m_socket->readBlock(buffer, bytes);
       buffer[bytes] = 0;
       m_buffer += buffer;
-      delete buffer;
+      delete[] buffer;
     }
 
     while(1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/components/debugger/interfaces/quantadebugger.desktop new/kdewebdev-3.5.3/quanta/components/debugger/interfaces/quantadebugger.desktop
--- old/kdewebdev-3.5.2/quanta/components/debugger/interfaces/quantadebugger.desktop	2006-03-17 11:14:42.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/components/debugger/interfaces/quantadebugger.desktop	2006-05-22 20:09:41.000000000 +0200
@@ -7,7 +7,7 @@
 Comment[cs]=Ladicí modul Quanty
 Comment[da]=Et Quanta fejlretter-plugin
 Comment[de]=Eine Quanta Debugger-Komponente
-Comment[el]=Πρόσθεμα αποσφαλματωτή Quanta 
+Comment[el]=Πρόσθετο αποσφαλματωτή Quanta 
 Comment[es]=Un accesorio para un depurador de Quanta
 Comment[et]=Quanta siluriplugin
 Comment[eu]=Quanta araztailearen plugina
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/components/tableeditor/tableeditor.cpp new/kdewebdev-3.5.3/quanta/components/tableeditor/tableeditor.cpp
--- old/kdewebdev-3.5.2/quanta/components/tableeditor/tableeditor.cpp	2005-11-08 23:31:48.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/components/tableeditor/tableeditor.cpp	2006-05-22 20:09:42.000000000 +0200
@@ -489,7 +489,7 @@
         {
           bool ok;
           colValue = colspanValue.toInt(&ok, 10);
-          if (ok & colValue > 1)
+          if (ok && colValue > 1)
           {
             nCol += (colValue - 1);
             if (m_colSpin->value() < nCol)
@@ -515,7 +515,7 @@
         {
           bool ok;
           int rowValue = rowspanValue.toInt(&ok, 10);
-          if (ok & rowValue > 1)
+          if (ok && rowValue > 1)
           {
             lastCol--;
             // Check if there are enough columns in mergeMatriz
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/data/dtep/html-strict/i.tag new/kdewebdev-3.5.3/quanta/data/dtep/html-strict/i.tag
--- old/kdewebdev-3.5.2/quanta/data/dtep/html-strict/i.tag	2005-09-10 10:23:11.000000000 +0200
+++ new/kdewebdev-3.5.3/quanta/data/dtep/html-strict/i.tag	2006-05-22 20:09:45.000000000 +0200
@@ -74,23 +74,6 @@
     <textlocation col="0" row="6" />
     <location col="1" row="6" colspan="2" />
   </attr>
-  <attr name="align" type="list">
-    <text>Align</text>
-    <textlocation col="0" row="7" />
-    <items>
-      <item>left</item>
-      <item>right</item>
-      <item>top</item>
-      <item>middle</item>
-      <item>bottom</item>
-    </items>
-    <location col="1" row="7" colspan="2" />
-  </attr>
-  <attr name="border" type="input">
-    <text>Border</text>
-    <textlocation col="0" row="8" />
-    <location col="1" row="8" colspan="2" />
-  </attr>
   <attr name="hspace" type="input">
     <text>HSpace</text>
     <textlocation col="0" row="9" />
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/data/dtep/html-strict/s.tag new/kdewebdev-3.5.3/quanta/data/dtep/html-strict/s.tag
--- old/kdewebdev-3.5.2/quanta/data/dtep/html-strict/s.tag	2005-09-10 10:23:11.000000000 +0200
+++ new/kdewebdev-3.5.3/quanta/data/dtep/html-strict/s.tag	2006-05-22 20:09:45.000000000 +0200
@@ -16,19 +16,6 @@
         </items>
     </attr>
 
-    <attr name="language" type="list">
-        <text>Language</text>
-        <textlocation col="0" row="1" />
-        <location col="1" row="1" colspan="2" />
-        <items>
-    <item>PHP</item>
-                <item>JavaScript</item>
-                <item>JavaScript1.2</item>
-                <item>JavaScript1.3</item>
-                <item>VBScript</item>
-        </items>
-    </attr>
-
     <attr name="src" type="url">
         <text>Source</text>
         <textlocation col="0" row="2" />
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/data/dtep/xhtml/img.tag new/kdewebdev-3.5.3/quanta/data/dtep/xhtml/img.tag
--- old/kdewebdev-3.5.2/quanta/data/dtep/xhtml/img.tag	2005-09-10 10:23:09.000000000 +0200
+++ new/kdewebdev-3.5.3/quanta/data/dtep/xhtml/img.tag	2006-05-22 20:09:45.000000000 +0200
@@ -27,23 +27,7 @@
         <location col="1" row="4" colspan="3" />
     </attr>
 
-    <attr name="align" type="list">
-      <text>Align</text>
-      <textlocation col="0" row="7" />
-      <items>
-        <item>baseline</item>
-        <item>center</item>
-        <item>left</item>
-        <item>middle</item>
-        <item>right</item>
-        <item>textbottom</item>
-        <item>textmiddle</item>
-        <item>texttop</item>
-      </items>
-      <location col="1" row="7" />
-    </attr>
-
-    <attr name="hspace" type="input">
+   <attr name="hspace" type="input">
         <text>Hspace</text>
         <textlocation col="0" row="8" />
         <location col="1" row="8" />
@@ -55,11 +39,5 @@
         <location col="1" row="9" />
     </attr>
 
-    <attr name="border" type="input">
-        <text>Border</text>
-        <textlocation col="0" row="10" />
-        <location col="1" row="10" />
-    </attr>
-
 </tag>
 </TAGS>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/data/dtep/xhtml-frameset/img.tag new/kdewebdev-3.5.3/quanta/data/dtep/xhtml-frameset/img.tag
--- old/kdewebdev-3.5.2/quanta/data/dtep/xhtml-frameset/img.tag	2005-09-10 10:23:10.000000000 +0200
+++ new/kdewebdev-3.5.3/quanta/data/dtep/xhtml-frameset/img.tag	2006-05-22 20:09:45.000000000 +0200
@@ -26,23 +26,7 @@
         <textlocation col="0" row="4" />
         <location col="1" row="4" colspan="3" />
     </attr>
-
-    <attr name="align" type="list">
-      <text>Align</text>
-      <textlocation col="0" row="7" />
-      <items>
-        <item>baseline</item>
-        <item>center</item>
-        <item>left</item>
-        <item>middle</item>
-        <item>right</item>
-        <item>textbottom</item>
-        <item>textmiddle</item>
-        <item>texttop</item>
-      </items>
-      <location col="1" row="7" />
-    </attr>
-
+    
     <attr name="hspace" type="input">
         <text>Hspace</text>
         <textlocation col="0" row="8" />
@@ -55,11 +39,5 @@
         <location col="1" row="9" />
     </attr>
 
-    <attr name="border" type="input">
-        <text>Border</text>
-        <textlocation col="0" row="10" />
-        <location col="1" row="10" />
-    </attr>
-
 </tag>
 </TAGS>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/data/icons/22x22/Makefile.am new/kdewebdev-3.5.3/quanta/data/icons/22x22/Makefile.am
--- old/kdewebdev-3.5.2/quanta/data/icons/22x22/Makefile.am	2005-09-10 10:23:07.000000000 +0200
+++ new/kdewebdev-3.5.3/quanta/data/icons/22x22/Makefile.am	2006-05-22 20:09:44.000000000 +0200
@@ -35,6 +35,7 @@
 reset.png \
 select.png \
 submit.png \
+button.png \
 table_data.png \
 table_head.png \
 tag_access.png \
Binary files old/kdewebdev-3.5.2/quanta/data/icons/22x22/button.png and new/kdewebdev-3.5.3/quanta/data/icons/22x22/button.png differ
Binary files old/kdewebdev-3.5.2/quanta/data/toolbars/html/forms.toolbar.tgz and new/kdewebdev-3.5.3/quanta/data/toolbars/html/forms.toolbar.tgz differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parsers/dtd/dtdparser.cpp new/kdewebdev-3.5.3/quanta/parsers/dtd/dtdparser.cpp
--- old/kdewebdev-3.5.2/quanta/parsers/dtd/dtdparser.cpp	2005-11-08 23:31:48.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parsers/dtd/dtdparser.cpp	2006-05-22 20:09:41.000000000 +0200
@@ -254,88 +254,89 @@
           attributes.append(attr);
           at_ptr = at_ptr->nexth;
        }
-      }
-      if (!attributes.isEmpty())
-        stream << QuantaCommon::xmlFromAttributes(&attributes);
-      const xmlChar *list_ptr[MAX_CHILD_ELEMENTS];
-      int childNum = 0;
-      childNum = xmlValidGetPotentialChildren(el_ptr->content, list_ptr,
-                        &childNum, MAX_CHILD_ELEMENTS);
-
-      if (childNum > 0)
-      {
-        stream << "<children>" << endl;
-        for( int i = 0; i < childNum; i++ )
+        
+       if (!attributes.isEmpty())
+          stream << QuantaCommon::xmlFromAttributes(&attributes);
+       const xmlChar *list_ptr[MAX_CHILD_ELEMENTS];
+       int childNum = 0;
+       childNum = xmlValidGetPotentialChildren(el_ptr->content, list_ptr,
+                          &childNum, MAX_CHILD_ELEMENTS);
+  
+        if (childNum > 0)
         {
-          stream << "  <child name=\"" << QString((const char*)list_ptr[i]) << "\"";
-          xmlElementPtr child_ptr = xmlGetDtdElementDesc(DTD::dtd_ptr, list_ptr[i]);
-          if (child_ptr && child_ptr->content && child_ptr->content->ocur)
+          stream << "<children>" << endl;
+          for( int i = 0; i < childNum; i++ )
           {
-            //if (child_ptr->content->ocur == XML_ELEMENT_CONTENT_PLUS)
-            //{
-//              stream << " usage=\"required\"";
-  //          }
-            QString ocur;
-            switch (child_ptr->content->ocur)
+            stream << "  <child name=\"" << QString((const char*)list_ptr[i]) << "\"";
+            xmlElementPtr child_ptr = xmlGetDtdElementDesc(DTD::dtd_ptr, list_ptr[i]);
+            if (child_ptr && child_ptr->content && child_ptr->content->ocur)
             {
-              case 1: {ocur = "once"; break;}
-              case 2: {ocur = "opt"; break;}
-              case 3: {ocur = "mult"; break;}
-              case 4: {ocur = "plus"; break;}
+              //if (child_ptr->content->ocur == XML_ELEMENT_CONTENT_PLUS)
+              //{
+  //              stream << " usage=\"required\"";
+    //          }
+              QString ocur;
+              switch (child_ptr->content->ocur)
+              {
+                case 1: {ocur = "once"; break;}
+                case 2: {ocur = "opt"; break;}
+                case 3: {ocur = "mult"; break;}
+                case 4: {ocur = "plus"; break;}
+              }
+              stream << " usage=\"" << ocur << "\"";
+              QString name = QString((const char*)child_ptr->content->name);
+              if (name == "#PCDATA")
+                name == "#text";
+              stream << " name2=\"" << name << "\"";
             }
-            stream << " usage=\"" << ocur << "\"";
-            QString name = QString((const char*)child_ptr->content->name);
-            if (name == "#PCDATA")
-               name == "#text";
-            stream << " name2=\"" << name << "\"";
+            stream << " />" << endl;
           }
-          stream << " />" << endl;
+  
+          stream << "</children>" << endl;
+          stream << endl;
         }
-
-        stream << "</children>" << endl;
-        stream << endl;
-      }
-      /*
-      xmlElementContentPtr content_ptr = el_ptr->content;
-      if (content_ptr)
-      {
-        stream << "<children>" << endl;
-        while (content_ptr)
+        /*
+        xmlElementContentPtr content_ptr = el_ptr->content;
+        if (content_ptr)
         {
-          if (!QString((const char*)content_ptr->name).isEmpty())
+          stream << "<children>" << endl;
+          while (content_ptr)
           {
-            stream << "  <child name=\"" << QString((const char*)content_ptr->name) << "\"";
-            QString ocur;
-            switch (content_ptr->ocur)
+            if (!QString((const char*)content_ptr->name).isEmpty())
             {
-              case 1: {ocur = "once"; break;}
-              case 2: {ocur = "opt"; break;}
-              case 3: {ocur = "mult"; break;}
-              case 4: {ocur = "plus"; break;}
+              stream << "  <child name=\"" << QString((const char*)content_ptr->name) << "\"";
+              QString ocur;
+              switch (content_ptr->ocur)
+              {
+                case 1: {ocur = "once"; break;}
+                case 2: {ocur = "opt"; break;}
+                case 3: {ocur = "mult"; break;}
+                case 4: {ocur = "plus"; break;}
+              }
+              stream << " usage=\"" << ocur << "\"";
+              stream << " />" << endl;
             }
-            stream << " usage=\"" << ocur << "\"";
-            stream << " />" << endl;
-          }
-          if (content_ptr->c1)
-              content_ptr = content_ptr->c1;
-          else if (content_ptr->c2)
-              content_ptr = content_ptr->c2;
-          else
-          {
-            if (content_ptr == el_ptr->content)
-              break;
-            if (content_ptr->parent)
+            if (content_ptr->c1)
+                content_ptr = content_ptr->c1;
+            else if (content_ptr->c2)
+                content_ptr = content_ptr->c2;
+            else
             {
-              if (content_ptr == content_ptr->parent->c1)
-                  content_ptr->c1 = 0L;
-              else
-                  content_ptr->c2 = 0L;
+              if (content_ptr == el_ptr->content)
+                break;
+              if (content_ptr->parent)
+              {
+                if (content_ptr == content_ptr->parent->c1)
+                    content_ptr->c1 = 0L;
+                else
+                    content_ptr->c2 = 0L;
+              }
+              content_ptr = content_ptr->parent;
             }
-            content_ptr = content_ptr->parent;
           }
-        }
-        stream << "</children>" << endl;
-      } */
+          stream << "</children>" << endl;
+        } */
+      }
       stream << "</tag>" << endl
              << "</TAGS>" << endl;
       file.close();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parsers/node.cpp new/kdewebdev-3.5.3/quanta/parsers/node.cpp
--- old/kdewebdev-3.5.2/quanta/parsers/node.cpp	2006-03-17 11:14:41.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parsers/node.cpp	2006-05-22 20:09:41.000000000 +0200
@@ -333,7 +333,7 @@
 
     while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text)
     {
-        if(node->tag->type == Tag::ScriptTag)
+        if (parent && node->tag->type == Tag::ScriptTag)
         {
             //Check if it is an embedded ScriptTag. If it is, continue.
             node->tag->beginPos(line, col);
@@ -359,7 +359,7 @@
 
     while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text)
     {
-        if(node->tag->type == Tag::ScriptTag)
+        if (parent && node->tag->type == Tag::ScriptTag)
         {
             //Check if it is an embedded ScriptTag. If it is, continue.
             node->tag->beginPos(line, col);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parsers/tag.cpp new/kdewebdev-3.5.3/quanta/parsers/tag.cpp
--- old/kdewebdev-3.5.2/quanta/parsers/tag.cpp	2006-03-17 11:14:41.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parsers/tag.cpp	2006-05-22 20:09:41.000000000 +0200
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include <ctype.h>
-#include <assert.h>
 
 #include <qdict.h>
 #include <qstring.h>
@@ -69,7 +68,6 @@
   init();
   QString s = write->text(area);
   m_area = area;
-//  assert(dtd);
   m_dtd = dtd;
   if (doParse)
   {
@@ -651,7 +649,6 @@
 
 void Tag::setDtd(const DTDStruct *dtd)
 {
- // assert(dtd);
   m_dtd = dtd;
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parts/kafka/htmldocumentproperties.cpp new/kdewebdev-3.5.3/quanta/parts/kafka/htmldocumentproperties.cpp
--- old/kdewebdev-3.5.2/quanta/parts/kafka/htmldocumentproperties.cpp	2006-01-19 17:52:43.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parts/kafka/htmldocumentproperties.cpp	2006-05-22 20:09:43.000000000 +0200
@@ -417,7 +417,7 @@
 				view->document(), titleNode, 0L, 0L, modifs);
 		}
 		else
-			node->tag->setStr(KafkaDocument::ref()->getEncodedText(title->text()));
+      titleNode->child->tag->setStr(KafkaDocument::ref()->getEncodedText(title->text()));
 	}
 
 	//set the METAs if necessary
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parts/kafka/kafkacommon.cpp new/kdewebdev-3.5.3/quanta/parts/kafka/kafkacommon.cpp
--- old/kdewebdev-3.5.2/quanta/parts/kafka/kafkacommon.cpp	2006-03-17 11:14:44.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parts/kafka/kafkacommon.cpp	2006-05-23 13:29:27.000000000 +0200
@@ -176,7 +176,7 @@
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
-    else if(itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())
+    else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
         commonParent = commonParent->parent;
 
     commonParentStartChildLocation = getLocation(commonParentStartChild);
@@ -232,7 +232,7 @@
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
-    else if(itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())
+    else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
         commonParent = commonParent->parent;
 
     commonParentStartChildLocation = getLocation(commonParentStartChild);
@@ -852,7 +852,7 @@
         return QString();
 
     hasLeftWhiteSpaces = (string[0].isSpace());
-    hasRightWhiteSpaces = (string[newString.length() - 1].isSpace());
+    hasRightWhiteSpaces = (string[string.length() - 1].isSpace());
 
     newString = string.stripWhiteSpace();
     if(hasLeftWhiteSpaces && !removeAllSpacesAtTheLeft)
@@ -1569,7 +1569,7 @@
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
-    else if(itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())
+    else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
         commonParent = commonParent->parent;
 
     //Now look if at least one of the parent Nodes between startNode and commonParent
@@ -1983,13 +1983,16 @@
                         startSelection = startSelection->next;
                     while(endSelection && endSelection->tag->type == Tag::Empty)
                         endSelection = endSelection->prev;
-                    /**copyNewNode = duplicateNode(newNode);
-                    insertNode(copyNewNode, startSelection->parentNode(), startSelection,
-                    	endSelection->next, modifs);*/
-                    copyNewNode = duplicateNodeSubtree(newNode);
-                    insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
-                                      endSelection->next, modifs);
-                    nodeInserted = true;
+                    if (startSelection && endSelection)
+                    {
+                      /**copyNewNode = duplicateNode(newNode);
+                      insertNode(copyNewNode, startSelection->parentNode(), startSelection,
+                        endSelection->next, modifs);*/
+                      copyNewNode = duplicateNodeSubtree(newNode);
+                      insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
+                                        endSelection->next, modifs);
+                      nodeInserted = true;
+                    }
                 }
             }
 
@@ -2061,13 +2064,16 @@
                     startSelection = startSelection->next;
                 while(endSelection && endSelection->tag->type == Tag::Empty)
                     endSelection = endSelection->prev;
-                /**copyNewNode = duplicateNode(newNode);
-                insertNode(copyNewNode, startSelection->parentNode(), startSelection,
-                	endSelection->next, modifs);*/
-                copyNewNode = duplicateNodeSubtree(newNode);
-                insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
-                                  endSelection->next, modifs);
-                nodeInserted = true;
+                if (startSelection && endSelection)
+                {
+                  /**copyNewNode = duplicateNode(newNode);
+                  insertNode(copyNewNode, startSelection->parentNode(), startSelection,
+                    endSelection->next, modifs);*/
+                  copyNewNode = duplicateNodeSubtree(newNode);
+                  insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
+                                    endSelection->next, modifs);
+                  nodeInserted = true;
+                }
             }
         }
 
@@ -2210,7 +2216,8 @@
 {
     NodeModif *modif = 0, *modifChild;
     Node *lastChild, *curNode;
-    Node *parent, *prev, *next, *child, *n;
+    Node *parent, *next, *child, *n;
+    //Node *prev;
     bool isSingle;
     int type;
     QString namespaceName, nodeName, caseSensitive;
@@ -2225,7 +2232,7 @@
 
     parent = node->parent;
     next = node->next;
-    prev = node->prev;
+    //prev = node->prev; //Should this be used at all?
     child = node->child;
     lastChild = node->lastChild();
     isSingle = node->tag->single;
@@ -3651,8 +3658,11 @@
 
 Node* kafkaCommon::hasParent(Node* startNode, Node* endNode, const QString &name)
 {   
-    assert(startNode && endNode);
-    
+    Q_ASSERT(startNode && endNode);
+     //Andras: don't crash
+    if (!startNode || !endNode)
+      return 0;
+   
     QValueList<int> commonParentStartChildLocation;
     QValueList<int> commonParentEndChildLocation;
 
@@ -3680,14 +3690,25 @@
             return false;
         parent = rootNode;
     }
+    //Andras: avoid exceptions    
+    if (!nextSibling.isNull() && nextSibling.parentNode() != parent)
+    {
+      kdDebug(25001)<< "kafkaCommon::insertDomNode() - invalid nextSibling!" << endl;
+      return false;
+    }
+    if (node.ownerDocument() != parent.ownerDocument())
+    {
+      kdDebug(25001)<< "kafkaCommon::insertDomNode() - ownerDocument is different!" << endl;
+      return false;
+    }
 
     try
     {
         parent.insertBefore(node, nextSibling);
     }
-    catch(DOM::DOMException const& e)
+    catch(DOM::DOMException e)
     {
-        kdDebug(25001)<< "kafkaCommon::insertDomNode() - ERROR code :" << e.code << endl;
+      kdDebug(25001)<< "kafkaCommon::insertDomNode() - ERROR code :" << e.code << endl;
     }
     return true;
 }
@@ -4036,7 +4057,10 @@
 
 int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, QString const& tag_name)
 {
-    assert(start_node && end_node);
+    Q_ASSERT(start_node && end_node);
+    //Andras: don't crash
+    if (!start_node || !end_node)
+      return -1;
     
     Node* tag_start = hasParent(start_node, end_node, tag_name);
     if(tag_start)
@@ -4056,7 +4080,10 @@
 int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, QString const& tag_name, 
                              QString const& attribute_name, QString const& attribute_value)
 {
-    assert(start_node && end_node);
+    Q_ASSERT(start_node && end_node);
+    //Andras: don't crash
+    if (!start_node || !end_node)
+      return -1;
     
     Node* tag_start = hasParent(start_node, end_node, tag_name);
     if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value)
@@ -4091,9 +4118,12 @@
 
 void kafkaCommon::getStartOfWord(Node*& node, int& offset)
 {
-    assert(node);
-//     assert(isBetweenWords(node, offset)); recursive
-    assert(offset >= 0);
+  Q_ASSERT(node);
+//     Q_ASSERT(isBetweenWords(node, offset)); recursive
+  Q_ASSERT(offset >= 0);
+  //Andras: don't crash
+  if (!node || offset < 0)
+    return;
     
     kdDebug(23100) << "getStartOfWord node length: " << node->tag->tagStr().length() << endl;
     kdDebug(23100) << "getStartOfWord offset BEGIN: " << offset << endl;
@@ -4132,10 +4162,15 @@
 
 void kafkaCommon::getEndOfWord(Node*& node, int& offset)
 {
-    assert(node);
+    Q_ASSERT(node);
 //     assert(isBetweenWords(node, offset)); recursive
-    assert(isBetweenWords(node, offset));
-    assert(offset >= 0);
+    Q_ASSERT(isBetweenWords(node, offset));
+    Q_ASSERT(offset >= 0);
+
+    //Andras: if the following asserts are hit, don't do anything = don't crash
+    if (!node || !isBetweenWords(node, offset) || offset < 0)
+      return; 
+    
     
     QString tag_str = node->tag->tagStr();
     while((uint)offset != tag_str.length() && !tag_str[offset].isSpace() && !tag_str[offset].isPunct())
@@ -4162,7 +4197,13 @@
 
 void kafkaCommon::getStartOfParagraph(Node*& node, int& offset)
 {
-    assert(node);
+    Q_ASSERT(node);
+    //Andras: don't crash
+    if (!node)
+    {
+      offset = 0;
+      return;  
+    }
     
     Node* previous = node->previousSibling();
     while(previous && (isInline(previous->tag->name) || previous->tag->name.lower() == "br" || previous->tag->type == Tag::Text))
@@ -4174,12 +4215,17 @@
         node = previous->nextSibling();
         return;   
     }
-    assert(node->tag->type == Tag::Text);
+    Q_ASSERT(node->tag->type == Tag::Text);
 }
 
 void kafkaCommon::getEndOfParagraph(Node*& node, int& offset)
 {
-    assert(node);
+    Q_ASSERT(node);
+    if (!node)
+    {
+      offset = 0;
+      return;
+    }
     
     Node* begin_paragraph = node;
     getStartOfParagraph(begin_paragraph, offset);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parts/kafka/kafkahtmlpart.cpp new/kdewebdev-3.5.3/quanta/parts/kafka/kafkahtmlpart.cpp
--- old/kdewebdev-3.5.2/quanta/parts/kafka/kafkahtmlpart.cpp	2006-03-17 11:14:44.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parts/kafka/kafkahtmlpart.cpp	2006-05-22 20:09:43.000000000 +0200
@@ -337,9 +337,9 @@
         //Then split if necessary the text
         if((static_cast<DOM::CharacterData>(m_currentNode)).length() == 0)
             text = m_currentNode;
-        else if(d->m_cursorOffset == 0)
+        else if(d->m_cursorOffset <= 0)
             text2 = m_currentNode;
-        else if((unsigned)d->m_cursorOffset ==
+        else if((unsigned)d->m_cursorOffset >=
                 (static_cast<DOM::CharacterData>(m_currentNode)).length())
             text = m_currentNode;
         else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/parts/kafka/wkafkapart.cpp new/kdewebdev-3.5.3/quanta/parts/kafka/wkafkapart.cpp
--- old/kdewebdev-3.5.2/quanta/parts/kafka/wkafkapart.cpp	2006-03-17 11:14:44.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/parts/kafka/wkafkapart.cpp	2006-05-22 20:09:43.000000000 +0200
@@ -1472,7 +1472,7 @@
 	}
 
 	_currentNode = attrs->getNode();
-	if(!_currentNode && attrs->specialBehavior() == kNodeAttrs::none)
+  if(!_currentNode /* && attrs->specialBehavior() == kNodeAttrs::none -- Andras: what happens if _currentNode is null, but this part of the if is not true?*/)
 	{
 		kdDebug(25001)<< "KafkaDocument::getQuantaCursorPosition() - Node not found!" << endl;
 		line = 0;
@@ -2155,7 +2155,7 @@
 	}
 	else if(_node->child)// && !deleteChilds
 	{
-		if(!_node->parent->child)
+    if(_node->parent && !_node->parent->child)
 			_node->parent->child = _node->child;
 		if(_node->prev)
 			_node->prev->next = _node->child;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/project/project.cpp new/kdewebdev-3.5.3/quanta/project/project.cpp
--- old/kdewebdev-3.5.2/quanta/project/project.cpp	2006-03-17 11:14:46.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/project/project.cpp	2006-05-22 20:09:44.000000000 +0200
@@ -911,7 +911,7 @@
 {
   if (d->m_projectFiles.isEmpty())
     d->m_projectFiles.readFromXML(d->dom, d->baseURL, d->templateURL, d->excludeRx);
-  return (d->m_projectFiles.contains(url) > 0);
+  return d->m_projectFiles.contains(url);
 }
 
 void Project::slotFileDescChanged(const KURL& url, const QString& desc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/project/projectprivate.cpp new/kdewebdev-3.5.3/quanta/project/projectprivate.cpp
--- old/kdewebdev-3.5.2/quanta/project/projectprivate.cpp	2006-03-17 11:14:46.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/project/projectprivate.cpp	2006-05-22 20:09:44.000000000 +0200
@@ -258,7 +258,7 @@
         if (el2.nodeName() == "viewitem")
         {
           urlsInView.append(url);
-          if (! ViewManager::ref()->isOpened(url))
+          if (!ViewManager::ref()->isOpened(url) && QExtFileInfo::exists(url, true, m_mainWindow))
             urlsToOpen.append(url);
         } else {
           if (el2.nodeName() == "viewtoolbar")
@@ -1500,7 +1500,7 @@
     KService::Ptr service = *iterDbg;
     if(m_debuggerClientEdit == service->name())
     {
-      DebuggerClient *dbg = dbg;
+      DebuggerClient *dbg = 0L;
       int errCode = 0;
 //Workaround for dynamic_cast not working correctly on SUSE 10, gcc 4.0.2
 //The correct way should be a simple:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/project/projectupload.cpp new/kdewebdev-3.5.3/quanta/project/projectupload.cpp
--- old/kdewebdev-3.5.2/quanta/project/projectupload.cpp	2006-03-17 11:14:46.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/project/projectupload.cpp	2006-05-22 20:09:44.000000000 +0200
@@ -404,70 +404,71 @@
   UploadTreeFile *fileItem;
   UploadTreeFolder *folderItem;
 
-  uint toUploadCount = toUpload.count();
-  currentItem = 0L;
-  for (uint i = 0; i < toUploadCount; i++)
+  if (toUpload.isEmpty())
   {
-      currentItem = toUpload.at(i);
-      if (dynamic_cast<UploadTreeFile*>(currentItem))
-      {
-        fileItem = dynamic_cast<UploadTreeFile*>(currentItem);
-        folderItem = 0L;
-        currentURL = fileItem->url();
-      } else
-      {
-        fileItem = 0L;
-        folderItem = dynamic_cast<UploadTreeFolder*>(currentItem);
-        currentURL = folderItem->url();
-      }
+    saveRemoteUploadInfo();
+    accept();
+    return;
+  }
+  currentItem = toUpload.at(0);
+  if (dynamic_cast<UploadTreeFile*>(currentItem))
+  {
+    fileItem = static_cast<UploadTreeFile*>(currentItem);
+    folderItem = 0L;
+    currentURL = fileItem->url();
+  } else
+  {
+    fileItem = 0L;
+    folderItem = static_cast<UploadTreeFolder*>(currentItem);
+    currentURL = folderItem->url();
+  }
 
 
-      KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
-      to = *baseUrl;
-      to.addPath( currentURL.path() );
-      if (to.fileName(false).isEmpty())
-      {
-        dir = to;
-      }
-      else
-      {
-        dir = to.upURL() ;
-      }
+  KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
+  to = *baseUrl;
+  to.addPath( currentURL.path() );
+  if (to.fileName(false).isEmpty())
+  {
+    dir = to;
+  }
+  else
+  {
+    dir = to.upURL() ;
+  }
 
-      if ( !madeDirs.contains(dir) )
-      {
-        madeDirs.append( dir );
-        if (!QExtFileInfo::createDir(dir, this))
-        {
-          QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) ));
-          buttonUpload->setEnabled(true);
-          uploadInProgress = false;
-          saveRemoteUploadInfo();
-          return;
-        }
-      }
+  if ( !madeDirs.contains(dir) )
+  {
+    madeDirs.append( dir );
+    if (!QExtFileInfo::createDir(dir, this))
+    {
+      QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) ));
+      buttonUpload->setEnabled(true);
+      uploadInProgress = false;
+      saveRemoteUploadInfo();
+      return;
+    }
+  }
 
-     // qDebug("%s -> %s", from.url().data(), to.url().data() );
-      if (!from.fileName(false).isEmpty() && fileItem)
-      {
-        emit eventHappened("before_upload", from.url(), to.url());
-        KIO::FileCopyJob *job = KIO::file_copy( from, to, fileItem->permissions(), true, false, false );
+  // qDebug("%s -> %s", from.url().data(), to.url().data() );
+  if (!from.fileName(false).isEmpty() && fileItem)
+  {
+    emit eventHappened("before_upload", from.url(), to.url());
+    KIO::FileCopyJob *job = KIO::file_copy( from, to, fileItem->permissions(), true, false, false );
 
-        connect( job, SIGNAL( result( KIO::Job * ) ),this,
-                          SLOT( uploadFinished( KIO::Job * ) ) );
-        connect( job, SIGNAL( percent( KIO::Job *,unsigned long ) ),
-                    this, SLOT( uploadProgress( KIO::Job *,unsigned long ) ) );
-        connect( job, SIGNAL( infoMessage( KIO::Job *,const QString& ) ),
-                    this, SLOT( uploadMessage( KIO::Job *,const QString& ) ) );
-
-        labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName()));
-        currentProgress->setProgress( 0 );
-        return;
-      } else  //it is a dir, so just go to the next item
-      {
-        emit uploadNext();
-        return;
-      }
+    connect( job, SIGNAL( result( KIO::Job * ) ),this,
+                      SLOT( uploadFinished( KIO::Job * ) ) );
+    connect( job, SIGNAL( percent( KIO::Job *,unsigned long ) ),
+                this, SLOT( uploadProgress( KIO::Job *,unsigned long ) ) );
+    connect( job, SIGNAL( infoMessage( KIO::Job *,const QString& ) ),
+                this, SLOT( uploadMessage( KIO::Job *,const QString& ) ) );
+
+    labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName()));
+    currentProgress->setProgress( 0 );
+    return;
+  } else  //it is a dir, so just go to the next item
+  {
+    emit uploadNext();
+    return;
   }
   saveRemoteUploadInfo();
   buttonUpload->setEnabled(true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/quanta.lsm new/kdewebdev-3.5.3/quanta/quanta.lsm
--- old/kdewebdev-3.5.2/quanta/quanta.lsm	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/quanta.lsm	2006-05-22 20:09:46.000000000 +0200
@@ -1,7 +1,7 @@
 Begin3
 Title:          Quanta
-Version:        3.5.2
-Entered-date:   2006-03-17
+Version:        3.5.3
+Entered-date:   2006-05-23
 Description:    Powerful markup and script language editor for KDE3
 Keywords:       HTML,JS,PHP,Embeded Preview,KDE,Quanta
 Author:         Eric Laffoon & Andras Mantia <sequitur@kde.org,amantia@kde.org>; originally by Dmitry Poplavsky & Alexander Yakovlev <dima@kde.org,yshurik@kde.org>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/scripts/htmlquickstart.kmdr new/kdewebdev-3.5.3/quanta/scripts/htmlquickstart.kmdr
--- old/kdewebdev-3.5.2/quanta/scripts/htmlquickstart.kmdr	2006-01-19 17:52:40.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/scripts/htmlquickstart.kmdr	2006-05-22 20:09:43.000000000 +0200
@@ -444,7 +444,7 @@
                         <stringlist>
                             <string>@null</string>
                             <string></string>
-                            <string><!-- $Id: htmlquickstart.kmdr 490875 2005-12-23 14:16:57Z amantia $ --></string>
+                            <string><!-- $Id: htmlquickstart.kmdr 542833 2006-05-20 13:55:07Z amantia $ --></string>
                         </stringlist>
                     </property>
                 </widget>
@@ -834,7 +834,13 @@
                                 <stringlist>
                                     <string>@null</string>
                                     <string></string>
-                                    <string>echo "$PADDING<script language=\"javascript\" type=\"text/javascript\">"
+                                    <string>if echo $DTD | grep -q strict
+then
+	echo "$PADDING<script type=\"text/javascript\">"
+else
+	echo "$PADDING<script language=\"javascript\" type=\"text/javascript\">"
+fi
+
 
 if [ $XHTML = true ]; then
 	echo "$PADDING/* <![CDATA[ */"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/src/quanta.cpp new/kdewebdev-3.5.3/quanta/src/quanta.cpp
--- old/kdewebdev-3.5.2/quanta/src/quanta.cpp	2006-03-17 11:14:43.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/src/quanta.cpp	2006-05-22 20:09:43.000000000 +0200
@@ -373,9 +373,16 @@
   m_parserEnabled = false;
   for (KURL::List::ConstIterator i = urls.begin(); i != urls.end(); ++i)
   {
-    if (QuantaCommon::checkMimeGroup(*i, "text") ||
-        QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes)
-      slotFileOpen(*i, encoding);
+    if (!QExtFileInfo::exists(*i, true, this))
+    {
+      KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg((*i).prettyURL(0, KURL::StripFileProtocol)));
+      
+    } else
+    {
+      if (QuantaCommon::checkMimeGroup(*i, "text") ||
+          QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes)
+        slotFileOpen(*i, encoding);
+    }
   }
   m_doc->blockSignals(false);
   m_parserEnabled = true;
@@ -2833,11 +2840,16 @@
 /** Ask for save all the modified user toolbars. */
 bool QuantaApp::removeToolbars()
 {
+  QStringList names;
   QDictIterator<ToolbarEntry> it(m_toolbarList);
-  while (it.current())
+  for (;it.current();++it)
+  {
+    names += it.currentKey();
+  }
+  for (QStringList::ConstIterator iter = names.constBegin(); iter != names.constEnd(); ++iter)
   {
-    if (!slotRemoveToolbar(it.current()->id))
-        return false;
+    if (!slotRemoveToolbar(*iter))
+      return false;
   }
 
   QString s = "<!DOCTYPE actionsconfig>\n<actions>\n</actions>\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/src/quanta.h new/kdewebdev-3.5.3/quanta/src/quanta.h
--- old/kdewebdev-3.5.2/quanta/src/quanta.h	2006-03-17 11:14:43.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/src/quanta.h	2006-05-22 20:09:43.000000000 +0200
@@ -19,7 +19,7 @@
 #define QUANTA_H
 
 #define QUANTA_PACKAGE "quanta"
-#define QUANTA_VERSION "3.5.2"
+#define QUANTA_VERSION "3.5.3"
 
 #define IDS_STATUS      1
 #define IDS_INS_OVR     2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/treeviews/templatestreeview.cpp new/kdewebdev-3.5.3/quanta/treeviews/templatestreeview.cpp
--- old/kdewebdev-3.5.2/quanta/treeviews/templatestreeview.cpp	2006-03-17 11:14:47.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/treeviews/templatestreeview.cpp	2006-05-22 20:09:46.000000000 +0200
@@ -99,7 +99,7 @@
     {
       if (url.isLocalFile())
       {
-        QDir dir (url.path(), "", QDir::All & !QDir::Hidden);
+        QDir dir (url.path(), "", QDir::All);
         tvi->setExpandable(dir.count() != 2);     //   . and .. are always there
       } else {
         tvi->setExpandable(true);     //   we assume there is something
@@ -223,7 +223,7 @@
   addBranch(newBrnch);
   if (url.isLocalFile())
   {
-    QDir dir (url.path(), "", QDir::All & !QDir::Hidden);
+    QDir dir (url.path(), "", QDir::All);
     newBrnch->root()->setExpandable(dir.count() != 2);     //   . and .. are always there
   } else {
     newBrnch->root()->setExpandable(true);     //   we assume there is something
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kdewebdev-3.5.2/quanta/utility/tagaction.cpp new/kdewebdev-3.5.3/quanta/utility/tagaction.cpp
--- old/kdewebdev-3.5.2/quanta/utility/tagaction.cpp	2006-03-17 11:14:44.000000000 +0100
+++ new/kdewebdev-3.5.3/quanta/utility/tagaction.cpp	2006-05-22 20:09:44.000000000 +0200
@@ -916,6 +916,7 @@
     if ( attr.right(1) == ">" )
         attr.remove( attr.length()-1, 1 );
     attr = attr.stripWhiteSpace();
+    attr.remove(0, name.length());
     
     QString s1 = QuantaCommon::tagCase(name);
     if (otag.text().left(1) == "<") s1 = "<"+s1;


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit kdewebdev3

root＠suse.de