diff options
49 files changed, 450 insertions, 180 deletions
diff --git a/.gitmodules b/.gitmodules index bdec8fca..934def7f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "admin"] path = admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/admin b/admin -Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8 +Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 diff --git a/cmake b/cmake deleted file mode 160000 -Subproject bfa3a90b73588be47dc3f4d373ff63ce17dfb6a diff --git a/configure.in.in b/configure.in.in index 97468718..afa6b2b9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -195,7 +195,11 @@ AC_DEFUN([KDE_CHECK_JAVA], AC_REQUIRE([KDE_CHECK_JAVA_DIR]) if test "$kde_java_bindir" = "no"; then DO_NOT_COMPILE="$DO_NOT_COMPILE $1"; + BUILD_$1=false + else + BUILD_$1=true fi + AM_CONDITIONAL(BUILD_$1, ${BUILD_$1}) ] ) diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index be90dd10..2fe8e5d5 100644 --- a/dcopjava/binding/Makefile.am +++ b/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) diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..5c0b20ee --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,3 @@ +KDE_LANG = en +KDE_DOCS = AUTO +SUBDIRS = $(AUTODIRS) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am new file mode 100644 index 00000000..1f739ad7 --- /dev/null +++ b/doc/man/Makefile.am @@ -0,0 +1,21 @@ +if BUILD_dcopjava + DCOPJAVA_MAN=dcopidl2java.1 +endif + +KJSEMBED_MAN=kjscmd.1 + +if BUILD_korundum + KORUNDUM_MAN=krubyinit.1 rbtdeapi.1 rbtdesh.1 +endif + +if BUILD_qtjava + QTJAVA_MAN=juic.1 +endif + +if BUILD_qtruby + QTRUBY_MAN=qtrubyinit.1 rbqtapi.1 rbqtsh.1 rbuic.1 +endif + +tmpdir = $(mandir)/man1 +tmp_DATA = $(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN) +EXTRA_DIST=$(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN) diff --git a/doc/man/dcopidl2java.1 b/doc/man/dcopidl2java.1 new file mode 100644 index 00000000..926d7839 --- /dev/null +++ b/doc/man/dcopidl2java.1 @@ -0,0 +1,28 @@ +.TH LIBDCOP-JAVA 1 "July 31, 2002" +.SH NAME +dcopidl2java \- Convert a DCOP IDL file to Java language stubs +.SH SYNOPSIS +.B dcopidl2java +.RI " [ " --no-skel " ] [ " --no-stub " ] [ " --package " " java-package " ] " file +.SH DESCRIPTION +This manual page documents briefly the +.B dcopidl2java +command. +.PP +\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file, +for use with the libdcop-java Java DCOP bindings. + +.SH OPTIONS +A summary of options is included below. +.TP +.B --no-skel +Do not generate skeleton code. +.TP +.B --no-stub +Do not generate stub implementation code. +.TP +.B --package java-package +Set the name of the Java package to use in the generated code. +.SH AUTHOR +This manual page was written by Peter Hawkins <peterh@debian.org> +for the Debian GNU/Linux system (but may be used by others). diff --git a/doc/man/juic.1 b/doc/man/juic.1 new file mode 100644 index 00000000..9120f44d --- /dev/null +++ b/doc/man/juic.1 @@ -0,0 +1,39 @@ +.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual" +.SH NAME +juic \- The Qt Java UI Compiler +.SH SYNOPSIS +.B juic +[options] uifile +.SH DESCRIPTION +Juic is the Qt Java UI Compiler. It generates Java\*(tm code from a +XML UI Description file. This XML UI Description file can be +generated by Qt Designer, Qt's graphical UI designer. Juic is the +Java\*(tm equivalent for the C++ uic program. + +Juic generates Java code for the Qt UI Description File passed to it, +and outputs it on standard output. +.SH OPTIONS +.TP +.B \-proc <xsltproc|xalan|saxon> +Tells juic which xslt processor to use internally. Possible values +are "xsltproc", "xalan", "saxon". The processor you specify must be +available in the PATH or juic will give an error. The default is to +use xsltproc if it's available, and use saxon otherwise. +.TP +.B \-package <the.package.for.the.class> +Tells juic to add the given package declaration to the generated java +class. +.TP +.B \-abstract <true|false> +Tells juic whether or not to define slots as abstract. +.TP +.B \-images <dir> +Tells juic where to find the images used in the given ui file. +Default is "images". +.TP +.B \-os <unix|msdos|mac> +Tells juic what newline style to use in the generated java file. Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively. +.SH AUTHOR +Marco Ladermann +.SH SEE ALSO +uic(1) diff --git a/kjsembed/kjscmd.1 b/doc/man/kjscmd.1 index c0765aeb..c0765aeb 100644 --- a/kjsembed/kjscmd.1 +++ b/doc/man/kjscmd.1 diff --git a/doc/man/krubyinit.1 b/doc/man/krubyinit.1 new file mode 100644 index 00000000..f8a40545 --- /dev/null +++ b/doc/man/krubyinit.1 @@ -0,0 +1,25 @@ +.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual" +.SH NAME +krubyinit \- Start Korundum Ruby Scripts Faster +.SH SYNOPSYS +.B krubyinit +[switches] [--] [programfile] [arguments] +.SH DESCRIPTION +Krubyinit is a wrapper around the ruby interpreter for executing Ruby +scripts using the Korundum library ( the Ruby TDE bindings ). It uses +the tdeinit system to start the app so that they start a little bit +faster when started in a running TDE session. + +The script takes exactly the same options as the ruby(1) program. +Therefore, its options aren't documented here, please refer to the +ruby(1) manpage. + +This script is part of Korundum, which is part of the TDE Bindings +module. +.SH OPTIONS +Krubyinit takes exactly the same options as the ruby(1) program and +they have exactly the same meaning. Please refer to its manpage. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +ruby(1) diff --git a/doc/man/qtrubyinit.1 b/doc/man/qtrubyinit.1 new file mode 100644 index 00000000..1ab6e7f2 --- /dev/null +++ b/doc/man/qtrubyinit.1 @@ -0,0 +1,25 @@ +.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual" +.SH NAME +qtrubyinit \- Start Qt Ruby Scripts Faster +.SH SYNOPSYS +.B qtrubyinit +[switches] [--] [programfile] [arguments] +.SH DESCRIPTION +Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby +scripts using the QtRuby library. It uses the tdeinit system to start +the app so that they start a little bit faster when started in a +running TDE session. + +The script takes exactly the same options as the ruby(1) program. +Therefore, its options aren't documented here, please refer to the +ruby(1) manpage. + +This script is part of QtRuby, which is part of the TDE Bindings +module. +.SH OPTIONS +Qtrubyinit takes exactly the same options as the ruby(1) program and +they have exactly the same meaning. Please refer to its manpage. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +ruby(1) diff --git a/doc/man/rbqtapi.1 b/doc/man/rbqtapi.1 new file mode 100644 index 00000000..7cafb5b8 --- /dev/null +++ b/doc/man/rbqtapi.1 @@ -0,0 +1,29 @@ +.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual" +.SH NAME +rbqtapi \- A QtRuby Introspection Tool +.SH SYNOPSIS +.B rbqtapi +[options] [<class>] +.SH DESCRIPTION +Rbqtapi is a QtRuby Introspection Tool, similar to javap(1). Use it +to find a list of method for a certain QtRuby class. +.SH OPTIONS +.TP +.B \-r <re> +Find all functions matching regular expression/keyword <re> +.TP +.B \-i +Perform a case insensitive search ( only meaningful in combination with -r ) +.TP +.B \-p +Display also inherited methods. +.TP +.B \-v +Print QtRuby and Qt versions. +.TP +.B \-h +Print a help message. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +rbtdeapi(1) diff --git a/doc/man/rbqtsh.1 b/doc/man/rbqtsh.1 new file mode 100644 index 00000000..bda49d96 --- /dev/null +++ b/doc/man/rbqtsh.1 @@ -0,0 +1,16 @@ +.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual" +.SH NAME +rbqtsh \- An Interactive QtRuby Shell +.SH SYNOPSIS +.B rbqtsh +[options] +.SH DESCRIPTION +Rbqtsh is an interactive QtRuby shell. It shows a GUI dialog box +where you can enter Ruby code using the QtRuby library. +.SH OPTIONS +This program takes no options. +.SH AUTHOR +Germain Garand +Alexander Kellett +.SH SEE ALSO +rbtdesh(1) diff --git a/doc/man/rbtdeapi.1 b/doc/man/rbtdeapi.1 new file mode 100644 index 00000000..e3d16622 --- /dev/null +++ b/doc/man/rbtdeapi.1 @@ -0,0 +1,29 @@ +.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual" +.SH NAME +rbtdeapi \- A Korundum TDE Ruby Introspection Tool +.SH SYNOPSIS +.B rbtdeapi +[options] [<class>] +.SH DESCRIPTION +Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to +javap(1). Use it to find a list of method for a certain Korundum class. +.SH OPTIONS +.TP +.B \-r <re> +Find all functions matching regular expression/keyword <re> +.TP +.B \-i +Perform a case insensitive search ( only meaningful in combination with -r ) +.TP +.B \-p +Display also inherited methods. +.TP +.B \-v +Print QtRuby and Qt versions. +.TP +.B \-h +Print a help message. +.SH AUTHOR +Alexander Kellett +.SH SEE ALSO +rbqtapi(1) diff --git a/doc/man/rbtdesh.1 b/doc/man/rbtdesh.1 new file mode 100644 index 00000000..6e792e7f --- /dev/null +++ b/doc/man/rbtdesh.1 @@ -0,0 +1,17 @@ +.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual" +.SH NAME +rbtdesh \- An Interactive Korundum Shell +.SH SYNOPSIS +.B rbtdesh +[options] +.SH DESCRIPTION +Rbtdesh is an interactive Korundum shell. It shows a GUI dialog box +where you can enter Ruby code using the Korundum TDE Ruby bindings +library. +.SH OPTIONS +This program takes no options. +.SH AUTHOR +Germain Garand +Alexander Kellett +.SH SEE ALSO +rbqtsh(1) diff --git a/doc/man/rbuic.1 b/doc/man/rbuic.1 new file mode 100644 index 00000000..d59caa1a --- /dev/null +++ b/doc/man/rbuic.1 @@ -0,0 +1,64 @@ +.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual" +.SH NAME +rbuic \- The Qt Ruby UI Compiler +.SH SYNOPSIS +Generate implementation: +.B rbuic +[options] uifile +.LP +Generate subclass implementation: +.B rbuic +[options] -subimpl <classname> <uifile> +.LP +Generate image collection: +.B rbuic +[options] -embed <project> <image1> <image2> <image3> ... +.SH DESCRIPTION +Rbuic is the Qt Ruby UI Compiler. It generates Ruby code from a XML +UI Description file. This XML UI Description file can be generated by +Qt Designer, Qt's graphical UI designer. Rbuic is the Ruby equivalent +for the C++ uic program. + +When invoked to generate an implementation, rbuic generates Ruby code +for the Qt UI Description File passed to it, and outputs it on +standard output. + +When invoked to generate a subclass implementation, rbuic generates +template Ruby code for a subclass of the widget in the Qt UI +Description File passed to it, and outputs it on standard output. + +When invoked to generate an image collection, rbuic generates Ruby +code containing the image data in strings. This is useful to avoid +having to distribute image files along with your application. It is +arguably more useful for C++ ( where the image strings can be compiled +into an executable ), but still, it is available for Ruby as well. +.SH OPTIONS +.TP +.B \-o <file> +Write output to file rather than stdout. +.TP +.B \-p <indent> +Set the indent in spaces (0 to use a tab) +.TP +.B \-nofwd +Omit imports of custom widgets +.TP +.B \-kde +Use TDE widgets, require 'Korundum' extension +.TP +.B \-tr <func> +Use func(...) rather than trUtf8(...) for i18n +.TP +.B \-x +Generate extra code to test the class +.TP +.B \-version +Print the Rbuic and Qt versions +.TP +.B \-help +Display some help information. +.SH AUTHOR +Germain Garand +Phil Thompson +.SH SEE ALSO +uic(1) diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 76c29ee8..c405eefd 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -27,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 /; @@ -230,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"; @@ -602,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; diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index 2b25cd12..13ef5f83 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -61,8 +61,6 @@ kjscmd_SOURCES = kjscmd.cpp kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) kjscmd_LDADD = libkjsembed.la -man_MANS = kjscmd.1 - xdg_apps_DATA = kjscmd.desktop plugintypedir = $(kde_servicetypesdir) diff --git a/kjsembed/bindwizard/binding_wizard.ui b/kjsembed/bindwizard/binding_wizard.ui index baacdca5..352b68d8 100644 --- a/kjsembed/bindwizard/binding_wizard.ui +++ b/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> diff --git a/kjsembed/docs/embedding/qtembed/posviewbase.ui b/kjsembed/docs/embedding/qtembed/posviewbase.ui index 4916d505..6c55b01e 100644 --- a/kjsembed/docs/embedding/qtembed/posviewbase.ui +++ b/kjsembed/docs/embedding/qtembed/posviewbase.ui @@ -137,9 +137,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -154,9 +151,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kjsembed/docs/embedding/simple-embed/embedview.ui b/kjsembed/docs/embedding/simple-embed/embedview.ui index 44985f72..58c75064 100644 --- a/kjsembed/docs/embedding/simple-embed/embedview.ui +++ b/kjsembed/docs/embedding/simple-embed/embedview.ui @@ -96,9 +96,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="stdItem" stdset="0"> <number>0</number> </property> @@ -172,12 +169,8 @@ <slot>consoleClicked()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui index 3af30e5e..7ffe890d 100644 --- a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui +++ b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui @@ -570,23 +570,13 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kdualcolorbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kdualcolorbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/connect/connect.ui b/kjsembed/docs/examples/connect/connect.ui index 5c33501e..153f264b 100644 --- a/kjsembed/docs/examples/connect/connect.ui +++ b/kjsembed/docs/examples/connect/connect.ui @@ -152,9 +152,9 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/docviewer/docviewer.ui b/kjsembed/docs/examples/docviewer/docviewer.ui index b27ac94b..bcefe398 100644 --- a/kjsembed/docs/examples/docviewer/docviewer.ui +++ b/kjsembed/docs/examples/docviewer/docviewer.ui @@ -62,8 +62,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui index 14bf9f99..fb1e84ac 100644 --- a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui +++ b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui @@ -551,18 +551,9 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imagefun/bump.ui b/kjsembed/docs/examples/imagefun/bump.ui index eb342eac..fb91050b 100644 --- a/kjsembed/docs/examples/imagefun/bump.ui +++ b/kjsembed/docs/examples/imagefun/bump.ui @@ -313,15 +313,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imunge/effectbrowser.ui b/kjsembed/docs/examples/imunge/effectbrowser.ui index 09dcac7b..95373c2c 100644 --- a/kjsembed/docs/examples/imunge/effectbrowser.ui +++ b/kjsembed/docs/examples/imunge/effectbrowser.ui @@ -145,7 +145,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imunge/resizeparams.ui b/kjsembed/docs/examples/imunge/resizeparams.ui index a7dbfd0a..ec0cecf3 100644 --- a/kjsembed/docs/examples/imunge/resizeparams.ui +++ b/kjsembed/docs/examples/imunge/resizeparams.ui @@ -141,9 +141,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -158,9 +155,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -184,10 +178,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/madminute/configdialog.ui b/kjsembed/docs/examples/madminute/configdialog.ui index 968c9b1f..8e7e6de5 100644 --- a/kjsembed/docs/examples/madminute/configdialog.ui +++ b/kjsembed/docs/examples/madminute/configdialog.ui @@ -176,9 +176,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -193,9 +190,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -267,8 +261,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/madminute/madminute.ui b/kjsembed/docs/examples/madminute/madminute.ui index 1154312a..e9c84652 100644 --- a/kjsembed/docs/examples/madminute/madminute.ui +++ b/kjsembed/docs/examples/madminute/madminute.ui @@ -321,9 +321,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> diff --git a/kjsembed/docs/examples/qdocviewer/docviewer.ui b/kjsembed/docs/examples/qdocviewer/docviewer.ui index 94b7458b..b9bb38d7 100644 --- a/kjsembed/docs/examples/qdocviewer/docviewer.ui +++ b/kjsembed/docs/examples/qdocviewer/docviewer.ui @@ -414,9 +414,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -479,9 +476,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/kjsembed/tdescript/swaptabs.ui b/kjsembed/tdescript/swaptabs.ui index f7f5e973..d9f9a4d8 100644 --- a/kjsembed/tdescript/swaptabs.ui +++ b/kjsembed/tdescript/swaptabs.ui @@ -126,9 +126,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -143,9 +140,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kjsembed/tests/test.ui b/kjsembed/tests/test.ui index 477d8c2d..4c031d9b 100644 --- a/kjsembed/tests/test.ui +++ b/kjsembed/tests/test.ui @@ -105,7 +105,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am index 01d89533..72212f5b 100644 --- a/korundum/bin/Makefile.am +++ b/korundum/bin/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) bin_PROGRAMS = krubyinit diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/configure.in.in index 0a987639..f32e1473 100644 --- a/korundum/rubylib/korundum/configure.in.in +++ b/korundum/configure.in.in @@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) if test -z "RUBY_EXECUTABLE"; then DO_NOT_COMPILE="$DO_NOT_COMPILE korundum" + BUILD_korundum=false else RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` @@ -32,6 +33,37 @@ else RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" fi + # check if Ruby requires explicit specification of C++ standard + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + SAVED_CXXFLAGS="$CXXFLAGS" + for CXX_STD_TEST in "" 11 14 17; do + CXXFLAGS="$SAVED_CXXFLAGS" + if test "x$CXX_STD_TEST" = "x"; then + AC_MSG_CHECKING([Ruby build with default C++ standard]) + RUBY_CXXFLAGS="" + else + AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST]) + RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST" + fi + CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS" + AC_TRY_COMPILE([ + #include <ruby.h> + ],[ ], + ruby_cxx_std=yes, + ruby_cxx_std=no + ) + if test "x$ruby_cxx_std" = "xyes"; then + AC_SUBST(RUBY_CXXFLAGS) + AC_MSG_RESULT(yes) + break + else + AC_MSG_RESULT(no) + fi + done + CXXFLAGS="$SAVED_CXXFLAGS" + AC_LANG_RESTORE + # Removes trailing slashes, if any, to avoid fail to install with recent libtool. RUBY_ARCHDIR=${RUBY_ARCHDIR%/} RUBY_SITEDIR=${RUBY_SITEDIR%/} @@ -46,7 +78,8 @@ else libdir $RUBY_LIBDIR, includedir $RUBY_INCLUDEDIR, librubyarg $RUBY_LIBRUBYARG, - cflags $RUBY_CFLAGS]) + cflags $RUBY_CFLAGS, + cxxflags $RUBY_CXXFLAGS]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEDIR) @@ -55,5 +88,6 @@ else AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_CFLAGS) + BUILD_korundum=true fi - +AM_CONDITIONAL(BUILD_korundum, $BUILD_korundum) diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am index 453718b4..568479a5 100644 --- a/korundum/rubylib/korundum/Makefile.am +++ b/korundum/rubylib/korundum/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) rubylibdir = $(RUBY_ARCHDIR) diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am index ac39aeb2..46159ec4 100644 --- a/qtruby/bin/Makefile.am +++ b/qtruby/bin/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) bin_PROGRAMS = qtrubyinit diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/configure.in.in index db0594a3..bc32a89d 100644 --- a/qtruby/rubylib/qtruby/configure.in.in +++ b/qtruby/configure.in.in @@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) if test -z "RUBY_EXECUTABLE"; then DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" + BUILD_qtruby=false else RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` @@ -32,6 +33,37 @@ else RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" fi + # check if Ruby requires explicit specification of C++ standard + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + SAVED_CXXFLAGS="$CXXFLAGS" + for CXX_STD_TEST in "" 11 14 17; do + CXXFLAGS="$SAVED_CXXFLAGS" + if test "x$CXX_STD_TEST" = "x"; then + AC_MSG_CHECKING([Ruby build with default C++ standard]) + RUBY_CXXFLAGS="" + else + AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST]) + RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST" + fi + CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS" + AC_TRY_COMPILE([ + #include <ruby.h> + ],[ ], + ruby_cxx_std=yes, + ruby_cxx_std=no + ) + if test "x$ruby_cxx_std" = "xyes"; then + AC_SUBST(RUBY_CXXFLAGS) + AC_MSG_RESULT(yes) + break + else + AC_MSG_RESULT(no) + fi + done + CXXFLAGS="$SAVED_CXXFLAGS" + AC_LANG_RESTORE + # Removes trailing slashes, if any, to avoid fail to install with recent libtool. RUBY_ARCHDIR=${RUBY_ARCHDIR%/} RUBY_SITEDIR=${RUBY_SITEDIR%/} @@ -46,7 +78,8 @@ else libdir $RUBY_LIBDIR, includedir $RUBY_INCLUDEDIR, librubyarg $RUBY_LIBRUBYARG, - cflags $RUBY_CFLAGS]) + cflags $RUBY_CFLAGS, + cxxflags $RUBY_CXXFLAGS]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEDIR) @@ -55,5 +88,6 @@ else AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_CFLAGS) + BUILD_qtruby=true fi - +AM_CONDITIONAL(BUILD_qtruby, $BUILD_qtruby) diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui b/qtruby/rubylib/designer/examples/colortool/mainform.ui index f4081882..340b6c31 100644 --- a/qtruby/rubylib/designer/examples/colortool/mainform.ui +++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui @@ -215,9 +215,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -229,9 +226,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -294,9 +288,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -308,9 +299,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -322,9 +310,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp index 937c32eb..fa402bb5 100644 --- a/qtruby/rubylib/designer/rbuic/form.cpp +++ b/qtruby/rubylib/designer/rbuic/form.cpp @@ -241,7 +241,7 @@ void Uic::createFormImpl( const TQDomElement &e ) // children if( !objectNames.isEmpty() ) - tqWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__); + tqWarning("WARNING : objectNames should be empty at %s line %d", __FILE__, __LINE__); nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am index b7cc229a..c499269a 100644 --- a/qtruby/rubylib/designer/uilib/Makefile.am +++ b/qtruby/rubylib/designer/uilib/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) rubylibdir = $(RUBY_ARCHDIR) diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am index 09ac6b0a..2bd1f653 100644 --- a/qtruby/rubylib/qtruby/Makefile.am +++ b/qtruby/rubylib/qtruby/Makefile.am @@ -1,3 +1,5 @@ +CXXFLAGS += $(RUBY_CXXFLAGS) + INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb diff --git a/qtsharp/src/uicsharp/tests/form5.ui b/qtsharp/src/uicsharp/tests/form5.ui index bb998334..46308250 100644 --- a/qtsharp/src/uicsharp/tests/form5.ui +++ b/qtsharp/src/uicsharp/tests/form5.ui @@ -125,9 +125,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -156,9 +153,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +266,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +277,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -300,9 +288,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/qtsharp/src/uicsharp/tests/form6.ui b/qtsharp/src/uicsharp/tests/form6.ui index bcc04572..f97aa87e 100644 --- a/qtsharp/src/uicsharp/tests/form6.ui +++ b/qtsharp/src/uicsharp/tests/form6.ui @@ -85,9 +85,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -102,9 +99,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/qtsharp/src/uicsharp/tests/form9.ui b/qtsharp/src/uicsharp/tests/form9.ui index 3ba562c7..33c6e5f3 100644 --- a/qtsharp/src/uicsharp/tests/form9.ui +++ b/qtsharp/src/uicsharp/tests/form9.ui @@ -165,9 +165,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -182,9 +179,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/smoke/smoke.h b/smoke/smoke.h index c76d7900..4a320d0b 100644 --- a/smoke/smoke.h +++ b/smoke/smoke.h @@ -34,7 +34,7 @@ THE POSSIBILITY OF SUCH DAMAGE. */ -#define ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY 1 +#define ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY 1 class SmokeBinding; diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in index e3c21747..6d0eb698 100644 --- a/smoke/tde/generate.pl.in +++ b/smoke/tde/generate.pl.in @@ -185,6 +185,7 @@ find( ); # Launch kalyptus +$ENV{KDE_PREFIX} = "@KDE_PREFIX@"; system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders"; my $exit = $? >> 8; exit $exit if ($exit); diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index 8c156a37..21d9d9c3 100644 --- a/smoke/tqt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -132,6 +132,7 @@ foreach $filename (readdir(QT)) { closedir QT; # Launch kalyptus +$ENV{KDE_PREFIX} = "@KDE_PREFIX@"; chdir "../smoke/tqt"; system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers"; my $exit = $? >> 8; |