diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:14:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:14:02 -0600 |
| commit | 8911551b93e6f92371402b136b05af47c8e4e970 (patch) | |
| tree | 9e2f7bea7d43e3af0e3778f20ec7ede62d488f69 /tde-i18n-ca | |
| parent | 1bcf99f5b7608990a36e63e850f6cef33a1efc19 (diff) | |
| download | tde-i18n-8911551b93e6f92371402b136b05af47c8e4e970.tar.gz tde-i18n-8911551b93e6f92371402b136b05af47c8e4e970.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-ca')
| -rw-r--r-- | tde-i18n-ca/acinclude.m4 | 26 | ||||
| -rw-r--r-- | tde-i18n-ca/docs/tdebase/faq/filemng.docbook | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/tde-i18n-ca/acinclude.m4 b/tde-i18n-ca/acinclude.m4 index b8bf3a36f80..d44279c6768 100644 --- a/tde-i18n-ca/acinclude.m4 +++ b/tde-i18n-ca/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-ca/docs/tdebase/faq/filemng.docbook b/tde-i18n-ca/docs/tdebase/faq/filemng.docbook index e36951ea4b0..2e0ab77e1a2 100644 --- a/tde-i18n-ca/docs/tdebase/faq/filemng.docbook +++ b/tde-i18n-ca/docs/tdebase/faq/filemng.docbook @@ -211,9 +211,9 @@ > <answer> <para >Aquestes opcions són emprades per tots els programes &kde; (ja que estan implementades a <classname ->KApplication</classname +>TDEApplication</classname > i tots els bons programes per al &kde; creen un objecte <classname ->KApplication</classname +>TDEApplication</classname > abans de mirar els arguments de la línia de comandaments).</para > <para >Un comandament estàndard per a una aplicació &kde; apareix així: <userinput |