Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kile@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 24 insertions, 24 deletions

diff --git a/README b/README
index d5416f6..a1e3629 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ All specified versions are minimum versions except for KDE and QT.
 
 - Extract the source code with `tar xjf kile-2.0.x.tar.bz2`
 - `cd kile-2.0.x`
-- ./configure --prefix=path_to_KDE3 (/usr or /opt/kde3 generally) --with-qt-dir=path_to_QT3 library (/usr/lib/qt3 generally)
+- ./configure --prefix=path_to_KDE3 (/usr or /opt/trinity generally) --with-qt-dir=path_to_QT3 library (/usr/lib/qt3 generally)
 	-- If you don't know what the path to KDE3 on your system is, you can use output of `kde-config --prefix`.
 	-- Or you can choose `--prefix=$HOME/.kde` to not mess up with your distribution's package management system.
 - Type `make` to compile the package.
diff --git a/acinclude.m4 b/acinclude.m4
index 1312134..396edf1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -479,14 +479,14 @@ if test "$1" = "default"; then
     if test "$kde_qtver" = "2"; then
       kde_moduledir='\${libdir}/kde2'
     else
-      kde_moduledir='\${libdir}/kde3'
+      kde_moduledir='\${libdir}/trinity'
     fi
   fi
   if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
+    kde_styledir='\${libdir}/trinity/plugins/styles'
   fi
   if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
 
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
     if test -n "$KDEDIRS"; then
        kde_save_IFS=$IFS
@@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
-        kde32ornewer=1
-        kde33ornewer=1
+        trinity2ornewer=1
+        trinity3ornewer=1
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-            kde33ornewer=
+            trinity2ornewer=
+            trinity3ornewer=
         else
             if test "$kde_qtver" = "3"; then
               if test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
+                trinity2ornewer=
               fi
               if test "$kde_qtsubver" -le 2; then
-                kde33ornewer=
+                trinity3ornewer=
               fi
               if test "$KDECONFIG" != "compiled"; then
                 if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-                  kde33ornewer=
+                  trinity3ornewer=
                 fi
               fi
             fi
         fi
 
-        if test -n "$kde32ornewer"; then
+        if test -n "$trinity2ornewer"; then
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
-        if test -n "$kde33ornewer"; then
+        if test -n "$trinity3ornewer"; then
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
             AC_SUBST(MAKEKDEWIDGETS)
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
+        if test -n "$trinity2ornewer"; then
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
             AC_SUBST(KCONFIG_COMPILER)
@@ -1813,7 +1813,7 @@ fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1825,7 +1825,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1833,7 +1833,7 @@ ac_kde_libraries="$kde_libdir"
 
 kde_widgetdir=NO
 dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
 AC_MSG_ERROR([
@@ -1841,14 +1841,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
 fi
 
 
diff --git a/src/Kile.kdevelop b/src/Kile.kdevelop
index 361c71f..30a878b 100644
--- a/src/Kile.kdevelop
+++ b/src/Kile.kdevelop
@@ -140,7 +140,7 @@
     </run>
     <configurations>
       <default>
-        <configargs>--enable-debug=full --prefix=/opt/kde3</configargs>
+        <configargs>--enable-debug=full --prefix=/opt/trinity</configargs>
         <builddir>build-kde-3.4</builddir>
         <topsourcedir>..</topsourcedir>
         <cppflags/>
diff --git a/src/kile.kdevprj b/src/kile.kdevprj
index c9c0ff9..41daf81 100644
--- a/src/kile.kdevprj
+++ b/src/kile.kdevprj
@@ -28,7 +28,7 @@ ldflags=\s           \s
 [General]
 AMChanged=false
 author=Jeroen Wijnhout
-configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/kde3 --with-qt-dir=/usr/lib/qt3\s
+configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/trinity --with-qt-dir=/usr/lib/qt3\s
 [email protected]
 kdevprj_version=1.3
 lfv_open_groups=GNU,Headers,Sources,User Interface
diff --git a/translations/ca/messages/kile.po b/translations/ca/messages/kile.po
index 9022efe..0c29b50 100644
--- a/translations/ca/messages/kile.po
+++ b/translations/ca/messages/kile.po
@@ -10,7 +10,7 @@
 #
 # Version 0.3. 2002-5-30 First version of Kile
 # Maybe there's some errors, I could not test the file
-# because I don't have kde3.
+# because I don't have trinity.
 # if you find some error, tell me it
 #
 # Version 0.2 . 2002-1-28 Version revised with some comments