diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-04 01:46:07 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-09 01:57:38 +0100 |
commit | 205b3397710e08554fe2be67dee5fa4876e8d234 (patch) | |
tree | 28a5fc9e5fb7519f0063310cf0f70f521244fdec /kio | |
parent | 03929452275f29cf2c2cb7b331be898838506e14 (diff) | |
download | tdelibs-205b3397710e08554fe2be67dee5fa4876e8d234.tar.gz tdelibs-205b3397710e08554fe2be67dee5fa4876e8d234.zip |
Fix references to user profile directory.
(cherry picked from commit e256298e9d1d5f3f7fb5660f0ca33ea8489acd08)
Diffstat (limited to 'kio')
-rw-r--r-- | kio/bookmarks/kbookmarkmanager.h | 4 | ||||
-rw-r--r-- | kio/kfile/kpropertiesdialog.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kservice.cpp | 2 | ||||
-rw-r--r-- | kio/kioexec/main.cpp | 2 | ||||
-rw-r--r-- | kio/tests/jobtest.cpp | 6 | ||||
-rw-r--r-- | kio/tests/kurifiltertest.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index 403a2e1b3..450ed22fe 100644 --- a/kio/bookmarks/kbookmarkmanager.h +++ b/kio/bookmarks/kbookmarkmanager.h @@ -64,7 +64,7 @@ protected: * called. * * @param bookmarksFile full path to the bookmarks file, - * Use ~/.kde/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks + * Use ~/.trinity/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks * * @param bImportDesktopFiles if true, and if the bookmarksFile * doesn't already exist, import bookmarks from desktop files @@ -200,7 +200,7 @@ public: * instantiate it before this method is ever called. * * @param bookmarksFile full path to the bookmarks file, - * Use ~/.kde/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks + * Use ~/.trinity/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks * * @param bImportDesktopFiles if true, and if the bookmarksFile * doesn't already exist, import bookmarks from desktop files diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index ac485eb93..3ce3f27cd 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -1398,7 +1398,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) assert( properties->item() ); assert( !properties->item()->url().isEmpty() ); - // Save the file where we can -> usually in ~/.kde/... + // Save the file where we can -> usually in ~/.trinity/... if (KBindingPropsPlugin::supports(properties->items()) && !m_sRelativePath.isEmpty()) { KURL newURL; diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index fb6deb27c..49641032b 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -198,7 +198,7 @@ KService::init( KDesktopFile *config ) m_strExec = config->readPathEntry( "Exec" ); if (kde4application && !m_strExec.startsWith("/")) { - m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec; + m_strExec = "KDEHOME=$HOME/.trinity XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec; } else if (config->readBoolEntry("X-KDE-SubstituteUID")) { int space = m_strExec.find(" "); if (space==-1) diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 88f7d3059..63f1164dd 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -108,7 +108,7 @@ KIOExec::KIOExec() TQString fileName = KIO::encodeFileName( url.fileName() ); if ( !suggestedFileName.isEmpty() ) fileName = suggestedFileName; - // Build the destination filename, in ~/.kde/cache-*/krun/ + // Build the destination filename, in ~/.trinity/cache-*/krun/ // Unlike KDE-1.1, we put the filename at the end so that the extension is kept // (Some programs rely on it) TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 04c33f7fd..fb2b001db 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) TQString JobTest::homeTmpDir() const { - return TQDir::homeDirPath() + "/.kde/jobtest/"; + return TQDir::homeDirPath() + "/.trinity/jobtest/"; } TQString JobTest::otherTmpDir() const @@ -89,12 +89,12 @@ TQString JobTest::otherTmpDir() const KURL JobTest::systemTmpDir() const { - return "system:/home/.kde/jobtest-system/"; + return "system:/home/.trinity/jobtest-system/"; } TQString JobTest::realSystemPath() const { - return TQDir::homeDirPath() + "/.kde/jobtest-system/"; + return TQDir::homeDirPath() + "/.trinity/jobtest-system/"; } void JobTest::setup() diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 8e4b023cb..c6c2a3e8e 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -297,10 +297,10 @@ int main(int argc, char **argv) filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE ); filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion - // Assume the default (~/.kde) if + // Assume the default (~/.trinity) if if (kdehome.isEmpty()) { - kdehome += "$HOME/.kde"; + kdehome += "$HOME/.trinity"; setenv("KDEHOME", kdehome.data(), 0); } |