Browse Source

Rename KDEHOME and KDEDIR

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
99cc033990
59 changed files with 145 additions and 145 deletions
  1. 6
    6
      COMPILING
  2. 6
    6
      COMPILING.html
  3. 2
    2
      KDE2PORTING.html
  4. 1
    1
      config.h.cmake
  5. 1
    1
      configure.in.in
  6. 1
    1
      doc/common/README.Doxygen
  7. 1
    1
      doc/tdelibs/man-kbuildsycoca.8.docbook
  8. 1
    1
      kab/addressbook.h
  9. 1
    1
      kabc/scripts/createisomap.pl
  10. 1
    1
      kate/data/maxima.xml
  11. 1
    1
      kate/part/test_regression.cpp
  12. 3
    3
      kconf_update/README.kconf_update
  13. 1
    1
      kded/HOWTO
  14. 2
    2
      kded/kbuildsycoca.cpp
  15. 1
    1
      kdewidgets/README
  16. 1
    1
      kdoctools/kio_help.upd
  17. 1
    1
      khtml/java/kjavaprocess.h
  18. 1
    1
      khtml/test_regression.cpp
  19. 4
    4
      kinit/README.DCOP
  20. 1
    1
      kinit/README.autostart
  21. 2
    2
      kinit/README.wrapper
  22. 1
    1
      kinit/kdostartupconfig.cpp
  23. 4
    4
      kinit/kstartupconfig.cpp
  24. 2
    2
      kinit/lnusertemp.c
  25. 1
    1
      kinit/wrapper.c
  26. 1
    1
      kio/kio/kmimemagic.h
  27. 1
    1
      kio/kio/kservice.cpp
  28. 1
    1
      kio/kio/kservice.h
  29. 1
    1
      kio/kio/kservicetype.h
  30. 1
    1
      kio/tests/ksycocatest.cpp
  31. 16
    16
      kio/tests/kurifiltertest.cpp
  32. 1
    1
      kmdi/test/README
  33. 1
    1
      kparts/browserview.desktop
  34. 1
    1
      kparts/plugin.h
  35. 2
    2
      kparts/tests/README
  36. 1
    1
      kutils/kdeglobals.kcfg
  37. 2
    2
      tdecore/DESIGN.kconfig
  38. 25
    25
      tdecore/README.kiosk
  39. 1
    1
      tdecore/kaudioplayer.h
  40. 1
    1
      tdecore/kcrash.cpp
  41. 1
    1
      tdecore/kdebugrc
  42. 1
    1
      tdecore/knotifyclient.h
  43. 11
    11
      tdecore/kstandarddirs.cpp
  44. 10
    10
      tdecore/kstandarddirs.h
  45. 1
    1
      tdecore/ksycoca.h
  46. 1
    1
      tdecore/ktempdir.h
  47. 1
    1
      tdecore/ktempfile.h
  48. 1
    1
      tdesu/client.cpp
  49. 1
    1
      tdeui/kpanelextension.h
  50. 1
    1
      tdeui/kpanelmenu.h
  51. 1
    1
      win/common.pro
  52. 1
    1
      win/config.h
  53. 2
    2
      win/pro_files/kmdi/test/test.pro
  54. 1
    1
      win/pro_files/tdefx/tdefx_rel.pro
  55. 2
    2
      win/tdelibs_global_win.h
  56. 2
    2
      win/tools/.check_kde_env
  57. 2
    2
      win/tools/build_tdelibs_dbg
  58. 1
    1
      win/tools/build_tdelibs_rel
  59. 1
    1
      win/tools/kde_env_custom.template

+ 6
- 6
COMPILING View File

@@ -41,24 +41,24 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
2) Where do you want to have KDE installed. A good candidate is /usr/local/kde

Make sure you do (if using sh, ksh, or bash):
export KDEDIR=/usr/local/kde
export TDEDIR=/usr/local/kde

With csh or tcsh the following is more appropriate:

setenv KDEDIR /usr/local/kde
setenv TDEDIR /usr/local/kde

Now you want to make sure that Qt and KDE libraries are picked up correctly.

On systems that respond to environment variables something similar to the
following is appropriate:

export LD_LIBRARY_PATH=$KDEDIR/lib:$QTDIR/lib
export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib

On systems whose diety of choice is ldconfig, try:
ldconfig -m $KDEDIR/lib
ldconfig -m $TDEDIR/lib
ldconfig -m $QTDIR/lib

You probably also want to add $KDEDIR/bin and $QTDIR/bin to your path.
You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.

See http://www.kde.org/kde2-and-trinity.html for tips about setting up
KDE 3.0 next to KDE 2.x.
@@ -88,7 +88,7 @@ One of the biggest problems is picking up the correct version of Qt,
especially if your system has more version of Qt installed. Be aware
that information about library paths gets saved in the "config.cache"
file, "Makefile.in" as well as "Makefile" files. So it can be that after
some struggle to get QTDIR/KDEDIR setup correctly your setup is actually
some struggle to get QTDIR/TDEDIR setup correctly your setup is actually
correct, but old -incorrect- settings are still lying around.

The best thing to do in such a case is to do a "svn-clean" (from tdesdk/scripts).

+ 6
- 6
COMPILING.html View File

@@ -36,24 +36,24 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
<p>2) Where do you want to have KDE installed. A good candidate is /usr/local/kde

<p>Make sure you do (if using sh, ksh, or bash):
<pre>export KDEDIR=/usr/local/kde</pre>
<pre>export TDEDIR=/usr/local/kde</pre>

<p>With csh or tcsh the following is more appropriate:

<pre>setenv KDEDIR /usr/local/kde</pre>
<pre>setenv TDEDIR /usr/local/kde</pre>

<p>Now you want to make sure that Qt and KDE libraries are picked up correctly.

<p>On systems that respond to environment variables something similar to the
following is appropriate:

<p>export LD_LIBRARY_PATH=$KDEDIR/lib:$QTDIR/lib
<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib

<p>On systems whose diety of choice is ldconfig, try:
<pre>ldconfig -m $KDEDIR/lib
<pre>ldconfig -m $TDEDIR/lib
ldconfig -m $QTDIR/lib</pre>

<p>You probably also want to add $KDEDIR/bin and $QTDIR/bin to your path.
<p>You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.

<p>See http://www.kde.org/kde2-and-trinity.html for tips about setting up
KDE 3.0 next to KDE 2.x.
@@ -92,7 +92,7 @@ make</pre>
especially if your system has more version of Qt installed. Be aware
that information about library paths gets saved in the "config.cache"
file, "Makefile.in" as well as "Makefile" files. So it can be that after
some struggle to get QTDIR/KDEDIR setup correctly your setup is actually
some struggle to get QTDIR/TDEDIR setup correctly your setup is actually
correct, but old -incorrect- settings are still lying around.

<p>The best thing to do in such a case is to do a "make cvs-clean". This

+ 2
- 2
KDE2PORTING.html View File

@@ -117,9 +117,9 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
BarIcon() or use KGlobal::iconLoader() instead of getIconLoader()<P>

kde_*dir() have been removed as they require a unique top level directory
for all applications (KDEDIR). This concept doesn't exist in KDE 2.0
for all applications (TDEDIR). This concept doesn't exist in KDE 2.0
any more, it has been replaced with "multiple levels of directories",
set in KDEDIRS, so that it's possible to have global settings and
set in TDEDIRS, so that it's possible to have global settings and
group settings, applied before user settings.<P>

Replace code that uses kde_*dir() + filename with calls to

+ 1
- 1
config.h.cmake View File

@@ -687,7 +687,7 @@
#cmakedefine HAVE___ARGZ_STRINGIFY 1

/* The prefix to use as fallback */
#define KDEDIR "@KDEDIR@"
#define TDEDIR "@TDEDIR@"

/* Enable prevention against poor Linux OOM-killer */
#cmakedefine TDEINIT_OOM_PROTECT 1

+ 1
- 1
configure.in.in View File

@@ -124,7 +124,7 @@ KDE_DO_UIC_AGAIN
# configure would do this very late. Too late for us!
test "x$prefix" = xNONE && prefix=$ac_default_prefix

AC_DEFINE_UNQUOTED(KDEDIR, "$prefix", [The prefix to use as fallback])
AC_DEFINE_UNQUOTED(TDEDIR, "$prefix", [The prefix to use as fallback])
KDE_EXPAND_MAKEVAR(ac_kde_sysconfdir, sysconfdir)
AC_DEFINE_UNQUOTED(KDESYSCONFDIR, "$ac_kde_sysconfdir", [The compiled in system configuration prefix])


+ 1
- 1
doc/common/README.Doxygen View File

@@ -57,7 +57,7 @@ doxygen.sh [--recurse] [--modulename] [--doxdatadir=<dir>] [--installdir=<dir>]
--doxdatadir=<dir> Locate the HTML header files and support graphics.
In tdelibs, the subdirectory doc/common/ contains these
files (and this README). In an installed KDE system,
$KDEDIR/share/doc/HTML/en/common/ contains a copy.
$TDEDIR/share/doc/HTML/en/common/ contains a copy.
This argument is mandatory if doxygen.sh can't guess where
the doxdata lives.
--installdir=<dir> Locate the directory where apidox from other modules

+ 1
- 1
doc/tdelibs/man-kbuildsycoca.8.docbook View File

@@ -191,7 +191,7 @@ command at the prompt
<title>Environment Variables</title>
<variablelist>
<varlistentry>
<term>$<envar>KDEDIRS</envar></term>
<term>$<envar>TDEDIRS</envar></term>
<listitem>
<para>Specifies which directories are part of the KDE
installations</para>

+ 1
- 1
kab/addressbook.h View File

@@ -565,7 +565,7 @@ public:
* Creates the local configuration file. The filename is fixed to
* \c kab.config, it will be created in the local kab directory
* (\c $HOME/.kde/share/apps/kab). Adapt the global configuration template
* file (\c $KDEDIR/share/apps/kab/template.config) for unusual site-specific
* file (\c $TDEDIR/share/apps/kab/template.config) for unusual site-specific
* settings.
* The method does not load the new config file.
*/

+ 1
- 1
kabc/scripts/createisomap.pl View File

@@ -4,7 +4,7 @@
# files in tdebase/l10n/*/
#
# USAGE EXAMPLE:
# ./createisomap.pl $KDEDIR/share/locale/l10n > countrytransl.map
# ./createisomap.pl $TDEDIR/share/locale/l10n > countrytransl.map
#
# Don't laugh at me. I put this together with an old perl book, perl
# being a language I've never used before.

+ 1
- 1
kate/data/maxima.xml View File

@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with the maxima.xml. If not, see <http://www.gnu.org/licenses/>.

Usage: place maxima.xml in $KDEDIR/share/apps/katepart/syntax.
Usage: place maxima.xml in $TDEDIR/share/apps/katepart/syntax.
-->

<!DOCTYPE language SYSTEM "language.dtd">

+ 1
- 1
kate/part/test_regression.cpp View File

@@ -404,7 +404,7 @@ int main(int argc, char *argv[])

TQString kh("/var/tmp/%1_kate_non_existent");
kh = kh.arg( pw->pw_name );
setenv( "KDEHOME", kh.latin1(), 1 );
setenv( "TDEHOME", kh.latin1(), 1 );
setenv( "LC_ALL", "C", 1 );
setenv( "LANG", "C", 1 );


+ 3
- 3
kconf_update/README.kconf_update View File

@@ -27,7 +27,7 @@ How it works
============

Applications can install so called "update files" under
$KDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
$TDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
contains instructions for transferring/converting configuration information
from one place to another.

@@ -214,7 +214,7 @@ your application KHello's config file khellorc, you can test by using
cat ~/.kde/share/config/khellorc | khello_conf_update.sh

(assuming khello_conf_update.sh is the kconf_update script and ~/.kde is your
$KDEHOME). This is easier than making install every time, but has the obvious
$TDEHOME). This is easier than making install every time, but has the obvious
downside that you need to 'parse' your script's output yourself instead of
letting kconf_update do it and check the resulting output file.

@@ -235,7 +235,7 @@ file's entry, 'make install', and kconf_update will happily run your script
again, without you having to increase the version number.

If you want to know what kconf_update has been up to lately, have a look
at $KDEHOME/share/apps/kconf_update/update.log
at $TDEHOME/share/apps/kconf_update/update.log


Common Problems

+ 1
- 1
kded/HOWTO View File

@@ -9,7 +9,7 @@ is derived from KDEDModule. The name of a factory method always starts with

It also needs to provide a desktop file that defines the service provided by
the module. The desktop file needs to be installed under
$KDEDIR/share/services/kded/. The name of the desktop file must match with
$TDEDIR/share/services/kded/. The name of the desktop file must match with
the name of the DCOP object that is implemented by the module.

The desktop file needs to define the library in which the module is

+ 2
- 2
kded/kbuildsycoca.cpp View File

@@ -562,7 +562,7 @@ void KBuildSycoca::save()
(*m_str) << aOffset;
}
(*m_str) << (TQ_INT32) 0; // No more factories.
// Write KDEDIRS
// Write TDEDIRS
(*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
(*m_str) << newTimestamp;
(*m_str) << KGlobal::locale()->language();
@@ -732,7 +732,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)

if (bGlobalDatabase)
{
setenv("KDEHOME", "-", 1);
setenv("TDEHOME", "-", 1);
setenv("KDEROOTHOME", "-", 1);
}


+ 1
- 1
kdewidgets/README View File

@@ -7,7 +7,7 @@ Summary:

This directory contains KDE custom widgets for designer 2 which comes with
Qt 3. Just make sure your plugin path in qtconfig includes
$KDEDIR/lib/trinity/plugins . With the KDE build system nothing special
$TDEDIR/lib/trinity/plugins . With the KDE build system nothing special
(i.e. editing the plugin path) is needed, as uic will automatically be
called with -L <path to the kdewidgets plugin> .


+ 1
- 1
kdoctools/kio_help.upd View File

@@ -1,3 +1,3 @@
# Move kio_help cache from $KDEHOME/share/apps/kio_help/cache to $KDEHOME/cache-$HOST/kio_help
# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
Id=trinity_2
Script=move_kio_help_cache.sh,sh

+ 1
- 1
khtml/java/kjavaprocess.h View File

@@ -75,7 +75,7 @@ public:

/**
* This will set the classpath the Java process will use. It's used as a the
* -cp command line option. It adds every jar file stored in $KDEDIRS/share/apps/kjava/
* -cp command line option. It adds every jar file stored in $TDEDIRS/share/apps/kjava/
* to the classpath, and then adds the $CLASSPATH environmental variable. This allows
* users to simply drop the JSSE (Java Secure Sockets Extension classes into that directory
* without having to modify the jvm configuration files.

+ 1
- 1
khtml/test_regression.cpp View File

@@ -440,7 +440,7 @@ int main(int argc, char *argv[])

TQString kh("/var/tmp/%1_non_existant");
kh = kh.arg( pw->pw_name );
setenv( "KDEHOME", kh.latin1(), 1 );
setenv( "TDEHOME", kh.latin1(), 1 );
setenv( "LC_ALL", "C", 1 );
setenv( "LANG", "C", 1 );


+ 4
- 4
kinit/README.DCOP View File

@@ -34,8 +34,8 @@ serviceResult start_service_by_name(QString serviceName, QStringList url)
* Start a service by desktop path.
*
* 'serviceName' refers to a desktop file describing the service.
* This may be an absolute path or a path relative to $KDEDIRS/applnk
* and/or $KDEDIRS/services
* This may be an absolute path or a path relative to $TDEDIRS/applnk
* and/or $TDEDIRS/services
* E.g. it should have the form "Applications/korganizer.desktop" or
* "/opt/kde/share/applnk/Applications/korganizer.desktop".
*
@@ -57,8 +57,8 @@ serviceResult start_service_by_desktop_path(QString serviceName, QStringList url
* Start a service by desktop name.
*
* 'serviceName' refers to a desktop file describing the service.
* The service is looked up anywhere in $KDEDIR/applnk and/or
* $KDEDIR/services.
* The service is looked up anywhere in $TDEDIR/applnk and/or
* $TDEDIR/services.
* E.g. it should have the form "korganizer".
*
* 'url', if not empty, will be passed to the service as

+ 1
- 1
kinit/README.autostart View File

@@ -12,7 +12,7 @@ Applications may be scheduled to be automatically run at KDE session startup
in either autostart phase 1 or phase 2. Autostart phase 1 is the original
autostart phase; phase 2 was introduced in KDE 3. To run in either phase, an
application's .desktop file must be located in a KDE autostart directory such
as $KDEDIR/share/autostart or $KDEHOME/share/autostart. The .desktop file can
as $TDEDIR/share/autostart or $TDEHOME/share/autostart. The .desktop file can
contain the following optional entries to control its autostart:

X-KDE-autostart-condition = rcfile:group:entry:default

+ 2
- 2
kinit/README.wrapper View File

@@ -3,8 +3,8 @@ README
tdeinit_wrapper, kshell and kwrapper are a programs that
start programs via tdeinit.

E.g. You can make a symbolic link from $KDEDIR/bin/konsole to
$KDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line
E.g. You can make a symbolic link from $TDEDIR/bin/konsole to
$TDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line
will then start 'konsole.la' through tdeinit instead.

tdeinit_wrapper is the simplest for, it only passes the program

+ 1
- 1
kinit/kdostartupconfig.cpp View File

@@ -125,7 +125,7 @@ int main()
<< "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
}
startupconfigfiles << line << endl;
// use even currently non-existing paths in $KDEDIRS
// use even currently non-existing paths in $TDEDIRS
TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes());
for( TQStringList::ConstIterator it = dirs.begin();
it != dirs.end();

+ 4
- 4
kinit/kstartupconfig.cpp View File

@@ -28,10 +28,10 @@ This utility helps to have some configuration options available in starttde
without the need to launch anything linked to KDE libraries (which may need
some time to load).

The configuration options are written to $KDEHOME/share/config/startupconfigkeys,
The configuration options are written to $TDEHOME/share/config/startupconfigkeys,
one option per line, as <file> <group> <key> <default>. It is possible to
use ' for quoting multiword entries. Values of these options will be written
to $KDEHOME/share/config/startupconfig as a shell script that will set
to $TDEHOME/share/config/startupconfig as a shell script that will set
the values to shell variables, named <file>_<group>_<key> (all spaces replaced
by underscores, everything lowercase). So e.g. line
"ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default".
@@ -76,8 +76,8 @@ Otherwise kdostartupconfig is launched to create or update all the necessary fil
int main()
{
char kdehome[ 1024 ];
if( getenv( "KDEHOME" ))
strlcpy( kdehome, getenv( "KDEHOME" ), 1024 );
if( getenv( "TDEHOME" ))
strlcpy( kdehome, getenv( "TDEHOME" ), 1024 );
else if( getenv( "HOME" ))
{
strlcpy( kdehome, getenv( "HOME" ), 1024 );

+ 2
- 2
kinit/lnusertemp.c View File

@@ -100,7 +100,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
char tmp_buf[PATH_MAX+1];
int uid = getuid();
const char *home_dir = getenv("HOME");
const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
int result;
struct stat stat_buf;

@@ -181,7 +181,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
result = lstat(kde_tmp_dir, &stat_buf);
if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
{
/* $KDEHOME/tmp is a normal directory. Do nothing. */
/* $TDEHOME/tmp is a normal directory. Do nothing. */
/*printf("Directory \"%s\" already exists.\n", kde_tmp_dir);*/
return 0;
}

+ 1
- 1
kinit/wrapper.c View File

@@ -132,7 +132,7 @@ static int openSocket()
#define MAX_SOCK_FILE 255
char sock_file[MAX_SOCK_FILE + 1];
const char *home_dir = getenv("HOME");
const char *kde_home = getenv("KDEHOME");
const char *kde_home = getenv("TDEHOME");
char *display;

sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;

+ 1
- 1
kio/kio/kmimemagic.h View File

@@ -82,7 +82,7 @@ protected:
*
*
* Unless specified otherwise, KMimeMagic uses
* $KDEDIR/share/mimelnk/magic for this purpose.
* $TDEDIR/share/mimelnk/magic for this purpose.
*
* To make KMimeMagic restore the 'atime' of a file after it opened it,
* add its directory in kmimemagicrc like:

+ 1
- 1
kio/kio/kservice.cpp View File

@@ -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 = "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;
} else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
int space = m_strExec.find(" ");
if (space==-1)

+ 1
- 1
kio/kio/kservice.h View File

@@ -165,7 +165,7 @@ public:
* is stored.
*
* This is a relative path if the desktop entry was found in any
* of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop")
* of the locations pointed to by $TDEDIRS (e.g. "Internet/kppp.desktop")
* It is a full path if the desktop entry originates from another
* location.
* @return the path of the service's desktop file,

+ 1
- 1
kio/kio/kservicetype.h View File

@@ -39,7 +39,7 @@
* instead of a type of file.
* For instance, KOfficeFilter is a service type.
* It is associated to services according to the user profile (kuserprofile.h).
* Service types are stored as desktop files in $KDEHOME/share/servicetypes.
* Service types are stored as desktop files in $TDEHOME/share/servicetypes.
* @see KService
*/
class KIO_EXPORT KServiceType : public KSycocaEntry

+ 1
- 1
kio/tests/ksycocatest.cpp View File

@@ -193,7 +193,7 @@ int main(int argc, char *argv[])


//
debug("\nTrying findByURL for $KDEDIR/bin/kdesktop");
debug("\nTrying findByURL for $TDEDIR/bin/kdesktop");
KMimeType::Ptr mf = KMimeType::findByURL( KStandardDirs::findExe( "kdesktop" ), 0,
true, false );
assert( mf );

+ 16
- 16
kio/tests/kurifiltertest.cpp View File

@@ -154,8 +154,8 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv)
{
// Ensure that user configuration doesn't change the results of those tests
// KDEHOME needs to be writable though, for a ksycoca database
setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true );
// TDEHOME needs to be writable though, for a ksycoca database
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true );
setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

KAboutData aboutData(appName, programName, version, description);
@@ -214,7 +214,7 @@ int main(int argc, char **argv)

// ShortURI/LocalDomain filter tests. NOTE: any of these tests can fail
// if you have specified your own patterns in kshorturifilterrc. For
// examples, see $KDEDIR/share/config/kshorturifilterrc .
// examples, see $TDEDIR/share/config/kshorturifilterrc .
filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL );
@@ -290,7 +290,7 @@ int main(int argc, char **argv)

TQCString qtdir=getenv("QTDIR");
TQCString home = getenv("HOME");
TQCString kdehome = getenv("KDEHOME");
TQCString kdehome = getenv("TDEHOME");

filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
@@ -301,31 +301,31 @@ int main(int argc, char **argv)
if (kdehome.isEmpty())
{
kdehome += "$HOME/.kde";
setenv("KDEHOME", kdehome.data(), 0);
setenv("TDEHOME", kdehome.data(), 0);
}

filter( "$KDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR );
KStandardDirs::makeDir( kdehome+"/a+plus" );
filter( "$KDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR );

// BR 27788
KStandardDirs::makeDir( kdehome+"/share/Dir With Space" );
filter( "$KDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );

// support for name filters (BR 93825)
filter( "$KDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR );
filter( "$KDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR );
filter( "$KDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
filter( "$KDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
// but let's check that a directory with * in the name still works
KStandardDirs::makeDir( kdehome+"/share/Dir*With*Stars" );
filter( "$KDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
KStandardDirs::makeDir( kdehome+"/share/Dir?QuestionMark" );
filter( "$KDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
KStandardDirs::makeDir( kdehome+"/share/Dir[Bracket" );
filter( "$KDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
filter( "$TDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );

filter( "$HOME/$KDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
filter( "$1/$2/$3", "http://www.google.com/search?q=$1/$2/$3&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // can be used as bogus or valid test. Currently triggers default search, i.e. google
filter( "$$$$", "http://www.google.com/search?q=$$$$&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // worst case scenarios.


+ 1
- 1
kmdi/test/README View File

@@ -8,7 +8,7 @@ Call
qmake kFourChildren -o Makefile
make
to build the example app.
Likely you must set the environment variable KDEDIR (to e.g. /opt/trinity).
Likely you must set the environment variable TDEDIR (to e.g. /opt/trinity).




+ 1
- 1
kparts/browserview.desktop View File

@@ -152,6 +152,6 @@ Type=QString
# If the part has a plugin for KHTML Javascript's window.navigator.plugins
# array, it should create a plugin info file and set this propery to the
# file path here. The path should be relative to KDE's data dir
# ($KDEDIR/share/apps)
# ($TDEDIR/share/apps)
[PropertyDef::X-KDE-BrowserView-PluginsInfo]
Type=QString

+ 1
- 1
kparts/plugin.h View File

@@ -40,7 +40,7 @@ namespace KParts
*
* If you want this plugin to be used by a part, you need to
* install the rc file under the directory
* "data" (KDEDIR/share/apps usually)+"/instancename/kpartplugins/"
* "data" (TDEDIR/share/apps usually)+"/instancename/kpartplugins/"
* where instancename is the name of the part's instance.
*
* You should also install a "plugin info" .desktop file with the same name.

+ 2
- 2
kparts/tests/README View File

@@ -1,5 +1,5 @@
In order to test embedding the notepad part in konqueror, you need
to "make install", to install the libs, and to copy notepad.desktop
into $KDEDIR/share/services/, and remove kwrite.desktop from
$KDEDIR/share/applnk/... (at least the ServiceTypes line of it)
into $TDEDIR/share/services/, and remove kwrite.desktop from
$TDEDIR/share/applnk/... (at least the ServiceTypes line of it)


+ 1
- 1
kutils/kdeglobals.kcfg View File

@@ -450,7 +450,7 @@
<entry key="Autostart" type="Path" >
<label>Path to the autostart directory</label>
<whatsthis>Path to the directory containing executables to be run on session login</whatsthis>
<default>$KDEHOME/Autostart</default>
<default>$TDEHOME/Autostart</default>
</entry>
<entry key="Desktop" type="Path" >
<label>Path to the desktop directory</label>

+ 2
- 2
tdecore/DESIGN.kconfig View File

@@ -52,7 +52,7 @@ void deleteEntry(key); // Remove entry

Note that there is a subtle difference between revertToDefault() and deleteEntry().
revertToDefault() will change the entry to the default value set by the system
administrator (Via e.g. $KDEDIR/share/config) or, if no such default was set,
administrator (Via e.g. $TDEDIR/share/config) or, if no such default was set,
non-existant.
deleteEntry() will make the entry non-existant.

@@ -123,7 +123,7 @@ mandatory if enums become an explicit type.


Instead of relying on the defaults that are hard-coded in the application,
rely on default configuration files being installed in $KDEDIR. The technical
rely on default configuration files being installed in $TDEDIR. The technical
changes required for this are very minimal, it is mostly a change in policy.

Type information can be provide by preceding every entry with a formalized

+ 25
- 25
tdecore/README.kiosk View File

@@ -24,17 +24,17 @@ for its applications. Resources range from icons, wallpapers, fonts to
sounds, menu-descriptions and configuration files.

In KDE1 there were two locations were resources could be located: The
resources provided by the system were located under $KDEDIR and user-
resources provided by the system were located under $TDEDIR and user-
specific resources were located under $HOME/.kde.

In KDE2 resource management has been largely abstracted by the introduction
of the KStandardDirs class and has become much more flexible. The user /
administrator can now specify a variable number of locations where resources
can be found. A list of locations can either be specified via $KDEDIRS
can be found. A list of locations can either be specified via $TDEDIRS
(notice the extra 'S'), via /etc/kderc and even via the kdeglobals config
file. The location where user-specific resources can be found can be
set with $KDEHOME (The default is $HOME/.kde). Changes made by the user
are always written back to $KDEHOME.
set with $TDEHOME (The default is $HOME/.kde). Changes made by the user
are always written back to $TDEHOME.

Both KDE1 and KDE2 feature so called "cascading configuration files": There
can be multiple configuration files with the same name in the various
@@ -42,29 +42,29 @@ locations for (config) resources, when that is the case, the information of
all these configuration files is combined on a key by key basis. If the same
key (within a certain group) is defined in more than one place, the value
of the key for the config file that was read last will override any previously
read values. Configuration files under $KDEHOME are always read last. This
read values. Configuration files under $TDEHOME are always read last. This
ensures that after a configuration entry is written, the same value wil be
read back.

In KDE3 two important changes have been made:

* Default values are no longer written.
When a configuration file in a location other than $KDEHOME defines a value
When a configuration file in a location other than $TDEHOME defines a value
for a key and the application subsequently writes out a new configuration file
to $KDEHOME, that configuration file will only contain an entry for the key
to $TDEHOME, that configuration file will only contain an entry for the key
if its value differs from the value read from the other file.

This counters the problem that changing default configuration files under
$KDEDIR would not take effect for users, since these users would most likely
have their own copy of these settings under $KDEHOME. KDE3 will make sure
not to copy these settings so changes made under $KDEDIR will affect all users
$TDEDIR would not take effect for users, since these users would most likely
have their own copy of these settings under $TDEHOME. KDE3 will make sure
not to copy these settings so changes made under $TDEDIR will affect all users
that haven't explicitly changed the affected settings to something else.

* Configuration entries can be marked "immutable".
Starting with KDE3, configuration entries can be marked "immutable". When a
configuration entry is immutable it means that configuration files that are
read later will not be able to override its value. Immutable entries cannot
be changed via KConfig and if the entry is present under $KDEHOME it will
be changed via KConfig and if the entry is present under $TDEHOME it will
be ignored.

Entries can be marked immutable on 4 different levels:
@@ -383,8 +383,8 @@ shell_access
option (Alt-F2) can be used to run shell-commands and arbitrary
executables. Likewise, executables placed in the user's
Autostart folder will no longer be executed. Applications can
still be autostarted by placing .desktop files in the $KDEHOME/Autostart
or $KDEDIR/share/autostart directory.
still be autostarted by placing .desktop files in the $TDEHOME/Autostart
or $TDEDIR/share/autostart directory.
See also run_desktop_files.

custom_config
@@ -416,13 +416,13 @@ run_desktop_files
part of the default desktop, KDE menu, registered services and
autostarting services.
* The default desktop includes the files under
$KDEDIR/share/kdesktop/Desktop but _NOT_ the files under
$TDEDIR/share/kdesktop/Desktop but _NOT_ the files under
$HOME/Desktop.
* The KDE menu includes all files under $KDEDIR/share/applnk and
* The KDE menu includes all files under $TDEDIR/share/applnk and
$XDGDIR/applications
* Registered services includes all files under $KDEDIR/share/services.
* Autostarting services include all files under $KDEDIR/share/autostart
but _NOT_ the files under $KDEHOME/Autostart
* Registered services includes all files under $TDEDIR/share/services.
* Autostarting services include all files under $TDEDIR/share/autostart
but _NOT_ the files under $TDEHOME/Autostart

You probably also want to activate the following resource
restictions:
@@ -432,7 +432,7 @@ run_desktop_files
"services" - To restrict registered services.
"autostart" - To restrict autostarting services.
Otherwise users can still execute .desktop files by placing them
in e.g. $KDEHOME/share/kdesktop/Desktop
in e.g. $TDEHOME/share/kdesktop/Desktop

lineedit_text_completion
- defines whether input lines should have the potential to remember
@@ -553,14 +553,14 @@ Some remarks:
KDE3 Resource Restrictions
==========================
Most KDE applications make use of additional resource files that are typically
located in directories under $KDEDIR/share. By default KDE allows users to
located in directories under $TDEDIR/share. By default KDE allows users to
override any of these resources by placing files in the same location
under $KDEHOME/share. For example, Konsole stores profiles under
$KDEDIR/share/apps/konsole and users can add additional profiles by
installing files in $KDEHOME/share/apps/konsole.
under $TDEHOME/share. For example, Konsole stores profiles under
$TDEDIR/share/apps/konsole and users can add additional profiles by
installing files in $TDEHOME/share/apps/konsole.

KDE3 Resource Restrictions make it possible to restrict the lookup of files
to directories outside of $KDEHOME only.
to directories outside of $TDEHOME only.

The following resources are defined:

@@ -589,7 +589,7 @@ data_<appname> - covers the sub section for <appname> in the data resource.
To restrict resources the kdeglobals file should contain the
group "[KDE Resource Restrictions]", each resource can then be restricted by
adding "<resource>=false". E.g. to restrict the "wallpaper" resource to
$KDEDIR/share/wallpapers one would add:
$TDEDIR/share/wallpapers one would add:
[KDE Resource Restrictions][$i]
wallpaper=false


+ 1
- 1
tdecore/kaudioplayer.h View File

@@ -75,7 +75,7 @@ public:
* Static play function.
*
* @param filename Absolute path to the filename of the sound file to play.
* if not absolute, goes off KDEDIR/share/sounds/ (preferred)
* if not absolute, goes off TDEDIR/share/sounds/ (preferred)
*/
static void play(const TQString &filename);


+ 1
- 1
tdecore/kcrash.cpp View File

@@ -434,7 +434,7 @@ static int openSocket()
#define MAX_SOCK_FILE 255
char sock_file[MAX_SOCK_FILE + 1];
const char *home_dir = getenv("HOME");
const char *kde_home = getenv("KDEHOME");
const char *kde_home = getenv("TDEHOME");
char *display;

sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;

+ 1
- 1
tdecore/kdebugrc View File

@@ -2,7 +2,7 @@
# This allows to leave the kdDebug* calls in the code, but still have them
# disabled for most users.
#
# This file will be installed as $KDEDIR/share/config/kdebugrc
# This file will be installed as $TDEDIR/share/config/kdebugrc
#
# There are four levels of output: Info, Warn, Error and Fatal
# corresponding to kdDebug(), kdWarn(), kdError(), kdFatal()

+ 1
- 1
tdecore/knotifyclient.h View File

@@ -27,7 +27,7 @@ class KInstance;
* This namespace provides a method for issuing events to a KNotifyServer
* call KNotifyClient::event("eventname"); to issue it.
* On installation, there should be a file called
* $KDEDIR/share/apps/appname/eventsrc which contains the events.
* $TDEDIR/share/apps/appname/eventsrc which contains the events.
*
* The file looks like this:
* \code

+ 11
- 11
tdecore/kstandarddirs.cpp View File

@@ -167,7 +167,7 @@ static void priorityAdd(TQStringList &prefixes, const TQString& dir, bool priori
{
if (priority && !prefixes.isEmpty())
{
// Add in front but behind $KDEHOME
// Add in front but behind $TDEHOME
TQStringList::iterator it = prefixes.begin();
it++;
prefixes.insert(it, 1, dir);
@@ -1253,13 +1253,13 @@ TQString KStandardDirs::kfsstnd_defaultprefix()
if (!s->defaultprefix.isEmpty())
return s->defaultprefix;
#ifdef Q_WS_WIN
s->defaultprefix = readEnvPath("KDEDIR");
s->defaultprefix = readEnvPath("TDEDIR");
if (s->defaultprefix.isEmpty()) {
s->defaultprefix = TQFile::decodeName("c:\\kde");
//TODO: find other location (the Registry?)
}
#else //UNIX
s->defaultprefix = KDEDIR;
s->defaultprefix = TDEDIR;
#endif
if (s->defaultprefix.isEmpty())
kdWarning() << "KStandardDirs::kfsstnd_defaultprefix(): default KDE prefix not found!" << endl;
@@ -1287,15 +1287,15 @@ void KStandardDirs::addKDEDefaults()
{
TQStringList kdedirList;

// begin KDEDIRS
TQString kdedirs = readEnvPath("KDEDIRS");
// begin TDEDIRS
TQString kdedirs = readEnvPath("TDEDIRS");
if (!kdedirs.isEmpty())
{
tokenize(kdedirList, kdedirs, TQChar(KPATH_SEPARATOR));
}
else
{
TQString kdedir = readEnvPath("KDEDIR");
TQString kdedir = readEnvPath("TDEDIR");
if (!kdedir.isEmpty())
{
kdedir = KShell::tildeExpand(kdedir);
@@ -1303,8 +1303,8 @@ void KStandardDirs::addKDEDefaults()
}
}

#ifndef Q_OS_WIN //no default KDEDIR on win32 defined
kdedirList.append(KDEDIR);
#ifndef Q_OS_WIN //no default TDEDIR on win32 defined
kdedirList.append(TDEDIR);
#endif

#ifdef __KDE_EXECPREFIX
@@ -1324,10 +1324,10 @@ void KStandardDirs::addKDEDefaults()
if (getuid() == 0) {
localKdeDir = readEnvPath("KDEROOTHOME");
if (localKdeDir.isEmpty() == true)
localKdeDir = readEnvPath("KDEHOME");
localKdeDir = readEnvPath("TDEHOME");
}
else {
localKdeDir = readEnvPath("KDEHOME");
localKdeDir = readEnvPath("TDEHOME");
}
if (!localKdeDir.isEmpty())
{
@@ -1352,7 +1352,7 @@ void KStandardDirs::addKDEDefaults()
TQString dir = KShell::tildeExpand(*it);
addPrefix(dir);
}
// end KDEDIRS
// end TDEDIRS

// begin XDG_CONFIG_XXX
TQStringList xdgdirList;

+ 10
- 10
tdecore/kstandarddirs.h View File

@@ -105,17 +105,17 @@ class KStandardDirsPrivate;
*
* <b>KStandardDirs supports the following environment variables:</b>
*
* @li KDEDIRS: This may set an additional number of directory prefixes to
* @li TDEDIRS: This may set an additional number of directory prefixes to
* search for resources. The directories should be separated
* by ':'. The directories are searched in the order they are
* specified.
* @li KDEDIR: Used for backwards compatibility. As KDEDIRS but only a single
* directory may be specified. If KDEDIRS is set KDEDIR is
* @li TDEDIR: Used for backwards compatibility. As TDEDIRS but only a single
* directory may be specified. If TDEDIRS is set TDEDIR is
* ignored.
* @li KDEHOME: The directory where changes are saved to. This directory is
* used to search for resources first. If KDEHOME is not
* @li TDEHOME: The directory where changes are saved to. This directory is
* used to search for resources first. If TDEHOME is not
* specified it defaults to "$HOME/.kde"
* @li KDEROOTHOME: Like KDEHOME, but used for the root user.
* @li KDEROOTHOME: Like TDEHOME, but used for the root user.
* If KDEROOTHOME is not set it defaults to the .kde directory in the
* home directory of root, usually "/root/.kde".
* Note that the setting of $HOME is ignored in this case.
@@ -139,7 +139,7 @@ public:
* Adds another search dir to front of the @p fsstnd list.
*
* @li When compiling tdelibs, the prefix is added to this.
* @li KDEDIRS or KDEDIR is taking into account
* @li TDEDIRS or TDEDIR is taking into account
* @li Additional dirs may be loaded from kdeglobals.
*
* @param dir The directory to append relative paths to.
@@ -213,7 +213,7 @@ public:
* for resources. So is a way to get the path to libtdecore.la
* to findResource("lib", "libtdecore.la"). KStandardDirs will
* then look into the subdir lib of all elements of all prefixes
* ($KDEDIRS) for a file libtdecore.la and return the path to
* ($TDEDIRS) for a file libtdecore.la and return the path to
* the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
*
* @param type The type of the wanted resource
@@ -232,7 +232,7 @@ public:
*
* E.g. by restricting the "wallpaper" resource, only system-wide
* installed wallpapers will be found by this class. Wallpapers
* installed under the $KDEHOME directory will be ignored.
* installed under the $TDEHOME directory will be ignored.
*
* @param type The type of the resource to check
* @param relPath A relative path in the resource.
@@ -631,7 +631,7 @@ public:

// Like their public counter parts but with an extra priority argument
// If priority is true, the directory is added directly after
// $KDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
// $TDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
void addPrefix( const TQString& dir, bool priority );
void addXdgConfigPrefix( const TQString& dir, bool priority );
void addXdgDataPrefix( const TQString& dir, bool priority );

+ 1
- 1
tdecore/ksycoca.h View File

@@ -99,7 +99,7 @@ public:
* @internal - returns update signature of database
*
* Signature that keeps track of changes to
* $KDEDIR/share/services/update_ksycoca
* $TDEDIR/share/services/update_ksycoca
*
* Touching this file causes the database to be recreated
* from scratch.

+ 1
- 1
tdecore/ktempdir.h View File

@@ -57,7 +57,7 @@ public:
* Creates a temporary directory with the name:
* \p \<directoryPrefix\>\<six letters\>
*
* The default \p directoryPrefix is "$KDEHOME/tmp-$HOST/appname"
* The default \p directoryPrefix is "$TDEHOME/tmp-$HOST/appname"
* @param directoryPrefix the prefix of the file name, or
* TQString::null for the default value
* @param mode the file permissions,

+ 1
- 1
tdecore/ktempfile.h View File

@@ -60,7 +60,7 @@ public:
* Creates a temporary file with the name:
* \<filePrefix>\<six letters>\<fileExtension>
*
* The default @p filePrefix is "$KDEHOME/tmp-$HOST/appname/"
* The default @p filePrefix is "$TDEHOME/tmp-$HOST/appname/"
* The default @p fileExtension is ".tmp"
* @param filePrefix the prefix of the file name, or TQString::null
* for the default value

+ 1
- 1
tdesu/client.cpp View File

@@ -388,7 +388,7 @@ int KDEsuClient::stopServer()
static TQString findDaemon()
{
TQString daemon = locate("bin", "tdesud");
if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH
if (daemon.isEmpty()) // if not in TDEDIRS, rely on PATH
daemon = KStandardDirs::findExe("tdesud");

if (daemon.isEmpty())

+ 1
- 1
tdeui/kpanelextension.h View File

@@ -43,7 +43,7 @@ class KPanelExtensionPrivate;
* external wrapper process.
*
* The panel locates available extensions by searching for extension desktop
* files in (ALL_KDEDIRS)/share/apps/kicker/extensions. Every panel extension should
* files in (ALL_TDEDIRS)/share/apps/kicker/extensions. Every panel extension should
* install a desktop file there to be recognized by the panel.
*
* Besides standard keys like "Name", "Comment" and "Icon" there are

+ 1
- 1
tdeui/kpanelmenu.h View File

@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
* Finally, you also have to provide a desktop file describing your dynamic menu. The
* relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
* library name without any extension). This desktop file has to be installed in
* $KDEDIR/share/apps/kicker/menuext/.
* $TDEDIR/share/apps/kicker/menuext/.
*
* @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
*/

+ 1
- 1
win/common.pro View File

@@ -46,7 +46,7 @@ contains(KW_CONFIG,console) {

# global binary destination directory
isEmpty( KDEBINDESTDIR ) {
KDEBINDESTDIR = $(KDEDIR)
KDEBINDESTDIR = $(TDEDIR)
}

# global library destination directory

+ 1
- 1
win/config.h View File

@@ -36,7 +36,7 @@
#define HAVE_SYS_TIME_H 1
#endif

/*#define KDEDIR "F:\\KDE" TODO */
/*#define TDEDIR "F:\\KDE" TODO */

#define KDELIBSUFF ""


+ 2
- 2
win/pro_files/kmdi/test/test.pro View File

@@ -10,8 +10,8 @@ CONFIG += debug
CONFIG += console

unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT
unix:LIBS += -lkmdi -L$(KDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts
unix:INCLUDEPATH += . .. $(KDEDIR)/include
unix:LIBS += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts
unix:INCLUDEPATH += . .. $(TDEDIR)/include

LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX


+ 1
- 1
win/pro_files/tdefx/tdefx_rel.pro View File

@@ -12,7 +12,7 @@ DEFINES += MAKE_TDEFX_LIB

system( moc kstyle.h -o moc/kstyle.moc )

LIBS -= "$(KDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(KDEDIR)\lib\ltdl_$(KDE_VER).lib"
LIBS -= "$(TDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(TDEDIR)\lib\ltdl_$(KDE_VER).lib"

SOURCES = \
kimageeffect.cpp \

+ 2
- 2
win/tdelibs_global_win.h View File

@@ -79,8 +79,8 @@ int kde_start
#ifdef __cplusplus
#include <tqstring.h>

# ifndef KDEDIR
# define KDEDIR TQString(KDEWIN32_DIR)
# ifndef TDEDIR
# define TDEDIR TQString(KDEWIN32_DIR)
# endif
# ifndef __KDE_BINDIR
# define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin")

+ 2
- 2
win/tools/.check_kde_env View File

@@ -7,8 +7,8 @@ if [ -z "$KDEWIN" ] ; then
exit 1
fi

if [ -z "$KDEDIR" ] ; then
echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde"
if [ -z "$TDEDIR" ] ; then
echo `basename $0`": \$TDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde"
exit 1
fi


+ 2
- 2
win/tools/build_tdelibs_dbg View File

@@ -16,7 +16,7 @@ echo "-------------------------------------------------"
echo "Building Debug Version of KDElibs/win32"
echo "Source directory: \$KDELIBS = $KDELIBS"
echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
echo "Destination directory: \$KDEDIR = $KDEDIR"
echo "Destination directory: \$TDEDIR = $TDEDIR"
if [ -n $noclean ] ; then
echo "Options: noclean"
fi
@@ -73,7 +73,7 @@ qmake makekdewidgets.pro && $make clean && $make || exit 1
qmake && $make clean && $make || exit 1

# copy kdewidgets plugin for Qt Designer
cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
cp $TDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/

cd $pwd


+ 1
- 1
win/tools/build_tdelibs_rel View File

@@ -16,7 +16,7 @@ echo "-------------------------------------------------"
echo "Building Release Version of KDElibs/win32"
echo "Source directory: \$KDELIBS = $KDELIBS"
echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
echo "Destination directory: \$KDEDIR = $KDEDIR"
echo "Destination directory: \$TDEDIR = $TDEDIR"
if [ -n $noclean ] ; then
echo "Options: noclean"
fi

+ 1
- 1
win/tools/kde_env_custom.template View File

@@ -7,7 +7,7 @@
MSVC="c:\\vs7"

# Top KDE Directory - target of your compilation, please change
export KDEDIR="c:\\kde"
export TDEDIR="c:\\kde"

# KDElibs/win32 top source directory, please change
KDEWIN="c:\\kdewin32"

Loading…
Cancel
Save