summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-08 17:40:23 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-08 17:40:23 -0600
commite3ea15d255e93780eb08507aac726f305ae2ffb3 (patch)
tree3136f99dca07e33bdbc32a3191804f0f6e2d8fbc
parentfd9de8058a3cfb20ee05016ecb54e689a835154d (diff)
downloadtdebindings-e3ea15d255e93780eb08507aac726f305ae2ffb3.tar.gz
tdebindings-e3ea15d255e93780eb08507aac726f305ae2ffb3.zip
Rename additional KDE strings
-rw-r--r--kdejava/koala/kdejava/KStandardDirs.cpp4
-rw-r--r--kdejava/koala/kdejava/KStandardDirs.h2
-rw-r--r--kdejava/koala/org/kde/koala/KStandardDirs.java6
-rw-r--r--qtruby/rubylib/examples/base/kicons.rb6
4 files changed, 9 insertions, 9 deletions
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;
</li>
<li>
- 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.
</li>
@@ -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
diff --git a/qtruby/rubylib/examples/base/kicons.rb b/qtruby/rubylib/examples/base/kicons.rb
index fb172b51..ea707f99 100644
--- a/qtruby/rubylib/examples/base/kicons.rb
+++ b/qtruby/rubylib/examples/base/kicons.rb
@@ -14,12 +14,12 @@ class KIconCollection
def dims
"32x32"
end
- def kdedir
+ def tdedir
ENV["TDEDIR"]
end
def get_icon_path(icon_type)
info = @icon_info[icon_type]
- "#{kdedir}/share/icons/default.kde/#{dims}/#{info.collection}/#{info.id}.#{info.filetype}"
+ "#{tdedir}/share/icons/default.kde/#{dims}/#{info.collection}/#{info.id}.#{info.filetype}"
end
def get_icon_set(icon_type)
path = get_icon_path(icon_type)
@@ -51,4 +51,4 @@ icon_collections = {
}
}
$kIcons = KIconCollection.new(icon_collections)
-print "Using TDEDIR == ", $kIcons.kdedir, "\n"
+print "Using TDEDIR == ", $kIcons.tdedir, "\n"