From e3ea15d255e93780eb08507aac726f305ae2ffb3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 8 Dec 2011 17:40:23 -0600 Subject: Rename additional KDE strings --- kdejava/koala/kdejava/KStandardDirs.cpp | 4 ++-- kdejava/koala/kdejava/KStandardDirs.h | 2 +- kdejava/koala/org/kde/koala/KStandardDirs.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kdejava') diff --git a/kdejava/koala/kdejava/KStandardDirs.cpp b/kdejava/koala/kdejava/KStandardDirs.cpp index ebab9052..d2c56c7d 100644 --- a/kdejava/koala/kdejava/KStandardDirs.cpp +++ b/kdejava/koala/kdejava/KStandardDirs.cpp @@ -334,10 +334,10 @@ Java_org_kde_koala_KStandardDirs_kfsstnd_1xdg_1data_1prefixes(JNIEnv* env, jobje } JNIEXPORT jstring JNICALL -Java_org_kde_koala_KStandardDirs_localkdedir(JNIEnv* env, jobject obj) +Java_org_kde_koala_KStandardDirs_localtdedir(JNIEnv* env, jobject obj) { TQString _qstring; - _qstring = ((KStandardDirs*) QtSupport::getQt(env, obj))->localkdedir(); + _qstring = ((KStandardDirs*) QtSupport::getQt(env, obj))->localtdedir(); return QtSupport::fromTQString(env, &_qstring); } diff --git a/kdejava/koala/kdejava/KStandardDirs.h b/kdejava/koala/kdejava/KStandardDirs.h index 15b001d8..68c55a2c 100644 --- a/kdejava/koala/kdejava/KStandardDirs.h +++ b/kdejava/koala/kdejava/KStandardDirs.h @@ -38,7 +38,7 @@ extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_relativeLocati extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_kfsstnd_1prefixes (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_kfsstnd_1xdg_1conf_1prefixes (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_kfsstnd_1xdg_1data_1prefixes (JNIEnv *env, jobject); -extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_localkdedir (JNIEnv *env, jobject); +extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_localtdedir (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_localxdgdatadir (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KStandardDirs_localxdgconfdir (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KStandardDirs_systemPaths__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); diff --git a/kdejava/koala/org/kde/koala/KStandardDirs.java b/kdejava/koala/org/kde/koala/KStandardDirs.java index e94dc5a3..19ce88cc 100644 --- a/kdejava/koala/org/kde/koala/KStandardDirs.java +++ b/kdejava/koala/org/kde/koala/KStandardDirs.java @@ -157,8 +157,8 @@ import java.util.ArrayList;
  • - KDEROOTHOME: Like TDEHOME, but used for the root user. - If KDEROOTHOME is not set it defaults to the .kde directory in the + TDEROOTHOME: Like TDEHOME, but used for the root user. + If TDEROOTHOME 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.
    • @@ -484,7 +484,7 @@ public class KStandardDirs implements QtSupport { @short Returns the toplevel directory in which KStandardDirs will store things. */ - public native String localkdedir(); + public native String localtdedir(); /** @return $XDG_DATA_HOME See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html -- cgit v1.2.3