summaryrefslogtreecommitdiffstats
path: root/tde-i18n-sl
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:14:02 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:14:02 -0600
commit8911551b93e6f92371402b136b05af47c8e4e970 (patch)
tree9e2f7bea7d43e3af0e3778f20ec7ede62d488f69 /tde-i18n-sl
parent1bcf99f5b7608990a36e63e850f6cef33a1efc19 (diff)
downloadtde-i18n-8911551b93e6f92371402b136b05af47c8e4e970.tar.gz
tde-i18n-8911551b93e6f92371402b136b05af47c8e4e970.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-sl')
-rw-r--r--tde-i18n-sl/acinclude.m426
-rw-r--r--tde-i18n-sl/docs/tdebase/khelpcenter/faq/filemng.docbook4
2 files changed, 15 insertions, 15 deletions
diff --git a/tde-i18n-sl/acinclude.m4 b/tde-i18n-sl/acinclude.m4
index b8bf3a36f80..d44279c6768 100644
--- a/tde-i18n-sl/acinclude.m4
+++ b/tde-i18n-sl/acinclude.m4
@@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+ printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+ printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+ printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+ printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+ printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+ printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+ printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+ printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+ printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+ printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
- KApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+ TDEApplication::kde_wallpaperdir().data());
+ printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+ printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/tde-i18n-sl/docs/tdebase/khelpcenter/faq/filemng.docbook b/tde-i18n-sl/docs/tdebase/khelpcenter/faq/filemng.docbook
index 866fcad3794..cda00d47ad5 100644
--- a/tde-i18n-sl/docs/tdebase/khelpcenter/faq/filemng.docbook
+++ b/tde-i18n-sl/docs/tdebase/khelpcenter/faq/filemng.docbook
@@ -98,9 +98,9 @@ Comment=Contains removed files
> <answer>
<para
>Uporabljajo jih vsi programi &kde; (izvedeni so namreč v <classname
->KApplication</classname
+>TDEApplication</classname
> in vsi dobri &kde; programi ustvarijo objekt <classname
->KApplication</classname
+>TDEApplication</classname
> preden pogledajo, ali je bilo podanih v ukazni vrstici kaj parametrov).</para
> <para
>Običajna vrstica za programe &kde; izgleda neko tako: <userinput