diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-04 01:46:07 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-04 01:46:07 -0500 |
commit | e256298e9d1d5f3f7fb5660f0ca33ea8489acd08 (patch) | |
tree | c1cb331fe9ebe18846c72c565342b82ce824877d /kio | |
parent | 55c0d54a9863b438be2949a4629ec3fb0a307fe4 (diff) | |
download | tdelibs-e256298e9d1d5f3f7fb5660f0ca33ea8489acd08.tar.gz tdelibs-e256298e9d1d5f3f7fb5660f0ca33ea8489acd08.zip |
Fix references to user profile directory.
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 | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index f2d4021f7..d076eefc7 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 30d6e0637..8d76b99dd 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 28ee1b91e..6dfd5a853 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 = "TDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share TDEDIRS=/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 = "TDEHOME=$HOME/.trinity XDG_DATA_DIRS=/usr/share TDEDIRS=/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-TDE-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 3ed748d90..463c464d3 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 a1ebf2e46..7f448c541 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -155,7 +155,7 @@ int main(int argc, char **argv) { // Ensure that user configuration doesn't change the results of those tests // TDEHOME needs to be writable though, for a ksycoca database - setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true ); setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KAboutData aboutData(appName, programName, version, description); @@ -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 (tdehome.isEmpty()) { - tdehome += "$HOME/.kde"; + tdehome += "$HOME/.trinity"; setenv("TDEHOME", tdehome.data(), 0); } |