From 9a8a1e372f4f35ebdc75da2a2cddc06a77e44fc4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 19:12:32 -0600 Subject: Rename KDEHOME and KDEDIR --- certmanager/lib/tests/test_verify.cpp | 2 +- doc/kaddressbook/index.docbook | 2 +- doc/kalarm/index.docbook | 18 +++++++++--------- doc/kmail/configure.docbook | 2 +- doc/kmail/faq.docbook | 12 ++++++------ doc/kmail/using-kmail.docbook | 4 ++-- doc/knode/faq.docbook | 2 +- doc/korganizer/index.docbook | 4 ++-- doc/kpilot/configuration.docbook | 12 ++++++------ doc/kpilot/sync.docbook | 8 ++++---- karm/test/locking.cpp | 4 ++-- libemailfunctions/idmapper.h | 2 +- libkcal/tests/data/resource_test_config | 2 +- libkcal/tests/testresource.cpp | 4 ++-- libkholidays/kholidays.h | 2 +- libkmime/tests/test_kmime_codec.cpp | 2 +- libtdepim/tests/testdistrlist.cpp | 6 +++--- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp index 153c62b0a..331d3759e 100644 --- a/certmanager/lib/tests/test_verify.cpp +++ b/certmanager/lib/tests/test_verify.cpp @@ -51,7 +51,7 @@ int main( int argc, char **argv ) { setenv("GNUPGHOME", KDESRCDIR "/gnupg_home", 1 ); setenv("LC_ALL", "C", 1); - setenv("KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-unit-test" ), 1); + setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-unit-test" ), 1); KAboutData aboutData( "test_verify", "verify job test", "0.1" ); KCmdLineArgs::init( argc, argv, &aboutData ); diff --git a/doc/kaddressbook/index.docbook b/doc/kaddressbook/index.docbook index b583de509..e5e7afade 100644 --- a/doc/kaddressbook/index.docbook +++ b/doc/kaddressbook/index.docbook @@ -1138,7 +1138,7 @@ used to influence its starting behavior: Options Without a User Interface Representation Apart from the options presented in the configuration dialog, some options -can only be set directly in the configuration file ($KDEHOME/share/config/kaddressbookrc) +can only be set directly in the configuration file ($TDEHOME/share/config/kaddressbookrc) or through KIOSK. diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index 0e0d6844f..8385c1bea 100644 --- a/doc/kalarm/index.docbook +++ b/doc/kalarm/index.docbook @@ -3915,30 +3915,30 @@ to trigger them when they become due. What configuration files does &kalarm; use? -The file $KDEHOME/share/config/kalarmrc +The file $TDEHOME/share/config/kalarmrc holds your &kalarm; preferences. The calendar file which stores your pending alarms is -$KDEHOME/share/apps/kalarm/calendar.ics, unless +$TDEHOME/share/apps/kalarm/calendar.ics, unless a different calendar file is specified in the preferences file by a Calendar entry in the General section. The calendar file which stores your expired alarms is -$KDEHOME/share/apps/kalarm/expired.ics, unless +$TDEHOME/share/apps/kalarm/expired.ics, unless a different calendar file is specified in the preferences file by an ExpiredCalendar entry in the General section. The calendar file which stores your alarm templates is -$KDEHOME/share/apps/kalarm/template.ics, unless +$TDEHOME/share/apps/kalarm/template.ics, unless a different calendar file is specified in the preferences file by a TemplateCalendar entry in the General section. Details of alarms currently being displayed are stored in the calendar file -$KDEHOME/share/apps/kalarm/displaying.ics. +$TDEHOME/share/apps/kalarm/displaying.ics. @@ -3949,7 +3949,7 @@ calendar file daemon use? -The file $KDEHOME/share/config/kalarmdrc +The file $TDEHOME/share/config/kalarmdrc holds your alarm daemon preferences, together with details of the &kalarm; client application. @@ -4111,14 +4111,14 @@ if your &kde; is installed in /opt/kde2: If you install &kalarm; into a folder different from where &kde; is installed, it will not run correctly unless you make its location known to &kde;. To do this, you must prefix the -KDEDIRS environment variable with &kalarm;'s location, +TDEDIRS environment variable with &kalarm;'s location, each time before you start &kde;. For example, if &kde; is installed in -/opt/kde, KDEDIRS might normally +/opt/kde, TDEDIRS might normally be set to /etc/opt/kde:/opt/kde. If you install &kalarm; into /usr/local, you would need to set -KDEDIRS to +TDEDIRS to /usr/local:/etc/opt/kde:/opt/kde before starting &kde;. diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook index 7643b3562..508e0c871 100644 --- a/doc/kmail/configure.docbook +++ b/doc/kmail/configure.docbook @@ -2013,7 +2013,7 @@ Exchange understands. The invitation will be sent as an attachment with name Options without a user interface representation Apart from the options presented in the configuration dialog, some options -can only be set directly in the configuration file ($KDEHOME/share/config/kmailrc) +can only be set directly in the configuration file ($TDEHOME/share/config/kmailrc) or through KIOSK. diff --git a/doc/kmail/faq.docbook b/doc/kmail/faq.docbook index 10b41e00c..6bf45e60a 100644 --- a/doc/kmail/faq.docbook +++ b/doc/kmail/faq.docbook @@ -102,12 +102,12 @@ ultimate ownertrust: it is no longer implicitly done for you. Where does &kmail; save my settings and my mail? Most &kmail; settings are stored in -$KDEHOME/share/config/kmailrc, where -$KDEHOME is typically $TDEHOME/share/config/kmailrc, where +$TDEHOME is typically ~/.kde; the identities are stored in -$KDEHOME/share/config/emailidentities +$TDEHOME/share/config/emailidentities and your mail is saved in $KDEHOME/share/apps/kmail (or +class="directory">$TDEHOME/share/apps/kmail (or ~/Mail if you upgraded from a previous &kmail; version that used this location.) Note that some of the files are hidden: remember to also copy those if you want to backup or @@ -130,7 +130,7 @@ to use &kmail; together with procmail then please read this &FAQ;. If you want to use &kmail; together with another email client then please read this &FAQ;. -If your mail folder (usually $KDEHOME/share/apps/kmail/ or ~/Mail) +If your mail folder (usually $TDEHOME/share/apps/kmail/ or ~/Mail) is on a volume which is mounted via NFS and if the clock of the NFS server is ahead of the clock of your computer then the NFS server sometimes reports a wrong file date for the index file. In this case &kmail; assumes that the index @@ -574,7 +574,7 @@ the &imap; account, the Local Folders will stay collapsed when &kmail; starts. In case it is imperative to use it in the insecure mode, it has to be manually enabled in the file - $KDEHOME/share/config/kmailrc by adding + $TDEHOME/share/config/kmailrc by adding the following directive in the [Reader] group: diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index 6bc1046fa..bd9de909f 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -386,7 +386,7 @@ Snippets can be grouped together as well by creating groups and adding snippets The Snippets tool allows for a variable text in predefined places any time you insert a snippet into a file. To accomplish this Snippets provides its own variables' mechanism. You can set up its behaviour in the snippet text itself by using separators ( $ ) that enclose the variable names. For example : $variablename$, $invoicenumber$, $weekno$. -The variable separator can be changed to some other character by changing "snippetDelimiter" in [SnippetPart] section. The Text Snippet configuration file can be found here $KDEHOME/share/config/kmailsnippetrc . +The variable separator can be changed to some other character by changing "snippetDelimiter" in [SnippetPart] section. The Text Snippet configuration file can be found here $TDEHOME/share/config/kmailsnippetrc . snippetDelimiter=$ @@ -402,7 +402,7 @@ snippetDelimiter=$ Message Folders are used to organize your email messages. By default, if you have no existing message folders, messages are stored in the folder $KDEHOME/share/apps/kmail/. If +class="directory">$TDEHOME/share/apps/kmail/. If you have existing message folders in ~/Mail, these will be used instead. When you first start &kmail; the inbox, diff --git a/doc/knode/faq.docbook b/doc/knode/faq.docbook index 1de27ec8e..d9b97d4f5 100644 --- a/doc/knode/faq.docbook +++ b/doc/knode/faq.docbook @@ -25,7 +25,7 @@ there. Type If an error message appears that tells you that &knode; could not be started or found please check whether the file knode exists in $KDEDIR/bin and that its +class="directory">$TDEDIR/bin and that its permissions are correctly set. diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook index 3097067ea..bdb5bb511 100644 --- a/doc/korganizer/index.docbook +++ b/doc/korganizer/index.docbook @@ -388,7 +388,7 @@ resources, import and export actions and the get hot new stuff scheme. Calendar Resources &korganizer; uses a local file, usually -$KDEHOME/share/apps/korganizer/std.ics, +$TDEHOME/share/apps/korganizer/std.ics, as its default resource. But this is not your only option: there are several other resources you can add: groupware servers, journal entries as blogs, network files, &etc;. If you use more than one resource, &korganizer; @@ -504,7 +504,7 @@ features of new release or the status of the new features of a future release. to-dos and journal entries to a local file. The file can be in the iCalendar or in the vCalendar standard format. &korganizer; uses this resource by default, storing your calendar information under -$KDEHOME/share/apps/korganizer/std.ics. +$TDEHOME/share/apps/korganizer/std.ics. diff --git a/doc/kpilot/configuration.docbook b/doc/kpilot/configuration.docbook index d6da8f14b..4f383a8f8 100644 --- a/doc/kpilot/configuration.docbook +++ b/doc/kpilot/configuration.docbook @@ -296,8 +296,8 @@ not, you are asked to pick which you will use. If you pick the local name, the &PalmPilot; will be changed to match. The Pilot User entry is also used to name the folder that stores the information from the &PalmPilot;. This folder is created in the -$KDEHOME/share/apps/kpilot/DBBackup/ -folder, where the $KDEHOME environment +$TDEHOME/share/apps/kpilot/DBBackup/ +folder, where the $TDEHOME environment variable (typically /home/Login Name/.kde/) points to the folder that contains your configuration and data for the &kde; @@ -1050,8 +1050,8 @@ or to an iCalendar file of your choice. In the latter case, the conduit will need the filename of the calendar file (this will usually be a file that ends in .ics) to sync with, of if it uses the standard &korganizer; iCalendar file, it will be under the $KDEHOME/share/apps/korganizer/ folder, where the -$KDEHOME environment variable (typically +class="directory">$TDEHOME/share/apps/korganizer/ folder, where the +$TDEHOME environment variable (typically /home/user/.kde/) points to the folder that contains your configuration and data for the &kde; applications. @@ -1402,8 +1402,8 @@ filename of the vCard file (this will usually be a file that ends in .vcf) to sync with, of if it uses the standard &kde; address book file, it will be under the -$KDEHOME/share/apps/kabc/ -folder, where the $KDEHOME environment +$TDEHOME/share/apps/kabc/ +folder, where the $TDEHOME environment variable (typically /home/Login Name/.kde/) points to the folder that contains your configuration and data for the &kde; applications. diff --git a/doc/kpilot/sync.docbook b/doc/kpilot/sync.docbook index 5fba145cb..b3b357041 100644 --- a/doc/kpilot/sync.docbook +++ b/doc/kpilot/sync.docbook @@ -133,9 +133,9 @@ menu item is available on the &kpilot; daemon popup menu as well. On every backup, &kpilot; stores a copy of all your &handheld; data under the -$KDEHOME/share/apps/kpilot/DBBackup/User Name/ +$TDEHOME/share/apps/kpilot/DBBackup/User Name/ folder, allowing you to restore that copy later, if needed. The -$KDEHOME environment variable +$TDEHOME environment variable (typically /home/Login Name/.kde/) points to the folder that contains your configuration and data for the &kde; applications. @@ -172,8 +172,8 @@ data entered on the &handheld; since the last backup. -The data saved on the last backup is located on the $KDEHOME/share/apps/kpilot/DBBackup/User Name/ -folder. The $KDEHOME environment variable +The data saved on the last backup is located on the $TDEHOME/share/apps/kpilot/DBBackup/User Name/ +folder. The $TDEHOME environment variable (typically /home/Login Name/.kde/) points to the folder that contains your configuration and data for the &kde; applications. diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index 2c18d4fed..cdf5e41a5 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -128,9 +128,9 @@ int main( int argc, char *argv[] ) short rval = 0; // Use another directory than the real one, just to keep things clean - // KDEHOME needs to be writable though, for a ksycoca database + // TDEHOME needs to be writable though, for a ksycoca database // FIXME: Delete this directory when done with test. - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); // Copied from Till's test in libkcal. Not sure what this is for. setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h index 9e9faadf5..7c6c98cf2 100644 --- a/libemailfunctions/idmapper.h +++ b/libemailfunctions/idmapper.h @@ -50,7 +50,7 @@ class KDE_EXPORT IdMapper or save(). The current implementation stores the data at - $(KDEHOME)/share/apps/\/\. + $(TDEHOME)/share/apps/\/\. */ IdMapper( const TQString &path, const TQString &identifier = TQString() ); /** Destructor. */ diff --git a/libkcal/tests/data/resource_test_config b/libkcal/tests/data/resource_test_config index 67f766fa6..a652f8273 100644 --- a/libkcal/tests/data/resource_test_config +++ b/libkcal/tests/data/resource_test_config @@ -1,5 +1,5 @@ [Resource_test_ical] -CalendarURL=file:$KDEHOME/test.ics +CalendarURL=file:$TDEHOME/test.ics Format=ical ResourceIdentifier=sUiQkXeIro ResourceIsActive=true diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 682518692..5779c47b5 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -55,8 +55,8 @@ static const KCmdLineOptions options[] = int main(int argc, char *argv[]) { // Use another directory than the real one, just to keep things clean - // KDEHOME needs to be writable though, for a ksycoca database - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); + // TDEHOME needs to be writable though, for a ksycoca database + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KApplication::disableAutoDcopRegistration(); diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h index fca42d86b..b2e31b875 100644 --- a/libkholidays/kholidays.h +++ b/libkholidays/kholidays.h @@ -47,7 +47,7 @@ class KDE_EXPORT KHolidays { static TQString fileForLocation( const TQString &location ); /** Return the directory for user-specific holiday files (i.e. somewhere below - $KDEDIR/share/apps/). Don't automatically create that path by default. + $TDEDIR/share/apps/). Don't automatically create that path by default. */ static TQString userPath( bool create = false ); /** diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp index 57b1343e2..832ea2c3c 100644 --- a/libkmime/tests/test_kmime_codec.cpp +++ b/libkmime/tests/test_kmime_codec.cpp @@ -1,6 +1,6 @@ /* test program for KMime::Codec's: compile with: - g++ -I$TQTDIR/include -I$KDEDIR/include -L$TQTDIR/lib -L$KDEDIR/lib \ + g++ -I$TQTDIR/include -I$TDEDIR/include -L$TQTDIR/lib -L$TDEDIR/lib \ -lqt-mt -ltdecore -ltdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \ -o test_kmime_codec{,.cpp} */ diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index f588f9a93..f66647011 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/libtdepim/tests/testdistrlist.cpp @@ -42,8 +42,8 @@ using KPIM::DistributionList; int main(int argc, char *argv[]) { // Use another directory than the real one, just to keep things clean - // KDEHOME needs to be writable though, for a ksycoca database - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true ); + // TDEHOME needs to be writable though, for a ksycoca database + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true ); setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KApplication::disableAutoDcopRegistration(); @@ -150,7 +150,7 @@ void TestDistrList::cleanup() ab->clear(); KABC::StdAddressBook::close(); - TQString kdehome = TQFile::decodeName( getenv("KDEHOME") ); + TQString kdehome = TQFile::decodeName( getenv("TDEHOME") ); KURL urlkdehome; urlkdehome.setPath( kdehome ); // don't use KIO::NetAccess here since it needs X // KIO::NetAccess::del( urlkdehome, 0 )i; -- cgit v1.2.1