diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc index d633935c2..34289f3e0 100644 --- a/chalk/ui/kis_custom_brush.cc +++ b/chalk/ui/kis_custom_brush.cc @@ -80,7 +80,7 @@ void KisCustomBrush::slotExport() { } void KisCustomBrush::slotAddPredefined() { - // Save in the directory that is likely to be: ~/.kde/share/apps/chalk/brushes + // Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/brushes // a unique file with this brushname TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/brushes"); TQString extension; diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index ac762953e..f12b93008 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -119,7 +119,7 @@ void KisCustomPalette::slotAddPredefined() { m_palette->setName(palettename->text()); if (!m_editMode) { - // Save in the directory that is likely to be: ~/.kde/share/apps/chalk/palettes + // Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/palettes // a unique file with this palettename TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/palettes"); TQString extension; diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc index 4f0821ed7..538ec9c6a 100644 --- a/chalk/ui/kis_custom_pattern.cc +++ b/chalk/ui/kis_custom_pattern.cc @@ -78,7 +78,7 @@ void KisCustomPattern::slotAddPredefined() { if (!m_pattern) return; - // Save in the directory that is likely to be: ~/.kde/share/apps/chalk/patterns + // Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/patterns // a unique file with this pattern name TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/patterns"); TQString extension; diff --git a/doc/kspread/faq.docbook b/doc/kspread/faq.docbook index c8687449a..83ae158fb 100644 --- a/doc/kspread/faq.docbook +++ b/doc/kspread/faq.docbook @@ -25,7 +25,7 @@ Where are the templates stored? As .kst files under -~/.kde/share/apps/kspread/templates/. +~/.trinity/share/apps/kspread/templates/. diff --git a/kexi/plugins/scripting/scripts/copycenter/readme.html b/kexi/plugins/scripting/scripts/copycenter/readme.html index 2aff6152b..09deb0284 100644 --- a/kexi/plugins/scripting/scripts/copycenter/readme.html +++ b/kexi/plugins/scripting/scripts/copycenter/readme.html @@ -9,7 +9,7 @@ plugin-architecture allows transparent copies between different backends.

diff --git a/kexi/tools/add_column/kexi_add_column_gui b/kexi/tools/add_column/kexi_add_column_gui index 211a2fe94..da163d969 100644 --- a/kexi/tools/add_column/kexi_add_column_gui +++ b/kexi/tools/add_column/kexi_add_column_gui @@ -21,7 +21,7 @@ basedir=`dirname "$0"` setup_messages { - lang=`grep Language= ~/.kde/share/config/kdeglobals | head -n 1 | \ + lang=`grep Language= ~/.trinity/share/config/kdeglobals | head -n 1 | \ sed -e 's/Language=\(.*\):.*/\1/'` if [ -z "$lang" ] ; then lang="en" ; fi diff --git a/kexi/tools/delete_column/kexi_delete_column_gui b/kexi/tools/delete_column/kexi_delete_column_gui index 545c9b5e1..73cd1d40a 100755 --- a/kexi/tools/delete_column/kexi_delete_column_gui +++ b/kexi/tools/delete_column/kexi_delete_column_gui @@ -21,7 +21,7 @@ basedir=`dirname "$0"` setup_messages { - lang=`grep Language= ~/.kde/share/config/kdeglobals | head -n 1 | \ + lang=`grep Language= ~/.trinity/share/config/kdeglobals | head -n 1 | \ sed -e 's/Language=\(.*\):.*/\1/'` if [ -z "$lang" ] ; then lang="en" ; fi diff --git a/kpresenter/scripts/mkstandalone.sh b/kpresenter/scripts/mkstandalone.sh index b362ee36c..fa99fe69d 100755 --- a/kpresenter/scripts/mkstandalone.sh +++ b/kpresenter/scripts/mkstandalone.sh @@ -25,8 +25,8 @@ else cp -r $TDEDIR/share/apps/kstyle $out/share/apps/ mkdir -p $out/share/config cp $TDEDIR/share/config/kdebug.areas $out/share/config/ - cp ~/.kde/share/config/kdeglobals $out/share/config/ - cp ~/.kde/share/config/kpresenterrc $out/share/config/ + cp ~/.trinity/share/config/kdeglobals $out/share/config/ + cp ~/.trinity/share/config/kpresenterrc $out/share/config/ ### cp $TDEDIR/share/icons $out/share/ cp -r $TDEDIR/share/toolbar $out/share/ mkdir -p $out/share/servicetypes @@ -72,17 +72,17 @@ else cp $TDEDIR/bin/kpresenter $out/bin/ cp $TDEDIR/bin/dcopserver $out/bin/ # Take kded as well - we could copy the ksycoca file but we would have - # to install it in ~/.kde ... + # to install it in ~/.trinity ... cp $TDEDIR/bin/kded $out/bin/ ########### Startup script echo '#!/bin/sh' > $out/go.sh echo 'export TDEDIR=`pwd`' >> $out/go.sh echo 'export LD_LIBRARY_PATH=$TDEDIR/lib' >> $out/go.sh - echo 'mkdir -p ~/.kde 2>/dev/null' >> $out/go.sh - echo 'mkdir -p ~/.kde/share 2>/dev/null' >> $out/go.sh - echo 'mkdir -p ~/.kde/share/config 2>/dev/null' >> $out/go.sh - echo 'cp share/config/* ~/.kde/share/config' >> $out/go.sh + echo 'mkdir -p ~/.trinity 2>/dev/null' >> $out/go.sh + echo 'mkdir -p ~/.trinity/share 2>/dev/null' >> $out/go.sh + echo 'mkdir -p ~/.trinity/share/config 2>/dev/null' >> $out/go.sh + echo 'cp share/config/* ~/.trinity/share/config' >> $out/go.sh echo 'bin/dcopserver 2>/dev/null' >> $out/go.sh echo 'sleep 1 ; bin/kded 2>/dev/null' >> $out/go.sh echo 'sleep 1 ; bin/kpresenter $* 1>/dev/null 2>kpresenter.out &' >> $out/go.sh diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index a54cfc257..6abf80837 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -2231,8 +2231,8 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance ) // The old way is kept as fallback for compatibility, but in theory this is really never used anymore. // Try by path first, so that we find the global one (which has the native mimetype) - // even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it. - // If he created it under ~/.kde/share/applnk/Office/ then no problem anyway. + // even if the user created a kword.desktop in ~/.trinity/share/applnk or any subdir of it. + // If he created it under ~/.trinity/share/applnk/Office/ then no problem anyway. service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").arg(instname) ); } if ( !service )