Rename KDEHOME and KDEDIR

pull/1/head
Timothy Pearson 13 years ago
parent 9e7608eef5
commit 473aa7b12a

@ -4,7 +4,7 @@ use Config;
# the contents of the Makefile that is written. # the contents of the Makefile that is written.
print "Trying to find some configuration information...\n"; print "Trying to find some configuration information...\n";
my $kde_dirs = $ENV{KDEDIRS} || '/usr/local/kde'; my $kde_dirs = $ENV{TDEDIRS} || '/usr/local/kde';
my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt'; my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt';
my $kde_inc = "$kde_dirs/include"; my $kde_inc = "$kde_dirs/include";
my $kde_lib = "$kde_dirs/lib"; my $kde_lib = "$kde_dirs/lib";

@ -24,7 +24,7 @@ rm -rf $RPM_BUILD_ROOT
make -f Makefile.cvs make -f Makefile.cvs
%build %build
export KDEDIR=%{prefix} QTDIR=%{qtdir} export TDEDIR=%{prefix} QTDIR=%{qtdir}
CXXFLAGS="$RPM_OPT_FLAGS -I%{prefix}/include/kde" ./configure \ CXXFLAGS="$RPM_OPT_FLAGS -I%{prefix}/include/kde" ./configure \
--prefix=%{prefix} --prefix=%{prefix}
make CXXFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG" make CXXFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG"

@ -63,7 +63,7 @@ public class KAudioPlayer extends TQObject {
/** /**
Static play function. Static play function.
@param filename Absolute path to the filename of the sound file to play. @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)
@short Static play function. @short Static play function.
*/ */
public static native void play(String filename); public static native void play(String filename);

@ -10,7 +10,7 @@ import org.kde.qt.QtSupport;
Determine auto-magically the type of file, Determine auto-magically the type of file,
not only by using its extension, but also by reading its contents. not only by using its extension, but also by reading its contents.
Unless specified otherwise, KMimeMagic uses 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, To make KMimeMagic restore the 'atime' of a file after it opened it,
add its directory in kmimemagicrc like: add its directory in kmimemagicrc like:
[Settings] [Settings]

@ -9,7 +9,7 @@ import org.kde.qt.QtSupport;
This namespace provides a method for issuing events to a KNotifyServer This namespace provides a method for issuing events to a KNotifyServer
call KNotifyClient.event("eventname"); to issue it. call KNotifyClient.event("eventname"); to issue it.
On installation, there should be a file called 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: The file looks like this:
<pre> <pre>
[!Global!] [!Global!]

@ -24,7 +24,7 @@ import org.kde.qt.TQFrame;
untrusted third party extensions directly into its namespace but via an untrusted third party extensions directly into its namespace but via an
external wrapper process. external wrapper process.
The panel locates available extensions by searching for extension desktop 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. install a desktop file there to be recognized by the panel.
Besides standard keys like "Name", "Comment" and "Icon" there are Besides standard keys like "Name", "Comment" and "Icon" there are
two panel extension specific keys: two panel extension specific keys:

@ -18,7 +18,7 @@ import org.kde.qt.TQWidget;
Finally, you also have to provide a desktop file describing your dynamic menu. The 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 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 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> @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
@short Base class to build dynamically loaded menu entries for the K-menu, or the panel. @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.

@ -197,7 +197,7 @@ public class KService extends KSycocaEntry {
Returns the path to the location where the service desktop entry Returns the path to the location where the service desktop entry
is stored. is stored.
This is a relative path if the desktop entry was found in any 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 It is a full path if the desktop entry originates from another
location. location.
@return the path of the service's desktop file, @return the path of the service's desktop file,

@ -13,7 +13,7 @@ import org.kde.qt.TQVariant;
instead of a type of file. instead of a type of file.
For instance, KOfficeFilter is a service type. For instance, KOfficeFilter is a service type.
It is associated to services according to the user profile (kuserprofile.h). 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.
@short A service type is the generic notion for a mimetype, a type of service instead of a type of file. @short A service type is the generic notion for a mimetype, a type of service instead of a type of file.
@see KService @see KService

@ -138,26 +138,26 @@ import java.util.ArrayList;
<b>KStandardDirs supports the following environment variables:</b> <b>KStandardDirs supports the following environment variables:</b>
<li> <li>
KDEDIRS: This may set an additional number of directory prefixes to TDEDIRS: This may set an additional number of directory prefixes to
search for resources. The directories should be separated search for resources. The directories should be separated
by ':'. The directories are searched in the order they are by ':'. The directories are searched in the order they are
specified. specified.
</li> </li>
<li> <li>
KDEDIR: Used for backwards compatibility. As KDEDIRS but only a single TDEDIR: Used for backwards compatibility. As TDEDIRS but only a single
directory may be specified. If KDEDIRS is set KDEDIR is directory may be specified. If TDEDIRS is set TDEDIR is
ignored. ignored.
</li> </li>
<li> <li>
KDEHOME: The directory where changes are saved to. This directory is TDEHOME: The directory where changes are saved to. This directory is
used to search for resources first. If KDEHOME is not used to search for resources first. If TDEHOME is not
specified it defaults to "$HOME/.kde" specified it defaults to "$HOME/.kde"
</li> </li>
<li> <li>
KDEROOTHOME: Like KDEHOME, but used for the root user. KDEROOTHOME: Like TDEHOME, but used for the root user.
If KDEROOTHOME is not set it defaults to the .kde directory in the If KDEROOTHOME is not set it defaults to the .kde directory in the
home directory of root, usually "/root/.kde". home directory of root, usually "/root/.kde".
Note that the setting of $HOME is ignored in this case. Note that the setting of $HOME is ignored in this case.
@ -189,7 +189,7 @@ public class KStandardDirs implements QtSupport {
</li> </li>
<li> <li>
KDEDIRS or KDEDIR is taking into account TDEDIRS or TDEDIR is taking into account
</li> </li>
<li> <li>
@ -264,7 +264,7 @@ public class KStandardDirs implements QtSupport {
for resources. So is a way to get the path to libtdecore.la for resources. So is a way to get the path to libtdecore.la
to findResource("lib", "libtdecore.la"). KStandardDirs will to findResource("lib", "libtdecore.la"). KStandardDirs will
then look into the subdir lib of all elements of all prefixes 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) the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
@param type The type of the wanted resource @param type The type of the wanted resource
@param filename A relative filename of the resource. @param filename A relative filename of the resource.
@ -280,7 +280,7 @@ public class KStandardDirs implements QtSupport {
specific files in the resource are ignored. specific files in the resource are ignored.
E.g. by restricting the "wallpaper" resource, only system-wide E.g. by restricting the "wallpaper" resource, only system-wide
installed wallpapers will be found by this class. Wallpapers 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 type The type of the resource to check
@param relPath A relative path in the resource. @param relPath A relative path in the resource.
@return True if the resource is restricted. @return True if the resource is restricted.

@ -54,7 +54,7 @@ public class KSycoca extends TQObject implements DCOPObjectInterface {
public native int timeStamp(); public native int timeStamp();
/** /**
Signature that keeps track of changes to 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 Touching this file causes the database to be recreated
from scratch. from scratch.
@short @short

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

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

@ -20,7 +20,7 @@ import org.kde.qt.TQObject;
the plugin. the plugin.
If you want this plugin to be used by a part, you need to If you want this plugin to be used by a part, you need to
install the rc file under the directory 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. where instancename is the name of the part's instance.
You should also install a "plugin info" .desktop file with the same name. You should also install a "plugin info" .desktop file with the same name.
\see PluginInfo \see PluginInfo

@ -7,7 +7,7 @@ The test app is in Test.java
To test it, you should do the following: To test it, you should do the following:
set your CLASSPATH (qtjava.jar & koala.jar) set your CLASSPATH (qtjava.jar & koala.jar)
set your LD_LIBRARY_PATH (${KDEDIR}/lib set your LD_LIBRARY_PATH (${TDEDIR}/lib
compile it (javac *.java) compile it (javac *.java)
$javac *.java $javac *.java

@ -69,7 +69,7 @@ http://developer.kde.org/documentation/tutorials/dot/dcopiface/dcop-interface.ht
http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/
2. Install that gettext in ~/bin/ 2. Install that gettext in ~/bin/
3. cd ~/yourproject, export PATH=~/bin:$PATH, export 3. cd ~/yourproject, export PATH=~/bin:$PATH, export
KDEDIR=/where_your_KDE3_is TDEDIR=/where_your_KDE3_is
4. make -f admin/Makefile.common package-messages 4. make -f admin/Makefile.common package-messages
5. make package-messages 5. make package-messages
6. Translate the po files (not the pot!!) with kbabel or xemacs 6. Translate the po files (not the pot!!) with kbabel or xemacs

@ -1,5 +1,5 @@
#To install #To install
>unshar -d $YOURKDEDIR envelopemaker.sh >unshar -d $YOURTDEDIR envelopemaker.sh
#To package #To package
>sh -x package.sh >sh -x package.sh

@ -239,8 +239,8 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
else if ( id == MethodImport ) { else if ( id == MethodImport ) {
#ifndef QT_ONLY #ifndef QT_ONLY
// Scan $KDEDIRS/share/apps/$APPNAME/ // Scan $TDEDIRS/share/apps/$APPNAME/
// Scan $KDEDIRS/share/apps/kjsembed/ // Scan $TDEDIRS/share/apps/kjsembed/
KGlobal::dirs()->addResourceType("kjsembed", KStandardDirs::kde_default("data") +"/kjsembed/"); KGlobal::dirs()->addResourceType("kjsembed", KStandardDirs::kde_default("data") +"/kjsembed/");
TQString fname = KGlobal::dirs ()->findResource ("kjsembed", TQString(arg0)); TQString fname = KGlobal::dirs ()->findResource ("kjsembed", TQString(arg0));

@ -58,7 +58,7 @@ class MainWin < KDE::MainWindow
# menuapp2.rb. Otherwise, the menuapp2 and menuapp3 # menuapp2.rb. Otherwise, the menuapp2 and menuapp3
# are identical 'createGUI' expects to find 'menuapp3ui.rc' # are identical 'createGUI' expects to find 'menuapp3ui.rc'
# either in the directory menuapp3.rb is run from, or # either in the directory menuapp3.rb is run from, or
# in $KDEDIR/apps/menuapp3/ # in $TDEDIR/apps/menuapp3/
createGUI() createGUI()
# Create the status bar # Create the status bar
@ -83,7 +83,7 @@ class MainWin < KDE::MainWindow
# The standard actions only need to specify the slot # The standard actions only need to specify the slot
# where the code for the action is located # where the code for the action is located
# Because the XMLGUI mechanism parses $KDEDIR/config/ui/ui_standards.rc # Because the XMLGUI mechanism parses $TDEDIR/config/ui/ui_standards.rc
# before parsing and merging menuapp3ui.rc, it actually isn't # before parsing and merging menuapp3ui.rc, it actually isn't
# necessary to list KDE::StdAction actions in menuapp3.rc. THE XMLGUI # necessary to list KDE::StdAction actions in menuapp3.rc. THE XMLGUI
# code will create menu/toolbar items and place them *automatically* # code will create menu/toolbar items and place them *automatically*

@ -15,7 +15,7 @@ class KIconCollection
"32x32" "32x32"
end end
def kdedir def kdedir
ENV["KDEDIR"] ENV["TDEDIR"]
end end
def get_icon_path(icon_type) def get_icon_path(icon_type)
info = @icon_info[icon_type] info = @icon_info[icon_type]
@ -51,4 +51,4 @@ icon_collections = {
} }
} }
$kIcons = KIconCollection.new(icon_collections) $kIcons = KIconCollection.new(icon_collections)
print "Using KDEDIR == ", $kIcons.kdedir, "\n" print "Using TDEDIR == ", $kIcons.kdedir, "\n"

@ -73,7 +73,7 @@ my %excludes = (
'qwindowsxpstyle.h' => 1 # play on the safe side 'qwindowsxpstyle.h' => 1 # play on the safe side
); );
# Some systems have a QTDIR = KDEDIR = PREFIX # Some systems have a QTDIR = TDEDIR = PREFIX
# We need a complete list # We need a complete list
my %includes; my %includes;
@ -117,7 +117,7 @@ my %kdeexcludes = (
'knotifywidgetbase.h' => 1, 'knotifywidgetbase.h' => 1,
); );
# Some systems have a QTDIR = KDEDIR = PREFIX # Some systems have a QTDIR = TDEDIR = PREFIX
# We need a complete list # We need a complete list
my %kdeincludes; my %kdeincludes;

@ -80,7 +80,7 @@ my %excludes = (
'qwindowsxpstyle.h' => 1 # play on the safe side 'qwindowsxpstyle.h' => 1 # play on the safe side
); );
# Some systems have a QTDIR = KDEDIR = PREFIX # Some systems have a QTDIR = TDEDIR = PREFIX
# We need a complete list # We need a complete list
my %includes; my %includes;

Loading…
Cancel
Save