Rename ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY in ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 4532e7bde9)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

dcopc/marshal.c

@@ -19,6 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#include "config.h"
 #include "marshal.h"
 
 #include <glib.h>

dcopjava/binding/Makefile.am

@@ -1,8 +1,8 @@
 lib_LTLIBRARIES = libjavadcop.la
 
 libjavadcop_la_SOURCES = client.cpp 
-libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
-libjavadcop_la_LIBADD = $(LIB_TDECORE)
+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
 
 INCLUDES = $(jni_includes) $(all_includes)
 
@@ -12,7 +12,9 @@ client.lo: org_trinitydesktop_DCOP_Client.h
 
 org_trinitydesktop_DCOP_Client.h:
 	$(MAKE) -C org
-	$(JAVAH)  -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client
+	if ! $(JAVA8); then \
+	  $(JAVAH) -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client; \
+	fi
 
 SUBDIRS = org
 

dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am

@@ -4,6 +4,10 @@ classdir = $(kde_libraries)/java/org/trinitydesktop/DCOP
 SUFFIXES = .java .class
 
 .java.class:
-	CLASSPATH=$(top_srcdir)/dcopjava/binding  $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java
+	if $(JAVA8); then \
+	  CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java -h ../../..; \
+	else \
+	  CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java; \
+	fi
 
 CLEANFILES = $(class_DATA)

dcopperl/DCOP.xs

@@ -26,6 +26,8 @@
 #undef vform
 #endif
 
+#include <cassert>
+
 #include <tqpoint.h>
 #include <tqrect.h>
 #include <tqregexp.h>

dcoppython/configure.in.in

@@ -6,4 +6,7 @@ fi
 AC_ARG_VAR([XSLTPROC])
 AC_ARG_VAR([PYTHON])
 AC_PATH_PROG([XSLTPROC],[xsltproc],[echo])
-AC_PATH_PROG([PYTHON],[python])
+AC_PATH_PROG([PYTHON],[python2])
+if test -z "$PYTHON"; then
+    AC_PATH_PROG([PYTHON],[python])
+fi

dcoppython/shell/Makefile.am

@@ -17,7 +17,7 @@ pythlibdir = $(PYTHONMODDIR)/site-packages
 
 pcop_la_SOURCES = pcop.cpp marshaller.cpp importedmodules.cpp
 pcop_la_LDFLAGS = $(all_libraries) -module -avoid-version
-pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_QT)
+pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_QT) $(LIBPYTHON)
 
 noinst_HEADERS = pcop.h marshaller.h marshal_funcs.h importedmodules.h
 

kalyptus/kalyptus

@@ -14,6 +14,8 @@ use Getopt::Long;
 use File::Basename;
 use strict;
 
+# allow to use local modules
+use lib dirname (__FILE__);
 use Ast;
 
 use kdocUtil;
@@ -25,7 +27,7 @@ use vars qw/ %rootNodes $declNodeType @includes_list %options @formats_wanted $a
 	$libdir $libname $outputdir @libs $parse_global_space $qt_embedded $qt4 $striphpath $doPrivate $readstdin
 	$Version $quiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe
 	%formats %flagnames @allowed_k_dcop_accesors $allowed_k_dcop_accesors_re $rootNode 
-	@classStack $cNode $globalSpaceClassName
+	@classStack $cNode $globalSpaceClassName $have_tdehw_lib
 	$lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded
 	$inExtern $inNamespace %stats %definitions @inputqueue @codeqobject @qt4_codeqobject @qte_codeqobject /;
      
@@ -228,6 +230,18 @@ if ( $#includes >= 0 && !$cpp ) {
 	die "$exe: --includedir requires --cpp\n";
 }
 
+# Check for tdehw lib headers presence
+if (-e "$ENV{KDE_PREFIX}/include/tdehardwaredevices.h")
+{
+	$have_tdehw_lib = 1;
+	print "kalyptus: tdehw headers found in $ENV{KDE_PREFIX}/include\n";
+}
+else
+{
+	$have_tdehw_lib = 0;
+	print "kalyptus: tdehw headers not found in $ENV{KDE_PREFIX}/include\n";
+}
+
 # Check output formats. HTML is the default
 if( $#formats_wanted < 0 ) {
 	push @formats_wanted, "java";
@@ -557,7 +571,7 @@ LOOP:
 						|| $p =~ /^\s*Q_DECLARE_SHARED/
 			);
 
-		push @includes_list, $1 if $p =~ /^#include\s+<?(.*?)>?\s*$/;
+		push @includes_list, $1 if $p =~ /^#include\s+[<"]?(.*?)[>"]?\s*$/;
 
 		# remove all preprocessor macros
 		if( $p =~ /^\s*#\s*(\w+)/ ) {
@@ -589,7 +603,7 @@ LOOP:
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(QT_THREAD_SUPPORT/ or
 				     $p =~ m/^#\s*else/ or
-				     $p =~ m/^#\s*if\s+defined\(Q_FULL_TEMPLATE_INSTANTIATION/ or
+				     $p =~ m/^#\s*if\s+defined\(TQ_FULL_TEMPLATE_INSTANTIATION/ or
 				     $p =~ m/^#\s*ifdef\s+QT_WORKSPACE_WINDOWMODE/ or
 				     $p =~ m/^#\s*ifdef\s+QT_COMPAT/ or
 				     $p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or
@@ -600,6 +614,7 @@ LOOP:
 				     $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or
 				     $p =~ m/^#\s*ifndef\s+QT_NO_MEMBER_TEMPLATES/ or
 				     $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
+				     (not $have_tdehw_lib and $p =~ m/^#\s*ifdef\s+__TDE_HAVE_TDEHWLIB/) or
 				     &$match_qt_defines( $p ) or
 				     $p =~ m/^#\s*if\s+0\s+/ ) {
 				     my $if_depth = 1;
@@ -1690,16 +1705,22 @@ sub makeParamList($$$)
 
 		# Separate arg type from arg name, if the latter is specified
 		if ( $arg =~ /(.*)\s+([\w_]+)\s*$/ || $arg =~ /(.*)\(\s*\*\s([\w_]+)\)\s*\((.*)\)\s*$/ ) {
-                    if ( defined $3 ) { # function pointer
-                        $argType = $1."(*)($3)";
-                        $argName = $2;
-                    } else {
-		        $argType = $1;
-		        $argName = $2;
-                    }
-		} else { # unnamed arg - or enum value
-		    $argType = $arg if (!$isEnum);
-		    $argName = $arg if ($isEnum);
+			if ( $1 eq "const" || $2 eq "long" || $2 eq "short" || $2 eq "int" || $2 eq "char" ) {
+				# const qualifier or long notation of numeric type
+				# without argument name
+				$argType = "$1 $2";
+			} else {
+				$argType = $1;
+				$argName = $2;
+			}
+			if ( defined $3 ) {
+				# function pointer
+				$argType .= "(*)($3)";
+			}
+		} else {
+			# unnamed arg - or enum value
+			$argType = $arg if (!$isEnum);
+			$argName = $arg if ($isEnum);
 		}
 		$argId++;
 		

kalyptus/kalyptusCxxToDcopIDL.pm

@@ -230,7 +230,7 @@ sub preParseClass
 	my( $classNode ) = @_;
 	my $className = join( "::", kdocAstUtil::heritage($classNode) );
 
-	if( $#{$classNode->{Kids}} < 0 ||
+	if( ($#{$classNode->{Kids}} < 0 && !$classNode->{DcopExported}) ||
 	    $classNode->{Access} eq "private" ||
 	    $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData
 	    exists $classNode->{Tmpl} ||
@@ -685,8 +685,14 @@ sub generateMethod($$$)
 	$argType =~ s/^\s*(.*?)\s*$/$1/;
 	$argType =~ s/</&lt;/g;
 	$argType =~ s/>/&gt;/g;
+	$argType =~ s/(\W)\s+/$1/g;
+	$argType =~ s/\s+(\W)/$1/g;
+	$argType =~ s/\b(signed|unsigned|long|short)$/$1 int/;
 
-	$args .= "        <ARG><TYPE$typeAttrs>$argType</TYPE><NAME>$arg->{ArgName}</NAME></ARG>\n";
+	$args .= "        ";
+	$args .= "<ARG><TYPE$typeAttrs>$argType</TYPE>";
+	$args .= "<NAME>$arg->{ArgName}</NAME>" if $arg->{ArgName} !~ /^$/;
+	$args .= "</ARG>\n";
 
 	push @argTypeList, $argType;
 
@@ -703,6 +709,13 @@ sub generateMethod($$$)
     my $qual = "";
     $qual .= " qual=\"const\"" if $flags =~ "c";
 
+    my $r_isConst = ($returnType =~ s/^\s*const\s*//);
+    my $r_isRef = ($returnType =~ s/&//);
+
+    my $retTypeAttrs = "";
+    $retTypeAttrs .= "  qleft=\"const\"" if $r_isConst;
+    $retTypeAttrs .= " qright=\"&amp;\"" if $r_isRef;
+
     my $this = $classNode->{BindingDerives} > 0 ? "this" : "xthis";
 
     # We iterate as many times as we have default params
@@ -714,8 +727,12 @@ sub generateMethod($$$)
 	$xretCode .= coerce_type('x[0]', 'xret', $returnType, 1); }
 
     $returnType = "void" unless $returnType;
+    $returnType =~ s/^\s*(.*?)\s*$/$1/;
     $returnType =~ s/</&lt;/g;
     $returnType =~ s/>/&gt;/g;
+    $returnType =~ s/(\W)\s+/$1/g;
+    $returnType =~ s/\s+(\W)/$1/g;
+    $returnType =~ s/\b(signed|unsigned|long|short)$/$1 int/;
 
     my $methodCode = "";
 
@@ -739,7 +756,7 @@ sub generateMethod($$$)
 	    $methodCode .= "        <DOC>$doc</DOC>\n";
 	}
 
-	$methodCode .= "        <TYPE>$returnType</TYPE>\n";
+	$methodCode .= "        <TYPE$retTypeAttrs>$returnType</TYPE>\n";
 	$methodCode .= "        <NAME>$name</NAME>\n";
 	$methodCode .= "$args";
 	$methodCode .= "     </$tagType>\n";

kalyptus/kalyptusCxxToJNI.pm

@@ -145,18 +145,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TTQ_INT16' => 'short',
-   'TTQ_INT32' => 'int',
-   'TTQ_INT64' => 'long',
-   'TTQ_INT8' => 'char',
-   'TTQ_LONG' => 'long',
-   'TTQ_LLONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT64' => 'long',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TTQ_UINT16' => 'ushort',
-   'TTQ_UINT32' => 'uint',
-   'TTQ_UINT64' => 'long',
-   'TTQ_UINT8' => 'uchar',
-   'TTQ_ULONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT64' => 'long',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',

kalyptus/kalyptusCxxToJava.pm

@@ -143,18 +143,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TTQ_INT16' => 'short',
-   'TTQ_INT32' => 'int',
-   'TTQ_INT64' => 'long',
-   'TTQ_INT8' => 'char',
-   'TTQ_LONG' => 'long',
-   'TTQ_LLONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT64' => 'long',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TTQ_UINT16' => 'ushort',
-   'TTQ_UINT32' => 'uint',
-   'TTQ_UINT64' => 'long',
-   'TTQ_UINT8' => 'uchar',
-   'TTQ_ULONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT64' => 'long',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',

kalyptus/kalyptusDataDict.pm

@@ -2643,7 +2643,7 @@ BEGIN
 'char*' => 'char*',
 'char&'  =>  'char' ,
 'char' => 'char',
-'char* bugsEmailAddress @bugs.kde.org"' => 'String',
+'char* bugsEmailAddress @bugs.trinitydesktop.org"' => 'String',
 'char*&' => 'char*',
 'char*' => 'char*',
 'char**' => 'char**',

kalyptus/kdocAstUtil.pm

@@ -361,10 +361,12 @@ ANITER:
 
 			if( !defined $ref ) {
 				# ancestor undefined
-				warn "warning: ", $node->{astNodeName},
-					" inherits unknown class '",
+				if( $in->{astNodeName} ne "DCOPObject"
+				    && $in->{astNodeName} ne "TQObject" ) {
+					warn "warning: ", $node->{astNodeName},
+						" inherits unknown class '",
 						$in->{astNodeName},"'\n";
-
+				}
 				$parent->AddPropList( 'InBy', $node );
 			}
 			else {
@@ -675,7 +677,7 @@ sub dumpAst
 	}
 
 	print "\t" x $depth, "Documentation nodes:\n" if defined 
-		@{ $node->{Doc}->{ "Text" }};
+		$node->{Doc}->{ "Text" };
 
 	foreach $kid ( @{ $node->{Doc}->{ "Text" }} ) {
 		dumpAst( $kid );

kalyptus/kdocParseDoc.pm

@@ -60,15 +60,15 @@ PARSELOOP:
 		next if !defined $text;
 		$text =~ s#^\s*\*(?!\/)##;
 
+		if ( $text =~ m#\*/# ) {
+			$finished = 1;
+			$text = $`;
+		}
 #		if ( $text =~ /^\s*<\/pre>/i ) {
 #			flushProp();
 #			$inbounded = 0;
 #		}
 		if( $inbounded ) {
-			if ( $text =~ m#\*/# ) {
-				$finished = 1;
-				$text = $`;
-			}
 			$buffer .= $text;
 			next PARSELOOP;
 		}
@@ -165,10 +165,6 @@ PARSELOOP:
 			docProp( "LibDoc" );
 		}
 		else {
-			if ( $text =~ m#\*/# ) {
-				$finished = 1;
-				$text = $`;
-			}
 			$buffer .= $text;
 		}
 	}

kjsembed/bindings/bindingobject.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/brush_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/brush_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/dcop_imp.cpp

@@ -1,6 +1,4 @@
 // $Id$
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/dcop_imp.h

@@ -1,6 +1,4 @@
 // $Id$
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/iconset_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/iconset_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/image_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/image_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/movie_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/movie_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/netaccess_imp.cpp

@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 /**
  * netaccess_imp.cpp
  *

kjsembed/bindings/netaccess_imp.h

@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 /**
  * netaccess.h
  *

kjsembed/bindings/painter_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *
@@ -514,8 +512,3 @@ TQColor KJSEmbed::Bindings::Painter::brush( ) const
 {
 	return pr->painter()->brush().color();
 }
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
-

kjsembed/bindings/painter_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/pen_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *
@@ -119,9 +117,3 @@ KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &
 
 } // namespace Bindings
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
-

kjsembed/bindings/pen_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/pixmap_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/pixmap_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Richard J. Moore <rich@kde.org>
  *

kjsembed/bindings/point_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org>
  *
@@ -86,7 +84,3 @@ namespace Bindings {
 
 } // namespace Bindings
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:

kjsembed/bindings/point_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/rect_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org>
  *
@@ -105,7 +103,3 @@ namespace Bindings {
 
 } // namespace Bindings
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:

kjsembed/bindings/rect_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/size_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org>
  *
@@ -127,7 +125,3 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List
 
 } // namespace Bindings
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:

kjsembed/bindings/size_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/sql_imp.cpp

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindings/tdeconfig_imp.h

@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /*
  *  Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org>
  *

kjsembed/bindwizard/binding_wizard.ui

@@ -476,15 +476,10 @@ files of the C++ classes you want to make available to Javascript are located.</
     </widget>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kled.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kled.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>

kjsembed/bindwizard/doxygen2imp_cpp.xsl

@@ -551,10 +551,5 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
 </xsl:for-each>
 
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
 </xsl:template>
 </xsl:stylesheet>