diff options
| -rw-r--r-- | kaddressbook/kcmconfigs/kcmkabcustomfields.cpp | 2 | ||||
| -rw-r--r-- | kmail/ChangeLog | 2 | ||||
| -rw-r--r-- | knotes/ChangeLog | 2 | ||||
| -rw-r--r-- | ktnef/gui/ktnefmain.cpp | 8 | ||||
| -rw-r--r-- | libtdepim/tests/testdistrlist.cpp | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index e397f01f6..8cc428aa0 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -72,6 +72,6 @@ TQString KCMKabCustomFields::applicationName() TQString KCMKabCustomFields::kabLocalDir() { TQStringList kabdirs = locateLocal("data", "kaddressbook/"); - return kabdirs.grep( TQRegExp( "^"+KGlobal::dirs()->localkdedir() ) ).first(); + return kabdirs.grep( TQRegExp( "^"+KGlobal::dirs()->localtdedir() ) ).first(); } diff --git a/kmail/ChangeLog b/kmail/ChangeLog index a744dcf7b..8c7c6664c 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -352,7 +352,7 @@ please visit http://webcvs.kde.org 1998-11-10 Harri Porten <porten@kde.org> - * Removed hardcoded localkdedir() + * Removed hardcoded localtdedir() * Let KApplication() do the job of creating ~/.kde/share/config diff --git a/knotes/ChangeLog b/knotes/ChangeLog index 82d42d7f4..41ff85579 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -898,7 +898,7 @@ Tue Feb 16 09:34:25 1999 David Faure <faure@kde.org> * renaming: missing slash broke renaming. * set atomic flag in cleanup(). Hope to have avoided occasional crash leading to data loss. - * Replaced ~/.kde with KApplication::localkdedir() + * Replaced ~/.kde with KApplication::localtdedir() * option menu: disabled illogical switch between "3D frame" and "no frame" label. It is a checkable entry! diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 923257773..b16b2029c 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -70,7 +70,7 @@ KTNEFMain::KTNEFMain(TQWidget *parent, const char *name) lastdir_ = defaultdir_; // create personale temo extract dir - KStandardDirs::makeDir(KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp"); + KStandardDirs::makeDir(KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp"); resize(430,350); setAutoSaveSettings( "MainWindow" ); @@ -189,7 +189,7 @@ void KTNEFMain::viewFile() TQString KTNEFMain::extractTemp(KTNEFAttach *att) { - TQString dir = KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/"; + TQString dir = KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/"; parser_->extractFileTo(att->name(), dir); dir.append(att->name()); return dir; @@ -285,7 +285,7 @@ void KTNEFMain::enableSingleAction(bool on) void KTNEFMain::cleanup() { - TQDir d(KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/"); + TQDir d(KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/"); const TQFileInfoList *list = d.entryInfoList(TQDir::Files|TQDir::Hidden,TQDir::Unsorted); TQFileInfoListIterator it(*list); for (;it.current();++it) @@ -380,7 +380,7 @@ void KTNEFMain::slotShowMessageText() { TQString rtf = parser_->message()->rtfString(); qDebug( "%s", rtf.latin1() ); - KTempFile tmpFile( KGlobal::dirs()->localkdedir() + "/share/apps/ktnef/tmp/", "rtf"); + KTempFile tmpFile( KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/", "rtf"); *( tmpFile.textStream() ) << rtf; tmpFile.close(); diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index f66647011..c171c6cec 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/libtdepim/tests/testdistrlist.cpp @@ -150,11 +150,11 @@ void TestDistrList::cleanup() ab->clear(); KABC::StdAddressBook::close(); - TQString kdehome = TQFile::decodeName( getenv("TDEHOME") ); - KURL urlkdehome; urlkdehome.setPath( kdehome ); + TQString tdehome = TQFile::decodeName( getenv("TDEHOME") ); + KURL urltdehome; urltdehome.setPath( tdehome ); // don't use KIO::NetAccess here since it needs X - // KIO::NetAccess::del( urlkdehome, 0 )i; - assert( removeDirAndContentsRecursively( kdehome ) ); + // KIO::NetAccess::del( urltdehome, 0 )i; + assert( removeDirAndContentsRecursively( tdehome ) ); } void TestDistrList::testEmpty() |