diff options
| -rw-r--r-- | Doxyfile | 2 | ||||
| -rw-r--r-- | doc/kde_app_devel/index.docbook | 26 | ||||
| -rw-r--r-- | doc/kdevelop/applicationwizard.docbook | 2 | ||||
| -rw-r--r-- | doc/kdevelop/kdevelop-install.docbook | 60 | ||||
| -rw-r--r-- | doc/kdevelop/project-management.docbook | 2 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kscons_kmdi/README | 2 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kscons_kxt/README | 2 | ||||
| -rw-r--r-- | languages/ruby/doc/qtruby.toc | 2 | ||||
| -rw-r--r-- | parts/outputviews/makeactionfilter.cpp | 16 |
9 files changed, 57 insertions, 57 deletions
@@ -194,7 +194,7 @@ RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = ./man -MAN_EXTENSION = .kde3 +MAN_EXTENSION = .trinity MAN_LINKS = YES #--------------------------------------------------------------------------- # configuration options related to the XML output diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index 5b721135..2ec1f0e4 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -722,7 +722,7 @@ the compilation phase. 9 gmake[3]: Leaving directory `/home/caleb/kscribble/doc' 10 Making all in en 11 gmake[3]: Entering directory `/home/caleb/kscribble/doc/en' -12 /usr/local/kde3/bin/meinproc --check --cache index.cache.bz2 /home/caleb/kscribble/doc/en/index.docbook +12 /usr/local/trinity/bin/meinproc --check --cache index.cache.bz2 /home/caleb/kscribble/doc/en/index.docbook 13 gmake[3]: Leaving directory `/home/caleb/kscribble/doc/en' 14 gmake[2]: Leaving directory `/home/caleb/kscribble/doc' 15 Making all in po @@ -734,7 +734,7 @@ the compilation phase. 21 source='main.cpp' object='main.o' libtool=no \ 22 depfile='.deps/main.Po' tmpdepfile='.deps/main.TPo' \ 23 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \ -24 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/kde3/include +24 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new @@ -743,7 +743,7 @@ the compilation phase. 26 source='kscribble.cpp' object='kscribble.o' libtool=no \ 27 depfile='.deps/kscribble.Po' tmpdepfile='.deps/kscribble.TPo' \ 28 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \ -29 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/kde3/include +29 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new @@ -754,7 +754,7 @@ the compilation phase. 33 source='kscribbleview.cpp' object='kscribbleview.o' libtool=no \ 34 depfile='.deps/kscribbleview.Po' tmpdepfile='.deps/kscribbleview.TPo' \ 35 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \ -36 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/kde3/include +36 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -c @@ -768,18 +768,18 @@ the compilation phase. 43 source='pref.cpp' object='pref.o' libtool=no \ 44 depfile='.deps/pref.Po' tmpdepfile='.deps/pref.TPo' \ 45 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \ -46 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/kde3/include +46 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -c -o pref.o `test -f 'pref.cpp' || echo '/home/caleb/kscribble/src/'`pref.cpp -47 /usr/local/kde3/bin/dcopidl /home/caleb/kscribble/src/kscribbleiface.h > kscribbleiface.kidl || +47 /usr/local/trinity/bin/dcopidl /home/caleb/kscribble/src/kscribbleiface.h > kscribbleiface.kidl || ( rm -f kscribbleiface.kidl ; /bin/false ) -48 /usr/local/kde3/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub kscribbleiface.kidl +48 /usr/local/trinity/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub kscribbleiface.kidl 49 source='kscribbleiface_skel.cpp' object='kscribbleiface_skel.o' libtool=no \ 50 depfile='.deps/kscribbleiface_skel.Po' tmpdepfile='.deps/kscribbleiface_skel.TPo' \ 51 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \ -52 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/kde3/include +52 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new @@ -788,12 +788,12 @@ the compilation phase. 53 /bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -o kscribble -R - /usr/local/kde3/lib -R /usr/lib/qt/lib -R /usr/X11R6/lib -L/usr/X11R6/lib -L/usr/lib/qt/lib - -L/usr/local/kde3/lib main.o kscribble.o kscribbleview.o pref.o kscribbleiface_skel.o -lkio + /usr/local/trinity/lib -R /usr/lib/qt/lib -R /usr/X11R6/lib -L/usr/X11R6/lib -L/usr/lib/qt/lib + -L/usr/local/trinity/lib main.o kscribble.o kscribbleview.o pref.o kscribbleiface_skel.o -lkio 54 source='kscribble_client.cpp' object='kscribble_client.o' libtool=no \ 55 depfile='.deps/kscribble_client.Po' tmpdepfile='.deps/kscribble_client.TPo' \ 56 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \ -57 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/kde3/include +57 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new @@ -802,8 +802,8 @@ the compilation phase. 58 /bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -o kscribble_client -R - /usr/local/kde3/lib -R /usr/lib/qt/lib -R /usr/X11R6/lib -L/usr/X11R6/lib -L/usr/lib/qt/lib - -L/usr/local/kde3/lib kscribble_client.o -lkdecore + /usr/local/trinity/lib -R /usr/lib/qt/lib -R /usr/X11R6/lib -L/usr/X11R6/lib -L/usr/lib/qt/lib + -L/usr/local/trinity/lib kscribble_client.o -lkdecore 59 gmake[2]: Leaving directory `/home/caleb/kscribble/src' 60 gmake[2]: Entering directory `/home/caleb/kscribble' 61 gmake[2]: Nothing to be done for `all-am'. diff --git a/doc/kdevelop/applicationwizard.docbook b/doc/kdevelop/applicationwizard.docbook index 9ffea830..6370cb12 100644 --- a/doc/kdevelop/applicationwizard.docbook +++ b/doc/kdevelop/applicationwizard.docbook @@ -598,7 +598,7 @@ When any information of all these is wrong &kdevelop; usually will not know abou <screen><computeroutput> * cd '/home/devel/test' && cvs -d '/home/devel/mycvsroot' \ import -m 'new project' '' 'vendor' 'start' &&\ - sh /opt/kde3/share/apps/kdevcvs/buildcvs.sh . '' \ + sh /opt/trinity/share/apps/kdevcvs/buildcvs.sh . '' \ '/home/devel/mycvsroot' * cvs [import aborted]: /home/devel/mycvsroot/CVSROOT: No such file or directory diff --git a/doc/kdevelop/kdevelop-install.docbook b/doc/kdevelop/kdevelop-install.docbook index 1ff5982c..028f5e10 100644 --- a/doc/kdevelop/kdevelop-install.docbook +++ b/doc/kdevelop/kdevelop-install.docbook @@ -73,7 +73,7 @@ To obtain an initial version of &kdevelop; you must download it from anonymous s </para> <note><para> -We assume you want to put your &kdevelop; copy into the <filename class="directory">kde3src</filename> subdirectory of your home directory (<filename class="directory">~</filename>). +We assume you want to put your &kdevelop; copy into the <filename class="directory">trinitysrc</filename> subdirectory of your home directory (<filename class="directory">~</filename>). </para></note> <informalexample><simplelist> @@ -82,18 +82,18 @@ We assume you want to put your &kdevelop; copy into the <filename class="directo </member> <member> <prompt>~> </prompt> - <userinput>mkdir kde3src</userinput> + <userinput>mkdir trinitysrc</userinput> </member> <member> <prompt>~> </prompt> - <userinput>cd kde3src</userinput> + <userinput>cd trinitysrc</userinput> </member> <member> - <prompt>~/kde3src> </prompt> + <prompt>~/trinitysrc> </prompt> <userinput>svn co svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdevelop</userinput> </member> <member> - <prompt>~/kde3src> </prompt> + <prompt>~/trinitysrc> </prompt> <userinput>cd kdevelop</userinput> </member> </simplelist></informalexample> @@ -123,7 +123,7 @@ Now you may compile your &kdevelop; version as shown in the <link linkend="compi <tertiary>update</tertiary></indexterm> <para> -After you checked out (and successfully compiled) &kdevelop; from svn as shown above, you'll want to keep it up to date in order to get all the patches. Follow these steps. (We again assume you have put your &kdevelop; copy into the <filename class="directory">kde3src</filename> directory.) +After you checked out (and successfully compiled) &kdevelop; from svn as shown above, you'll want to keep it up to date in order to get all the patches. Follow these steps. (We again assume you have put your &kdevelop; copy into the <filename class="directory">trinitysrc</filename> directory.) </para> <para> Note the <command>up</command> (= <emphasis>update</emphasis>) command instead of the <command>co</command> (which stands for <emphasis>checkout</emphasis>). @@ -132,14 +132,14 @@ Note the <command>up</command> (= <emphasis>update</emphasis>) command instead o <informalexample><simplelist> <member> <prompt>~> </prompt> - <userinput>cd kde3src</userinput> + <userinput>cd trinitysrc</userinput> </member> <member> - <prompt>~/kde3src> </prompt> + <prompt>~/trinitysrc> </prompt> <userinput>cd kdevelop</userinput> </member> <member> - <prompt>~/kde3src> </prompt> + <prompt>~/trinitysrc> </prompt> <userinput>svn up</userinput> </member> </simplelist></informalexample> @@ -436,7 +436,7 @@ If you use the tcsh shell add the following lines: <secondary>&kdevelop;</secondary></indexterm> <note><para> -In the following discussion we assume that you have put your &kdevelop; sources in the <filename class="directory">~/kde3src/kdevelop</filename> directory. +In the following discussion we assume that you have put your &kdevelop; sources in the <filename class="directory">~/trinitysrc/kdevelop</filename> directory. </para></note> <sect3 id="compile-and-install-make-svn"> @@ -455,7 +455,7 @@ You must <emphasis>initialize the make system</emphasis> after a fresh checkout. </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>make -f admin/Makefile.common svn-clean</userinput> </member></simplelist></informalexample> <para> @@ -484,7 +484,7 @@ U /some_directory_path/Makefile.am or if you just did a full checkout, you must enter: </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>make -f Makefile.svn</userinput> </member></simplelist></informalexample> <para> @@ -515,8 +515,8 @@ If you want to keep track of what your &kdevelop; application does at run-time y </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> - <userinput>./configure --enable-debug=full --prefix=</userinput>(where-your-kde3-is) + <prompt>~/trinitysrc/kdevelop> </prompt> + <userinput>./configure --enable-debug=full --prefix=</userinput>(where-your-trinity-is) </member></simplelist></informalexample> </listitem> </varlistentry> @@ -529,8 +529,8 @@ running) release version suffices. <command>configure</command> defaults to this.</para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> - <userinput>./configure --prefix=</userinput>(where-your-kde3-is) + <prompt>~/trinitysrc/kdevelop> </prompt> + <userinput>./configure --prefix=</userinput>(where-your-trinity-is) </member></simplelist></informalexample> <note> @@ -538,7 +538,7 @@ this.</para> If you want to build your own <link linkend="make-api">API documentation</link> for &kdevelop; you must include yet another option in the <command>configure</command> command: </para> <informalexample><simplelist> - <member><prompt>~/kde3src/kdevelop> </prompt> + <member><prompt>~/trinitysrc/kdevelop> </prompt> <userinput>./configure --</userinput>(options-as-above) <userinput>\</userinput></member> <member><userinput>--with-kdelibsdoxy-dir=$KDEDIR/share/doc/HTML/en/kdelibs-apidocs</userinput></member> </simplelist></informalexample> </note> @@ -553,21 +553,21 @@ If you want to build your own <link linkend="make-api">API documentation</link> </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>make</userinput> </member></simplelist></informalexample> <para> suffices. If necessary, now gain root user rights using the command </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>su</userinput> </member></simplelist></informalexample> <para> and entering the root password. Then install the application: </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>make install</userinput> </member></simplelist></informalexample> <para> @@ -614,8 +614,8 @@ That's all. If you installed &kdevelop; in the default &kde; directory you may n By default <command>configure</command> prepares the IDE to be installed in the default &kde; directory. This is necessary because &kdevelop; assumes direct access to some tools and parts which reside there. If want to use your own installation directory, you must tell <command>configure</command> this by the <option>--prefix</option> option: </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> - <userinput>./configure --prefix=</userinput>(where-your-kde3-is) + <prompt>~/trinitysrc/kdevelop> </prompt> + <userinput>./configure --prefix=</userinput>(where-your-trinity-is) </member></simplelist></informalexample> <para> There is a caveat if you do so. You must provide a means for &kdevelop; to access the needed tools and parts in the &kde; directory when running. (You can still use the IDE without doing so, but with very restrained capabilities.) @@ -631,7 +631,7 @@ Call up a shell and have the following commands executed before you start &kdeve <informalexample><simplelist> <member> <prompt>~> </prompt> - <userinput>export KDEDIRS=/usr/local/kde:/opt/kde3</userinput> + <userinput>export KDEDIRS=/usr/local/kde:/opt/trinity</userinput> </member> <member> <prompt>~> </prompt> @@ -648,9 +648,9 @@ Call up a shell and have the following commands executed before you start &kdeve <note><simplelist> <member>The <envar>KDEDIRS</envar> environment variable must be set to the <emphasis>list of active &kde; directories</emphasis> in your system. We use</member> - <member><filename class="directory">/usr/local/kde</filename>:<filename class="directory">/opt/kde3</filename></member> + <member><filename class="directory">/usr/local/kde</filename>:<filename class="directory">/opt/trinity</filename></member> <member>as an example only.</member> - <member>The <filename class="directory">/usr/local/kde</filename> directory may for instance contain an incomplete &kde; version you compiled for debug purposes, and the <filename class="directory">/opt/kde3</filename> directory may in addition contain the standard &kde; version from your distribution that is used for everyday work.</member> + <member>The <filename class="directory">/usr/local/kde</filename> directory may for instance contain an incomplete &kde; version you compiled for debug purposes, and the <filename class="directory">/opt/trinity</filename> directory may in addition contain the standard &kde; version from your distribution that is used for everyday work.</member> </simplelist></note> <para> @@ -658,7 +658,7 @@ In a tcsh shell you must set the environment variables using: </para> <informalexample><simplelist><member> <prompt>~> </prompt> - <userinput>setenv KDEDIRS /usr/local/kde:/opt/kde3</userinput> + <userinput>setenv KDEDIRS /usr/local/kde:/opt/trinity</userinput> </member></simplelist></informalexample> <para> The <command>kbuildsycoca</command> command (<quote>build system control cache</quote>) looks around for libraries and caches their location and version, so that &kdevelop; can find them. The caveat is that it takes noticeable time—and it has to be run any time you call up the shell to start &kdevelop; from a non-default directory. You may want to put the above commands into a shell script to reduce the typing effort. @@ -707,7 +707,7 @@ Alas, this version is best used read-only over the internet. If you do not alway <informalexample><simplelist> <member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>./configure --</userinput>(options-as-usual)<userinput> \</userinput> </member> <member> @@ -719,7 +719,7 @@ Alas, this version is best used read-only over the internet. If you do not alway (<command>make</command> will replace the global <varname>$KDEDIR</varname> variable with the actual &kde; directory setting recorded therein.) Then issue a <command>make</command> command <link linkend="compile-and-install-make-basic">as usual</link>. After the &kdevelop; IDE has been built you have the option to build the API as well. For this you must issue </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>make apidocs</userinput> </member></simplelist></informalexample> @@ -728,7 +728,7 @@ This will build a <filename>Doxyfile</filename> in your &kdevelop; base director </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>su</userinput> </member></simplelist></informalexample> @@ -737,7 +737,7 @@ and entering the root password. Then install the API files: </para> <informalexample><simplelist><member> - <prompt>~/kde3src/kdevelop> </prompt> + <prompt>~/trinitysrc/kdevelop> </prompt> <userinput>make install-apidox</userinput> </member></simplelist></informalexample> diff --git a/doc/kdevelop/project-management.docbook b/doc/kdevelop/project-management.docbook index 38a3ff8d..eb0aebce 100644 --- a/doc/kdevelop/project-management.docbook +++ b/doc/kdevelop/project-management.docbook @@ -639,7 +639,7 @@ CXX = @CXX@ </programlisting> <programlisting> -prefix = /home/bernd/kde3 +prefix = /home/bernd/trinity INSTALL = /usr/bin/ginstall -c -p build_triplet = i686-pc-linux-gnu CXX = g++ diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_kmdi/README index 8085c7e7..28c9af22 100644 --- a/languages/cpp/app_templates/kscons_kmdi/README +++ b/languages/cpp/app_templates/kscons_kmdi/README @@ -12,7 +12,7 @@ for starting with this application template. * To configure the application run "scons configure" In some rare cases you may need to add flags: - scons configure qtincludes=/usr/include/qt3/include kdeincludes=/usr/lib/kde3/include + scons configure qtincludes=/usr/include/qt3/include kdeincludes=/usr/lib/trinity/include * After building, launch the application and test the dcop interface by using the command (search a bit) : diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README index 8085c7e7..28c9af22 100644 --- a/languages/cpp/app_templates/kscons_kxt/README +++ b/languages/cpp/app_templates/kscons_kxt/README @@ -12,7 +12,7 @@ for starting with this application template. * To configure the application run "scons configure" In some rare cases you may need to add flags: - scons configure qtincludes=/usr/include/qt3/include kdeincludes=/usr/lib/kde3/include + scons configure qtincludes=/usr/include/qt3/include kdeincludes=/usr/lib/trinity/include * After building, launch the application and test the dcop interface by using the command (search a bit) : diff --git a/languages/ruby/doc/qtruby.toc b/languages/ruby/doc/qtruby.toc index 85fc3836..92bf203e 100644 --- a/languages/ruby/doc/qtruby.toc +++ b/languages/ruby/doc/qtruby.toc @@ -5,5 +5,5 @@ <tocsect1 name="Qt Tutorial #1" url="tutorial/tutorial.html"></tocsect1> <tocsect1 name="Qt Tutorial #2" url="tutorial2/tutorial2.html"></tocsect1> <tocsect1 name="Qt Designer Tutorial" url="colortooltutorial/designer-manual-3.html"></tocsect1> -<tocsect1 name="KDE 3.0 Tutorial" url="kde3tutorial/index.html"></tocsect1> +<tocsect1 name="KDE 3.0 Tutorial" url="trinitytutorial/index.html"></tocsect1> </kdeveloptoc> diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 61e98409..51e288bd 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -203,7 +203,7 @@ void MakeActionFilter::test() "compiling", "g++", "mainwindowideal.cpp" ) << TestItem( // automake and libtool compiling *.c files "if /bin/sh ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces" - "-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT " + "-I../../lib/util -I/opt/trinity/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT " "-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings " "-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -g3 -fno-inline -Wformat-security -Wmissing-format-attribute -MT readtags.lo " "-MD -MP -MF \".deps/readtags.Tpo\" -c -o readtags.lo readtags.c; then mv -f \".deps/readtags.Tpo\" " @@ -212,7 +212,7 @@ void MakeActionFilter::test() << TestItem( "source='makewidget.cpp' object='makewidget.lo' libtool=yes depfile='.deps/makewidget.Plo' " "tmpdepfile='.deps/makewidget.TPlo' depmode=gcc3 /bin/sh ../../admin/depcomp /bin/sh ../../libtool --mode=compile " - "--tag=CXX g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces -I../../lib/util -I/opt/kde3/include " + "--tag=CXX g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces -I../../lib/util -I/opt/trinity/include " "-I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef " "-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE " "-Wcast-align -Wconversion -fno-builtin -g -O2 -g3 -O0 -fno-exceptions -fno-check-new -c -o makewidget.lo `test -f " @@ -232,21 +232,21 @@ void MakeActionFilter::test() "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo " - "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " + "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " "kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", "linking", "libtool", "libkfilereplacepart.la.closure") << TestItem( //libtool, linking 3 "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " - "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la -rpath /opt/kde3/lib/kde3 " - "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib -version-info 1:0:0 kfilereplacepart.lo " + "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la -rpath /opt/trinity/lib/trinity " + "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo " "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", "linking", "libtool", "libkfilereplacepart.la") << TestItem( //automake, builddir!=srcdir, libtool=no, compiling " g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project " - "-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include " + "-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/trinity/include -I/usr/lib/qt3/include -I/usr/X11R6/include " "-I../../quanta/dialogs -DTQT_THREAD_SUPPORT -D_REENTRANT -DKOMMANDER -DDESIGNER -DTQT_NO_SQL -DHAVE_KDE -Wnon-virtual-dtor " "-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE " "-Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -DKDE_NO_COMPAT -fno-exceptions -fno-check-new -fno-common -c -o project.o " @@ -262,10 +262,10 @@ void MakeActionFilter::test() "compiling", "dcopidl2cpp", "KDevAppFrontendIface.kidl" ) << TestItem( //install "/usr/bin/install -c -p -m 644 /home/andris/development/quanta/quanta/kommander/editor/kmdr-editor.desktop " - "/opt/kde3/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/kde3/share/applnk/Editors/kmdr-editor.desktop") + "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop") << TestItem( //libtool install "/bin/sh ../../libtool --silent --mode=install /usr/bin/install -c -p libkommanderwidgets.la " - "/opt/kde3/lib/libkommanderwidgets.la", "installing", "", "/opt/kde3/lib/libkommanderwidgets.la") + "/opt/trinity/lib/libkommanderwidgets.la", "installing", "", "/opt/trinity/lib/libkommanderwidgets.la") << TestItem( //libtool, automake 1.8 "if g++ -DHAVE_CONFIG_H -I. -I/home/andris/ " "-DBUILD_KAFKAPART -MT quanta_init.o -MD -MP -MF \".deps/quanta_init.Tpo\" -c -o quanta_init.o " |