From 60254156c26021d9ed06e7b602c9b5770ea8f34c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: [PATCH] Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- IconThemes/mono/scalable/actions/kde3.svgz | Bin 2322 -> 2325 bytes doc/kmouth/kmouthcpref.eps | 2 +- doc/kmouth/kmouthctts.eps | 2 +- doc/kmouth/kmouthcwcp.eps | 2 +- doc/kmouth/kmouthedit.eps | 2 +- doc/kmouth/kmouthmain.eps | 2 +- doc/kmouth/kmouthwizard.eps | 2 +- doc/kttsd/index.docbook | 2 +- kmag/INSTALL | 2 +- kmousetool/README | 2 +- ksayit/Freeverb_plugin/Makefile.am | 2 +- kttsd/ChangeLog | 6 +-- kttsd/clean_obsolete.sh | 26 ++++----- kttsd/debian/kttsd-gstreamer.install | 4 +- kttsd/debian/kttsd.install | 60 ++++++++++----------- kttsd/kcmkttsmgr/selectevent.cpp | 2 +- kttsd/kcmkttsmgr/selectevent.h | 2 +- 17 files changed, 60 insertions(+), 60 deletions(-) diff --git a/IconThemes/mono/scalable/actions/kde3.svgz b/IconThemes/mono/scalable/actions/kde3.svgz index 5724e8336c9b91be72f1a1139b38f3c9e0add1dc..32f36963b6082be691bf34610ec5eb94a60dbec6 100644 GIT binary patch delta 26 hcmbOvG*w7YzMF$1W7ir-2Ii8Y%)HE!%8h(1oB(Vc2nYZG delta 23 ecmbO#G)ah0zMF$1W7ir-2IlOPRO5|;ESvyPWCmOS diff --git a/doc/kmouth/kmouthcpref.eps b/doc/kmouth/kmouthcpref.eps index 69d8d47..f6e86d2 100644 --- a/doc/kmouth/kmouthcpref.eps +++ b/doc/kmouth/kmouthcpref.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner -%%Title: /local/src/kde32/kdeaccessibility/doc/kmouth/kmouthcpref.eps +%%Title: /local/src/trinity2/kdeaccessibility/doc/kmouth/kmouthcpref.eps %%CreationDate: Sun May 30 14:52:34 2004 %%DocumentData: Clean7Bit %%LanguageLevel: 2 diff --git a/doc/kmouth/kmouthctts.eps b/doc/kmouth/kmouthctts.eps index 726dfc4..78dd3ba 100644 --- a/doc/kmouth/kmouthctts.eps +++ b/doc/kmouth/kmouthctts.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner -%%Title: /local/src/kde32/kdeaccessibility/doc/kmouth/kmouthctts.eps +%%Title: /local/src/trinity2/kdeaccessibility/doc/kmouth/kmouthctts.eps %%CreationDate: Sun May 30 14:52:20 2004 %%DocumentData: Clean7Bit %%LanguageLevel: 2 diff --git a/doc/kmouth/kmouthcwcp.eps b/doc/kmouth/kmouthcwcp.eps index db0e111..4a18a90 100644 --- a/doc/kmouth/kmouthcwcp.eps +++ b/doc/kmouth/kmouthcwcp.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner -%%Title: /local/src/kde32/kdeaccessibility/doc/kmouth/kmouthcwcp.eps +%%Title: /local/src/trinity2/kdeaccessibility/doc/kmouth/kmouthcwcp.eps %%CreationDate: Sun May 30 14:52:07 2004 %%DocumentData: Clean7Bit %%LanguageLevel: 2 diff --git a/doc/kmouth/kmouthedit.eps b/doc/kmouth/kmouthedit.eps index ef2e964..4ce7990 100644 --- a/doc/kmouth/kmouthedit.eps +++ b/doc/kmouth/kmouthedit.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner -%%Title: /local/src/kde32/kdeaccessibility/doc/kmouth/kmouthedit.eps +%%Title: /local/src/trinity2/kdeaccessibility/doc/kmouth/kmouthedit.eps %%CreationDate: Sun May 30 14:51:52 2004 %%DocumentData: Clean7Bit %%LanguageLevel: 2 diff --git a/doc/kmouth/kmouthmain.eps b/doc/kmouth/kmouthmain.eps index 5eb9f17..a31eafe 100644 --- a/doc/kmouth/kmouthmain.eps +++ b/doc/kmouth/kmouthmain.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner -%%Title: /local/src/kde32/kdeaccessibility/doc/kmouth/kmouthmain.eps +%%Title: /local/src/trinity2/kdeaccessibility/doc/kmouth/kmouthmain.eps %%CreationDate: Sun May 30 15:13:10 2004 %%DocumentData: Clean7Bit %%LanguageLevel: 2 diff --git a/doc/kmouth/kmouthwizard.eps b/doc/kmouth/kmouthwizard.eps index 5983d91..c97f381 100644 --- a/doc/kmouth/kmouthwizard.eps +++ b/doc/kmouth/kmouthwizard.eps @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: GIMP PostScript file plugin V 1.15 by Peter Kirchgessner -%%Title: /local/src/kde32/kdeaccessibility/doc/kmouth/kmouthwizard.eps +%%Title: /local/src/trinity2/kdeaccessibility/doc/kmouth/kmouthwizard.eps %%CreationDate: Sun May 30 14:53:50 2004 %%DocumentData: Clean7Bit %%LanguageLevel: 2 diff --git a/doc/kttsd/index.docbook b/doc/kttsd/index.docbook index a533d52..375bb98 100644 --- a/doc/kttsd/index.docbook +++ b/doc/kttsd/index.docbook @@ -2322,7 +2322,7 @@ not build" column shows the configure command to not build the plugin: By default, the commands above will install &ktts; to -/opt/kde3. If this folder is not in your +/opt/trinity. If this folder is not in your $KDEDIRS path, you may need to add a --prefix=target option. For example, diff --git a/kmag/INSTALL b/kmag/INSTALL index cde242c..377d024 100644 --- a/kmag/INSTALL +++ b/kmag/INSTALL @@ -11,7 +11,7 @@ the directory. If you want to compile the program for KDE3, run ./configure with options similar to these: ---prefix=/opt/kde3 --enable-mt --with-qt-dir=/usr/lib/qt3 +--prefix=/opt/trinity --enable-mt --with-qt-dir=/usr/lib/qt3 Then run make and make install (as root). diff --git a/kmousetool/README b/kmousetool/README index c1863ac..af0446a 100644 --- a/kmousetool/README +++ b/kmousetool/README @@ -18,7 +18,7 @@ How To Use MouseTool 4 KMouseTool 1.1 supports strokes. When you enable strokes, a slow move to the right and back, followed by a pause, will generate a right-click. A slow move left and back will generate a double click. (Strokes are specified in - ~/.kde3/share/config/kmousetool_strokes.txt. This file is generated by KMouseTool + ~/.trinity/share/config/kmousetool_strokes.txt. This file is generated by KMouseTool the first time it is run, but can be modified afterwards.) MouseTool Options: diff --git a/ksayit/Freeverb_plugin/Makefile.am b/ksayit/Freeverb_plugin/Makefile.am index d226444..5da0f3b 100644 --- a/ksayit/Freeverb_plugin/Makefile.am +++ b/ksayit/Freeverb_plugin/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes) -I$(kde_includes)/kde -I$( METASOURCES = AUTO kde_servicetypes_DATA = ksayit_libFreeverb_service.desktop kde_services_DATA = ksayit_libFreeverb.desktop -fxpluginsdir = $(kde_libraries)/kde3 +fxpluginsdir = $(kde_libraries)/trinity fxplugins_LTLIBRARIES = libFreeverb_plugin.la libFreeverb_plugin_la_LDFLAGS = -avoid-version -module -no-undefined \ $(all_libraries) diff --git a/kttsd/ChangeLog b/kttsd/ChangeLog index 549f975..6e675f1 100644 --- a/kttsd/ChangeLog +++ b/kttsd/ChangeLog @@ -437,7 +437,7 @@ flite.desktop -> kttsd_fliteplugin.desktop epos-kttsdplugin.desktop -> kttsd_eposplugin.desktop freetts.desktop -> kttsd_freettsplugin.desktop - In $KDEDIR/lib/kde3/: + In $KDEDIR/lib/trinity/: libfestivalplugin -> libkttsd_festivalplugin libfestivalintplugin -> libkttsd_festivalintplugin libcommandplugin -> libkttsd_commandplugin @@ -482,8 +482,8 @@ * Rename Hadifax to Hadifix. NOTE: After rebuilding and installing, you will want to delete the following files: - $KDEDIR/lib/kde3/libhadifaxplugin.la - $KDEDIR/lib/kde3/libhadifaxplugin.so + $KDEDIR/lib/trinity/libhadifaxplugin.la + $KDEDIR/lib/trinity/libhadifaxplugin.so $KDEDIR/share/services/hadifax.desktop 2004-09-02 Paul Giannaros diff --git a/kttsd/clean_obsolete.sh b/kttsd/clean_obsolete.sh index 17e8c26..dabc5a5 100755 --- a/kttsd/clean_obsolete.sh +++ b/kttsd/clean_obsolete.sh @@ -32,7 +32,7 @@ set -x # libktts removed. See kdeaccessibility/kttsd/kcmkttsmgr/Makefile.am # for example how to build without it. # on or about 20 Dec 2004. -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libktts +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libktts $LIBTOOL --mode=uninstall $PREFIX/lib/libktts # ServiceType kttsd.desktop renamed to kttsd_synthplugin.desktop, @@ -43,14 +43,14 @@ rm -f $PREFIX/share/servicetypes/kttsd.desktop # kcm_kttsmgr removed. Use kcm_kttsd instead. # Change made on or about 18 Dec 2004. -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/kcm_kttsmgr +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/kcm_kttsmgr rm -f $PREFIX/share/applnk/Settings/Accessibility/kcmkttsmgr.desktop rm -f $PREFIX/share/applications/kde/kcmkttsmgr.desktop # Renamed libkttsjobmgr to libkttsjobmgrpart per kdelibs/NAMING convention # on or about 19 Oct 2004: -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libkttsjobmgr +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libkttsjobmgr # The following installed files were renamed # on or about 19 Oct 2004: @@ -62,7 +62,7 @@ $LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libkttsjobmgr #    flite.desktop            -> kttsd_fliteplugin.desktop #    epos-kttsdplugin.desktop -> kttsd_eposplugin.desktop #    freetts.desktop          -> kttsd_freettsplugin.desktop -#  In $KDEDIR/lib/kde3/: +#  In $KDEDIR/lib/trinity/: # libfestivalplugin -> libkttsd_festivalplugin #    libfestivalintplugin     -> libkttsd_festivalintplugin #    libcommandplugin         -> libkttsd_commandplugin @@ -79,13 +79,13 @@ rm -f $PREFIX/share/services/flite.desktop rm -f $PREFIX/share/services/epos-kttsdplugin.desktop rm -f $PREFIX/share/services/freetts.desktop -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libfestivalplugin -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libfestivalintplugin -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libcommandplugin -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libhadifixplugin -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libfliteplugin -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libeposkttsdplugin -$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/libfreettsplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libfestivalplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libfestivalintplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libcommandplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libhadifixplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libfliteplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libeposkttsdplugin +$LIBTOOL --mode=uninstall $PREFIX/lib/trinity/libfreettsplugin # The following library was changed from unversioned to versioned # on or about 13 Oct 2004, @@ -96,10 +96,10 @@ $LIBTOOL --mode=uninstall $PREFIX/lib/libktts # on or about 4 Sep 2004. rm -f $PREFIX/share/services/hadifax.desktop -$LIBTOOL --mode=uninstall /lib/kde3/libhadifaxplugin +$LIBTOOL --mode=uninstall /lib/trinity/libhadifaxplugin # Clean up the library cache. $LIBTOOL --mode=finish -n $PREFIX/lib -$LIBTOOL --mode=finish -n $PREFIX/lib/kde3/ +$LIBTOOL --mode=finish -n $PREFIX/lib/trinity/ diff --git a/kttsd/debian/kttsd-gstreamer.install b/kttsd/debian/kttsd-gstreamer.install index dbe0185..8265406 100644 --- a/kttsd/debian/kttsd-gstreamer.install +++ b/kttsd/debian/kttsd-gstreamer.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/kde3/libkttsd_gstplugin.so -debian/tmp/usr/lib/kde3/libkttsd_gstplugin.la +debian/tmp/usr/lib/trinity/libkttsd_gstplugin.so +debian/tmp/usr/lib/trinity/libkttsd_gstplugin.la debian/tmp/usr/share/services/kttsd_gstplugin.desktop diff --git a/kttsd/debian/kttsd.install b/kttsd/debian/kttsd.install index 1ed977e..ba42b2a 100644 --- a/kttsd/debian/kttsd.install +++ b/kttsd/debian/kttsd.install @@ -3,37 +3,37 @@ debian/tmp/usr/bin/kttsmgr debian/tmp/usr/lib/libkttsd.so.1.0.0 debian/tmp/usr/lib/libkttsd.so.1 debian/tmp/usr/lib/libkttsd.la -debian/tmp/usr/lib/kde3/libkttsd_festivalintplugin.so -debian/tmp/usr/lib/kde3/libkttsd_festivalintplugin.la -debian/tmp/usr/lib/kde3/libkttsd_commandplugin.so -debian/tmp/usr/lib/kde3/libkttsd_commandplugin.la -debian/tmp/usr/lib/kde3/libkttsd_hadifixplugin.so -debian/tmp/usr/lib/kde3/libkttsd_hadifixplugin.la -debian/tmp/usr/lib/kde3/libkttsd_fliteplugin.so -debian/tmp/usr/lib/kde3/libkttsd_fliteplugin.la -debian/tmp/usr/lib/kde3/libkttsd_eposplugin.so -debian/tmp/usr/lib/kde3/libkttsd_eposplugin.la -debian/tmp/usr/lib/kde3/libkttsd_freettsplugin.so -debian/tmp/usr/lib/kde3/libkttsd_freettsplugin.la -debian/tmp/usr/lib/kde3/libkttsd_artsplugin.so -debian/tmp/usr/lib/kde3/libkttsd_artsplugin.la -debian/tmp/usr/lib/kde3/libkttsd_stringreplacerplugin.so -debian/tmp/usr/lib/kde3/libkttsd_stringreplacerplugin.la -debian/tmp/usr/lib/kde3/libkttsd_sbdplugin.so -debian/tmp/usr/lib/kde3/libkttsd_sbdplugin.la -debian/tmp/usr/lib/kde3/libkttsd_talkerchooserplugin.so -debian/tmp/usr/lib/kde3/libkttsd_talkerchooserplugin.la -debian/tmp/usr/lib/kde3/libkttsd_xmltransformerplugin.so -debian/tmp/usr/lib/kde3/libkttsd_xmltransformerplugin.la -debian/tmp/usr/lib/kde3/libkttsjobmgrpart.so -debian/tmp/usr/lib/kde3/libkttsjobmgrpart.la -debian/tmp/usr/lib/kde3/kcm_kttsd.so -debian/tmp/usr/lib/kde3/kcm_kttsd.la -debian/tmp/usr/lib/kde3/ktexteditor_kttsd.la -debian/tmp/usr/lib/kde3/ktexteditor_kttsd.so +debian/tmp/usr/lib/trinity/libkttsd_festivalintplugin.so +debian/tmp/usr/lib/trinity/libkttsd_festivalintplugin.la +debian/tmp/usr/lib/trinity/libkttsd_commandplugin.so +debian/tmp/usr/lib/trinity/libkttsd_commandplugin.la +debian/tmp/usr/lib/trinity/libkttsd_hadifixplugin.so +debian/tmp/usr/lib/trinity/libkttsd_hadifixplugin.la +debian/tmp/usr/lib/trinity/libkttsd_fliteplugin.so +debian/tmp/usr/lib/trinity/libkttsd_fliteplugin.la +debian/tmp/usr/lib/trinity/libkttsd_eposplugin.so +debian/tmp/usr/lib/trinity/libkttsd_eposplugin.la +debian/tmp/usr/lib/trinity/libkttsd_freettsplugin.so +debian/tmp/usr/lib/trinity/libkttsd_freettsplugin.la +debian/tmp/usr/lib/trinity/libkttsd_artsplugin.so +debian/tmp/usr/lib/trinity/libkttsd_artsplugin.la +debian/tmp/usr/lib/trinity/libkttsd_stringreplacerplugin.so +debian/tmp/usr/lib/trinity/libkttsd_stringreplacerplugin.la +debian/tmp/usr/lib/trinity/libkttsd_sbdplugin.so +debian/tmp/usr/lib/trinity/libkttsd_sbdplugin.la +debian/tmp/usr/lib/trinity/libkttsd_talkerchooserplugin.so +debian/tmp/usr/lib/trinity/libkttsd_talkerchooserplugin.la +debian/tmp/usr/lib/trinity/libkttsd_xmltransformerplugin.so +debian/tmp/usr/lib/trinity/libkttsd_xmltransformerplugin.la +debian/tmp/usr/lib/trinity/libkttsjobmgrpart.so +debian/tmp/usr/lib/trinity/libkttsjobmgrpart.la +debian/tmp/usr/lib/trinity/kcm_kttsd.so +debian/tmp/usr/lib/trinity/kcm_kttsd.la +debian/tmp/usr/lib/trinity/ktexteditor_kttsd.la +debian/tmp/usr/lib/trinity/ktexteditor_kttsd.so -debian/tmp/usr/lib/kde3/libkhtmlkttsdplugin.la -debian/tmp/usr/lib/kde3/libkhtmlkttsdplugin.so +debian/tmp/usr/lib/trinity/libkhtmlkttsdplugin.la +debian/tmp/usr/lib/trinity/libkhtmlkttsdplugin.so debian/tmp/usr/share/servicetypes/kttsd_synthplugin.desktop debian/tmp/usr/share/servicetypes/kttsd_audioplugin.desktop diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 4c5c1c1..2deeb6d 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -133,7 +133,7 @@ TQString SelectEvent::getEvent() } // returns e.g. "kwin/eventsrc" from a given path -// "/opt/kde3/share/apps/kwin/eventsrc" +// "/opt/trinity/share/apps/kwin/eventsrc" TQString SelectEvent::makeRelative( const TQString& fullPath ) { int slash = fullPath.findRev( '/' ) - 1; diff --git a/kttsd/kcmkttsmgr/selectevent.h b/kttsd/kcmkttsmgr/selectevent.h index 720efda..0e00935 100644 --- a/kttsd/kcmkttsmgr/selectevent.h +++ b/kttsd/kcmkttsmgr/selectevent.h @@ -61,7 +61,7 @@ private slots: private: // returns e.g. "kwin/eventsrc" from a given path - // "/opt/kde3/share/apps/kwin/eventsrc" + // "/opt/trinity/share/apps/kwin/eventsrc" TQString makeRelative( const TQString& fullPath ); TQStringList m_eventSrcNames;