Rename KDEHOME and KDEDIR

pull/21/head
Timothy Pearson 13 years ago
parent f2a152bb4c
commit 9a8a1e372f

@ -51,7 +51,7 @@ int main( int argc, char **argv )
{ {
setenv("GNUPGHOME", KDESRCDIR "/gnupg_home", 1 ); setenv("GNUPGHOME", KDESRCDIR "/gnupg_home", 1 );
setenv("LC_ALL", "C", 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" ); KAboutData aboutData( "test_verify", "verify job test", "0.1" );
KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineArgs::init( argc, argv, &aboutData );

@ -1138,7 +1138,7 @@ used to influence its starting behavior:</para>
<title>Options Without a User Interface Representation</title> <title>Options Without a User Interface Representation</title>
<para> <para>
Apart from the options presented in the configuration dialog, some options 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. or through KIOSK.
</para> </para>

@ -3915,30 +3915,30 @@ to trigger them when they become due.</para>
<para>What configuration files does &kalarm; use?</para> <para>What configuration files does &kalarm; use?</para>
</question> </question>
<answer> <answer>
<para>The file <filename>$KDEHOME/share/config/kalarmrc</filename> <para>The file <filename>$TDEHOME/share/config/kalarmrc</filename>
holds your &kalarm; preferences.</para> holds your &kalarm; preferences.</para>
<para>The calendar file which stores your pending alarms is <para>The calendar file which stores your pending alarms is
<filename>$KDEHOME/share/apps/kalarm/calendar.ics</filename>, unless <filename>$TDEHOME/share/apps/kalarm/calendar.ics</filename>, unless
a different calendar file is specified in the preferences file by a a different calendar file is specified in the preferences file by a
<parameter>Calendar</parameter> entry in the <parameter>Calendar</parameter> entry in the
<parameter>General</parameter> section.</para> <parameter>General</parameter> section.</para>
<para>The calendar file which stores your expired alarms is <para>The calendar file which stores your expired alarms is
<filename>$KDEHOME/share/apps/kalarm/expired.ics</filename>, unless <filename>$TDEHOME/share/apps/kalarm/expired.ics</filename>, unless
a different calendar file is specified in the preferences file by an a different calendar file is specified in the preferences file by an
<parameter>ExpiredCalendar</parameter> entry in the <parameter>ExpiredCalendar</parameter> entry in the
<parameter>General</parameter> section.</para> <parameter>General</parameter> section.</para>
<para>The calendar file which stores your alarm templates is <para>The calendar file which stores your alarm templates is
<filename>$KDEHOME/share/apps/kalarm/template.ics</filename>, unless <filename>$TDEHOME/share/apps/kalarm/template.ics</filename>, unless
a different calendar file is specified in the preferences file by a a different calendar file is specified in the preferences file by a
<parameter>TemplateCalendar</parameter> entry in the <parameter>TemplateCalendar</parameter> entry in the
<parameter>General</parameter> section.</para> <parameter>General</parameter> section.</para>
<para>Details of alarms currently being displayed are stored in the <para>Details of alarms currently being displayed are stored in the
calendar file calendar file
<filename>$KDEHOME/share/apps/kalarm/displaying.ics</filename>.</para> <filename>$TDEHOME/share/apps/kalarm/displaying.ics</filename>.</para>
</answer> </answer>
</qandaentry> </qandaentry>
@ -3949,7 +3949,7 @@ calendar file
daemon</application> use?</para> daemon</application> use?</para>
</question> </question>
<answer> <answer>
<para>The file <filename>$KDEHOME/share/config/kalarmdrc</filename> <para>The file <filename>$TDEHOME/share/config/kalarmdrc</filename>
holds your <application>alarm daemon</application> preferences, holds your <application>alarm daemon</application> preferences,
together with details of the &kalarm; client application.</para> together with details of the &kalarm; client application.</para>
</answer> </answer>
@ -4111,14 +4111,14 @@ if your &kde; is installed in <filename>/opt/kde2</filename>:</para>
<warning><para>If you install &kalarm; into a folder different from <warning><para>If you install &kalarm; into a folder different from
where &kde; is installed, it will not run correctly unless you make where &kde; is installed, it will not run correctly unless you make
its location known to &kde;. To do this, you must prefix the its location known to &kde;. To do this, you must prefix the
<envar>KDEDIRS</envar> environment variable with &kalarm;'s location, <envar>TDEDIRS</envar> environment variable with &kalarm;'s location,
each time before you start &kde;.</para> each time before you start &kde;.</para>
<para>For example, if &kde; is installed in <para>For example, if &kde; is installed in
<literal>/opt/kde</literal>, <envar>KDEDIRS</envar> might normally <literal>/opt/kde</literal>, <envar>TDEDIRS</envar> might normally
be set to <literal>/etc/opt/kde:/opt/kde</literal>. If you install be set to <literal>/etc/opt/kde:/opt/kde</literal>. If you install
&kalarm; into <literal>/usr/local</literal>, you would need to set &kalarm; into <literal>/usr/local</literal>, you would need to set
<envar>KDEDIRS</envar> to <envar>TDEDIRS</envar> to
<literal>/usr/local:/etc/opt/kde:/opt/kde</literal> before starting <literal>/usr/local:/etc/opt/kde:/opt/kde</literal> before starting
&kde;.</para></warning> &kde;.</para></warning>

@ -2013,7 +2013,7 @@ Exchange understands. The invitation will be sent as an attachment with name <fi
<title>Options without a user interface representation</title> <title>Options without a user interface representation</title>
<para> <para>
Apart from the options presented in the configuration dialog, some options 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. or through KIOSK.
</para> </para>

@ -102,12 +102,12 @@ ultimate ownertrust: it is no longer implicitly done for you.</para>
<qandaentry> <question><para>Where does &kmail; save my settings and my <qandaentry> <question><para>Where does &kmail; save my settings and my
mail?</para></question> <answer> <para>Most &kmail; settings are stored in mail?</para></question> <answer> <para>Most &kmail; settings are stored in
<filename>$<envar>KDEHOME</envar>/share/config/kmailrc</filename>, where <filename>$<envar>TDEHOME</envar>/share/config/kmailrc</filename>, where
$<envar>KDEHOME</envar> is typically <filename $<envar>TDEHOME</envar> is typically <filename
class="directory">~/.kde</filename>; the identities are stored in class="directory">~/.kde</filename>; the identities are stored in
<filename>$<envar>KDEHOME</envar>/share/config/emailidentities</filename> <filename>$<envar>TDEHOME</envar>/share/config/emailidentities</filename>
and your mail is saved in <filename and your mail is saved in <filename
class="directory">$<envar>KDEHOME</envar>/share/apps/kmail</filename> (or class="directory">$<envar>TDEHOME</envar>/share/apps/kmail</filename> (or
<filename class="directory">~/Mail</filename> if you upgraded from a <filename class="directory">~/Mail</filename> if you upgraded from a
previous &kmail; version that used this location.) Note that some of the 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 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 <link
linkend="faq-procmail">this &FAQ;</link>. If you want to use &kmail; together with linkend="faq-procmail">this &FAQ;</link>. If you want to use &kmail; together with
another email client then please read <link another email client then please read <link
linkend="faq-other-muas">this &FAQ;</link>.</para></listitem> linkend="faq-other-muas">this &FAQ;</link>.</para></listitem>
<listitem><para>If your mail folder (usually <filename class="directory">$<envar>KDEHOME</envar>/share/apps/kmail/</filename> or <filename class="directory">~/Mail</filename>) <listitem><para>If your mail folder (usually <filename class="directory">$<envar>TDEHOME</envar>/share/apps/kmail/</filename> or <filename class="directory">~/Mail</filename>)
is on a volume which is mounted via NFS and if the clock of the NFS server is ahead of the 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 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 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.
<para> <para>
In case it is imperative to use it in the insecure mode, it In case it is imperative to use it in the insecure mode, it
has to be manually enabled in the file has to be manually enabled in the file
<filename>$KDEHOME/share/config/kmailrc</filename> by adding <filename>$TDEHOME/share/config/kmailrc</filename> by adding
the following directive in the <literal>[Reader]</literal> the following directive in the <literal>[Reader]</literal>
group: group:
<programlisting> <programlisting>

@ -386,7 +386,7 @@ Snippets can be grouped together as well by creating groups and adding snippets
<para>The <guilabel>Snippets</guilabel> tool allows for a variable text in predefined places any time you insert a snippet into a file. To accomplish this <guilabel>Snippets</guilabel> 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$. <para>The <guilabel>Snippets</guilabel> tool allows for a variable text in predefined places any time you insert a snippet into a file. To accomplish this <guilabel>Snippets</guilabel> 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$.
</para> </para>
<para> <para>
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 .
<programlisting> <programlisting>
snippetDelimiter=$ snippetDelimiter=$
</programlisting> </programlisting>
@ -402,7 +402,7 @@ snippetDelimiter=$
<para>Message Folders are used to organize your email messages. By default, <para>Message Folders are used to organize your email messages. By default,
if you have no existing message folders, messages are stored in the folder if you have no existing message folders, messages are stored in the folder
<filename <filename
class="directory">$<envar>KDEHOME</envar>/share/apps/kmail/</filename>. If class="directory">$<envar>TDEHOME</envar>/share/apps/kmail/</filename>. If
you have existing message folders in <filename you have existing message folders in <filename
class="directory">~/Mail</filename>, these will be used instead. When you class="directory">~/Mail</filename>, these will be used instead. When you
first start &kmail; the <guilabel>inbox</guilabel>, first start &kmail; the <guilabel>inbox</guilabel>,

@ -25,7 +25,7 @@ there. Type</para>
<para>If an error message appears that tells you that &knode; could <para>If an error message appears that tells you that &knode; could
not be started or found please check whether the file not be started or found please check whether the file
<filename>knode</filename> exists in <filename <filename>knode</filename> exists in <filename
class="directory">$<envar>KDEDIR</envar>/bin</filename> and that its class="directory">$<envar>TDEDIR</envar>/bin</filename> and that its
permissions are correctly set.</para> permissions are correctly set.</para>
</answer> </answer>
</qandaentry> </qandaentry>

@ -388,7 +388,7 @@ resources, import and export actions and the get hot new stuff scheme.</para>
<title>Calendar Resources</title> <title>Calendar Resources</title>
<para>&korganizer; uses a local file, usually <para>&korganizer; uses a local file, usually
<filename>$KDEHOME/share/apps/korganizer/std.ics</filename>, <filename>$TDEHOME/share/apps/korganizer/std.ics</filename>,
as its default resource. But this is not your only option: there are several 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, other resources you can add: groupware servers, journal entries as blogs,
network files, &etc;. If you use more than one resource, &korganizer; 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 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, in the vCalendar standard format. &korganizer; uses this resource by default,
storing your calendar information under storing your calendar information under
<filename>$KDEHOME/share/apps/korganizer/std.ics</filename>.</para></listitem> <filename>$TDEHOME/share/apps/korganizer/std.ics</filename>.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

@ -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. name, the &PalmPilot; will be changed to match.
The <guilabel>Pilot User</guilabel> entry is also used to name the folder that The <guilabel>Pilot User</guilabel> entry is also used to name the folder that
stores the information from the &PalmPilot;. This folder is created in the stores the information from the &PalmPilot;. This folder is created in the
<filename class="directory">$KDEHOME/share/apps/kpilot/DBBackup/</filename> <filename class="directory">$TDEHOME/share/apps/kpilot/DBBackup/</filename>
folder, where the <filename class="directory">$KDEHOME</filename> environment folder, where the <filename class="directory">$TDEHOME</filename> environment
variable variable
(typically <filename class="directory">/home/Login Name/.kde/</filename>) (typically <filename class="directory">/home/Login Name/.kde/</filename>)
points to the folder that contains your configuration and data for the &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 need the filename of the calendar file (this will usually be a file that ends in
<literal role="extension">.ics</literal>) to sync with, of if it uses the <literal role="extension">.ics</literal>) to sync with, of if it uses the
standard &korganizer; iCalendar file, it will be under the <filename standard &korganizer; iCalendar file, it will be under the <filename
class="directory">$KDEHOME/share/apps/korganizer/</filename> folder, where the class="directory">$TDEHOME/share/apps/korganizer/</filename> folder, where the
<filename class="directory">$KDEHOME</filename> environment variable (typically <filename class="directory">$TDEHOME</filename> environment variable (typically
<filename class="directory">/home/user/.kde/</filename>) points to the folder <filename class="directory">/home/user/.kde/</filename>) points to the folder
that contains your configuration and data for the &kde; applications. that contains your configuration and data for the &kde; applications.
</para> </para>
@ -1402,8 +1402,8 @@ filename of the
vCard file (this will usually be a file that ends in <literal vCard file (this will usually be a file that ends in <literal
role="extension">.vcf</literal>) to sync with, of if it uses the standard role="extension">.vcf</literal>) to sync with, of if it uses the standard
&kde; address book file, it will be under the &kde; address book file, it will be under the
<filename class="directory">$KDEHOME/share/apps/kabc/</filename> <filename class="directory">$TDEHOME/share/apps/kabc/</filename>
folder, where the <filename class="directory">$KDEHOME</filename> environment folder, where the <filename class="directory">$TDEHOME</filename> environment
variable (typically <filename class="directory">/home/Login Name/.kde/</filename>) variable (typically <filename class="directory">/home/Login Name/.kde/</filename>)
points to the folder that contains your configuration and data for the &kde; points to the folder that contains your configuration and data for the &kde;
applications. applications.

@ -133,9 +133,9 @@ menu item is available on the &kpilot; daemon popup menu as well.
<para> <para>
On every backup, &kpilot; stores a copy of all your &handheld; data under the On every backup, &kpilot; stores a copy of all your &handheld; data under the
<filename class="directory">$KDEHOME/share/apps/kpilot/DBBackup/User Name/</filename> <filename class="directory">$TDEHOME/share/apps/kpilot/DBBackup/User Name/</filename>
folder, allowing you to restore that copy later, if needed. The folder, allowing you to restore that copy later, if needed. The
<filename class="directory">$KDEHOME</filename> environment variable <filename class="directory">$TDEHOME</filename> environment variable
(typically <filename class="directory">/home/Login Name/.kde/</filename>) (typically <filename class="directory">/home/Login Name/.kde/</filename>)
points to the folder that contains your configuration and data for the &kde; points to the folder that contains your configuration and data for the &kde;
applications.</para> applications.</para>
@ -172,8 +172,8 @@ data entered on the &handheld; since the last backup.
</para> </para>
<para> <para>
The data saved on the last backup is located on the <filename class="directory">$KDEHOME/share/apps/kpilot/DBBackup/User Name/</filename> The data saved on the last backup is located on the <filename class="directory">$TDEHOME/share/apps/kpilot/DBBackup/User Name/</filename>
folder. The <filename class="directory">$KDEHOME</filename> environment variable folder. The <filename class="directory">$TDEHOME</filename> environment variable
(typically <filename class="directory">/home/Login Name/.kde/</filename>) (typically <filename class="directory">/home/Login Name/.kde/</filename>)
points to the folder that contains your configuration and data for the &kde; points to the folder that contains your configuration and data for the &kde;
applications.</para> applications.</para>

@ -128,9 +128,9 @@ int main( int argc, char *argv[] )
short rval = 0; short rval = 0;
// Use another directory than the real one, just to keep things clean // 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. // 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. // Copied from Till's test in libkcal. Not sure what this is for.
setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

@ -50,7 +50,7 @@ class KDE_EXPORT IdMapper
or save(). or save().
The current implementation stores the data at The current implementation stores the data at
$(KDEHOME)/share/apps/\<path\>/\<identifier\>. $(TDEHOME)/share/apps/\<path\>/\<identifier\>.
*/ */
IdMapper( const TQString &path, const TQString &identifier = TQString() ); IdMapper( const TQString &path, const TQString &identifier = TQString() );
/** Destructor. */ /** Destructor. */

@ -1,5 +1,5 @@
[Resource_test_ical] [Resource_test_ical]
CalendarURL=file:$KDEHOME/test.ics CalendarURL=file:$TDEHOME/test.ics
Format=ical Format=ical
ResourceIdentifier=sUiQkXeIro ResourceIdentifier=sUiQkXeIro
ResourceIsActive=true ResourceIsActive=true

@ -55,8 +55,8 @@ static const KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// Use another directory than the real one, just to keep things clean // 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
setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true ); setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true );
setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();

@ -47,7 +47,7 @@ class KDE_EXPORT KHolidays {
static TQString fileForLocation( const TQString &location ); static TQString fileForLocation( const TQString &location );
/** /**
Return the directory for user-specific holiday files (i.e. somewhere below 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 ); static TQString userPath( bool create = false );
/** /**

@ -1,6 +1,6 @@
/* test program for KMime::Codec's: /* test program for KMime::Codec's:
compile with: 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 \ -lqt-mt -ltdecore -ltdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \
-o test_kmime_codec{,.cpp} -o test_kmime_codec{,.cpp}
*/ */

@ -42,8 +42,8 @@ using KPIM::DistributionList;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// Use another directory than the real one, just to keep things clean // 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
setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true ); setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true );
setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
@ -150,7 +150,7 @@ void TestDistrList::cleanup()
ab->clear(); ab->clear();
KABC::StdAddressBook::close(); KABC::StdAddressBook::close();
TQString kdehome = TQFile::decodeName( getenv("KDEHOME") ); TQString kdehome = TQFile::decodeName( getenv("TDEHOME") );
KURL urlkdehome; urlkdehome.setPath( kdehome ); KURL urlkdehome; urlkdehome.setPath( kdehome );
// don't use KIO::NetAccess here since it needs X // don't use KIO::NetAccess here since it needs X
// KIO::NetAccess::del( urlkdehome, 0 )i; // KIO::NetAccess::del( urlkdehome, 0 )i;

Loading…
Cancel
Save