From b29a88760d18f56788e028cbdcf9f226727c7f45 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- Doxyfile.temp | 2 +- README.PACKAGERS | 28 +-- acinclude.m4 | 40 +-- chalk/doc/chalk.xmi | 280 ++++++++++----------- configure.in | 40 +-- configure.in.in | 34 +-- doc/api/Doxyfile.koffice | 2 +- kexi/data/Makefile.am | 4 +- kexi/debian/changelog | 2 +- kexi/debian/debiandirs | 2 +- kexi/debian/kexi-mysql-driver.install | 8 +- kexi/debian/kexi-postgresql-driver.install | 8 +- kexi/debian/kexi.install | 38 +-- kexi/debian/overrides/kexi-postgresql-driver | 4 +- kexi/debian/rules | 2 +- kexi/doc/dev/CHANGELOG-Kexi-js | 4 +- kexi/doc/dev/TODO-Kexi-js | 4 +- kexi/doc/kexidb/kexidb.doxygen | 2 +- kexi/formeditor/editlistviewdialog.cpp | 2 +- kexi/kexidb/drivers/common.pro | 2 +- .../templates/Screenpresentations/Makefile.am | 4 +- .../templates/Screenpresentations/kde3.desktop | 4 +- kspread/DESIGN.html | 2 +- kspread/Doxyfile | 4 +- mimetypes/Makefile.am | 8 +- 25 files changed, 265 insertions(+), 265 deletions(-) diff --git a/Doxyfile.temp b/Doxyfile.temp index bb8dc58bc..48dd9b317 100644 --- a/Doxyfile.temp +++ b/Doxyfile.temp @@ -144,7 +144,7 @@ RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man -MAN_EXTENSION = .kde3 +MAN_EXTENSION = .trinity MAN_LINKS = YES #--------------------------------------------------------------------------- # configuration options related to the XML output diff --git a/README.PACKAGERS b/README.PACKAGERS index 98791fa9c..f3d87b76e 100644 --- a/README.PACKAGERS +++ b/README.PACKAGERS @@ -35,18 +35,18 @@ the corresponding 'native' libraries: libmysqlclient for MySQL; and and libpqxx for PostgreSQL (libpqxx in turn depends on libpq). Thus, the MySQL driver package could contain: - lib/kde3/kexidb_mysqldriver.so - lib/kde3/kexidb_mysqldriver.la - lib/kde3/keximigrate_mysql.so - lib/kde3/keximigrate_mysql.la + lib/trinity/kexidb_mysqldriver.so + lib/trinity/kexidb_mysqldriver.la + lib/trinity/keximigrate_mysql.so + lib/trinity/keximigrate_mysql.la share/services/kexidb_mysqldriver.desktop share/services/keximigrate_mysql.desktop The PostgreSQL driver package consists of the following files: - lib/kde3/kexidb_pqxxsqldriver.so - lib/kde3/kexidb_pqxxsqldriver.la - lib/kde3/keximigrate_pqxx.so - lib/kde3/keximigrate_pqxx.la + lib/trinity/kexidb_pqxxsqldriver.so + lib/trinity/kexidb_pqxxsqldriver.la + lib/trinity/keximigrate_pqxx.so + lib/trinity/keximigrate_pqxx.la share/services/kexidb_pqxxsqldriver.desktop share/services/keximigrate_pqxx.desktop @@ -115,16 +115,16 @@ The scripting language plugins can be found in: koffice/lib/kross/python; and koffice/lib/kross/ruby. They install as: - lib/kde3/krosspython.{la,so}; and - lib/kde3/krossruby.{la,so} + lib/trinity/krosspython.{la,so}; and + lib/trinity/krossruby.{la,so} It is recommended to put each interpreter plugin into a separate package, and the user decide if they would like support for each language individually. For example, the Python scripting package may contain: - lib/kde3/krosspython.so - lib/kde3/krosspython.la + lib/trinity/krosspython.so + lib/trinity/krosspython.la share/apps/kexi/scripts/exportxhtml/ExportXHTML.py share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc share/apps/kexi/scripts/importxhtml/ImportXHTML.py @@ -135,8 +135,8 @@ For example, the Python scripting package may contain: share/apps/chalk/scripts/reshapehisto.py and the Ruby scripting package may contain: - lib/kde3/krossruby.so - lib/kde3/krossruby.la + lib/trinity/krossruby.so + lib/trinity/krossruby.la share/apps/chalk/scripts/ruby/invert.rb share/apps/chalk/scripts/ruby/changecs.rb share/apps/chalk/scripts/ruby/randompaint.rb diff --git a/acinclude.m4 b/acinclude.m4 index 660b34573..4512c24ac 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -479,14 +479,14 @@ if test "$1" = "default"; then if test "$kde_qtver" = "2"; then kde_moduledir='\${libdir}/kde2' else - kde_moduledir='\${libdir}/kde3' + kde_moduledir='\${libdir}/trinity' fi fi if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' + kde_styledir='\${libdir}/trinity/plugins/styles' fi if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' + kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then xdg_appsdir='\${datadir}/applications/kde' @@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ - kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" + kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" if test -n "$KDEDIRS"; then kde_save_IFS=$IFS @@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - kde32ornewer=1 - kde33ornewer=1 + trinity2ornewer=1 + trinity3ornewer=1 if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= + trinity2ornewer= + trinity3ornewer= else if test "$kde_qtver" = "3"; then if test "$kde_qtsubver" -le 1; then - kde32ornewer= + trinity2ornewer= fi if test "$kde_qtsubver" -le 2; then - kde33ornewer= + trinity3ornewer= fi if test "$KDECONFIG" != "compiled"; then if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then - kde33ornewer= + trinity3ornewer= fi fi fi fi - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi - if test -n "$kde33ornewer"; then + if test -n "$trinity3ornewer"; then KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" + kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then @@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' AC_SUBST(KCONFIG_COMPILER) @@ -1784,7 +1784,7 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) @@ -1796,7 +1796,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" +kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) @@ -1804,7 +1804,7 @@ ac_kde_libraries="$kde_libdir" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1812,14 +1812,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed by kdelibs]) fi if test -n "$kde_widgetdir"; then - kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" + kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" fi diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 36659dab7..69c6edca3 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -4961,7 +4961,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5102,7 +5102,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5284,7 +5284,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5365,7 +5365,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5390,7 +5390,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5511,7 +5511,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5648,7 +5648,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5800,7 +5800,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -5886,7 +5886,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -6068,7 +6068,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -6200,7 +6200,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -6342,7 +6342,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -6424,7 +6424,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -6596,7 +6596,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -7028,7 +7028,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -7325,7 +7325,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -7517,7 +7517,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -7629,7 +7629,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8021,7 +8021,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8357,7 +8357,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8453,7 +8453,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8625,7 +8625,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8727,7 +8727,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -8859,7 +8859,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -9086,7 +9086,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -9178,7 +9178,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -9440,7 +9440,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -9772,7 +9772,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -9823,7 +9823,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -9940,7 +9940,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -10067,7 +10067,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -10274,7 +10274,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -10550,7 +10550,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -10992,7 +10992,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -11599,7 +11599,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12011,7 +12011,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12107,7 +12107,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12179,7 +12179,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12280,7 +12280,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12477,7 +12477,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12608,7 +12608,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12659,7 +12659,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -12771,7 +12771,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -13638,7 +13638,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -14895,7 +14895,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -15507,7 +15507,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -15719,7 +15719,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -15791,7 +15791,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -15877,7 +15877,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -15933,7 +15933,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -16004,7 +16004,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -16175,7 +16175,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -16732,7 +16732,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -17249,7 +17249,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -17531,7 +17531,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -17818,7 +17818,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -18010,7 +18010,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -18167,7 +18167,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -18409,7 +18409,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -18751,7 +18751,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -18973,7 +18973,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19139,7 +19139,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19340,7 +19340,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19491,7 +19491,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19628,7 +19628,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19755,7 +19755,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19902,7 +19902,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -19958,7 +19958,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -20199,7 +20199,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -21601,7 +21601,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -23601,7 +23601,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -23951,7 +23951,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24328,7 +24328,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24590,7 +24590,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -24796,7 +24796,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -25120,7 +25120,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -25454,7 +25454,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -25788,7 +25788,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -26063,7 +26063,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -26443,7 +26443,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -26778,7 +26778,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -27109,7 +27109,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -27379,7 +27379,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -27770,7 +27770,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -28428,7 +28428,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -28931,7 +28931,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -29311,7 +29311,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -29611,7 +29611,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -30259,7 +30259,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -30776,7 +30776,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -31075,7 +31075,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -31441,7 +31441,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -31731,7 +31731,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -32067,7 +32067,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -32482,7 +32482,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -32762,7 +32762,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -33275,7 +33275,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -33788,7 +33788,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -34026,7 +34026,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -34337,7 +34337,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -34667,7 +34667,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -35056,7 +35056,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -35578,7 +35578,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -36235,7 +36235,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -37088,7 +37088,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -37681,7 +37681,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -37966,7 +37966,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38220,7 +38220,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38524,7 +38524,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -38902,7 +38902,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -39215,7 +39215,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -39453,7 +39453,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -39757,7 +39757,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -40970,7 +40970,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -42513,7 +42513,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -43343,7 +43343,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -43748,7 +43748,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44001,7 +44001,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44268,7 +44268,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44506,7 +44506,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -44758,7 +44758,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -45155,7 +45155,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -45978,7 +45978,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -46713,7 +46713,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -47205,7 +47205,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -47706,7 +47706,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -48092,7 +48092,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -48457,7 +48457,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -48917,7 +48917,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -49478,7 +49478,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -49881,7 +49881,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -50272,7 +50272,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -50654,7 +50654,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -50994,7 +50994,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -51320,7 +51320,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -51643,7 +51643,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -51972,7 +51972,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -52209,7 +52209,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -52648,7 +52648,7 @@ in the constructor, you have to call loadAsync.
- +
@@ -54646,7 +54646,7 @@ in the constructor, you have to call loadAsync.
- +
diff --git a/configure.in b/configure.in index 2203528ef..aa8e38f7f 100644 --- a/configure.in +++ b/configure.in @@ -249,9 +249,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.2 #endif ], - need_kde32_compat="no" + need_trinity2_compat="no" , - need_kde32_compat="yes" + need_trinity2_compat="yes" ) AC_COMPILE_IFELSE([ @@ -260,9 +260,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.3 #endif ], - need_kde33_compat="no" + need_trinity3_compat="no" , - need_kde33_compat="yes" + need_trinity3_compat="yes" ) AC_COMPILE_IFELSE([ @@ -271,9 +271,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.4 #endif ], - need_kde34_compat="no" + need_trinity4_compat="no" , - need_kde34_compat="yes" + need_trinity4_compat="yes" ) AC_COMPILE_IFELSE([ @@ -282,24 +282,24 @@ AC_COMPILE_IFELSE([ #error KDE 3.5.x (x < 2) #endif ], - need_kde351_compat="no" + need_trinity51_compat="no" , - need_kde351_compat="yes" + need_trinity51_compat="yes" ) CXXFLAGS="$kdeversion_save_CXXFLAGS" LIBS="$kdeversion_safe_LIBS" AC_LANG_RESTORE -if test "$need_kde32_compat" = "yes"; then +if test "$need_trinity2_compat" = "yes"; then AC_MSG_RESULT([KDE 3.2.x]) else - if test "$need_kde33_compat" = "yes"; then + if test "$need_trinity3_compat" = "yes"; then AC_MSG_RESULT([KDE 3.3.x]) else - if test "$need_kde34_compat" = "yes"; then + if test "$need_trinity4_compat" = "yes"; then AC_MSG_RESULT([KDE 3.4.x]) else - if test "$need_kde351_compat" = "yes"; then + if test "$need_trinity51_compat" = "yes"; then AC_MSG_RESULT([KDE 3.5.x (x < 2)]) else AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk]) @@ -308,13 +308,13 @@ else fi fi -AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes") -AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes") -AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes") -AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes") +AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes") +AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes") +AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes") +AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes") # Keep the old KDE 3.1 test, as long as it is still used -AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no") +AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no") # --- End KDE 3.2 check --- @@ -1833,7 +1833,7 @@ AC_CONFIG_FILES([ kexi/3rdparty/kolibs/Makefile ]) AC_CONFIG_FILES([ kexi/3rdparty/uuid/Makefile ]) AC_CONFIG_FILES([ kexi/core/Makefile ]) AC_CONFIG_FILES([ kexi/data/Makefile ]) -AC_CONFIG_FILES([ kexi/data/kde34compat/Makefile ]) +AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ]) AC_CONFIG_FILES([ kexi/examples/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ]) @@ -2171,8 +2171,8 @@ AC_CONFIG_FILES([ lib/kwmf/Makefile ]) AC_CONFIG_FILES([ lib/store/Makefile ]) AC_CONFIG_FILES([ lib/store/tests/Makefile ]) AC_CONFIG_FILES([ mimetypes/Makefile ]) -AC_CONFIG_FILES([ mimetypes/kde33/Makefile ]) -AC_CONFIG_FILES([ mimetypes/kde351/Makefile ]) +AC_CONFIG_FILES([ mimetypes/trinity3/Makefile ]) +AC_CONFIG_FILES([ mimetypes/trinity51/Makefile ]) AC_CONFIG_FILES([ pics/Makefile ]) AC_CONFIG_FILES([ pics/crystalsvg/Makefile ]) AC_CONFIG_FILES([ plugins/Makefile ]) diff --git a/configure.in.in b/configure.in.in index bec764e0e..21699e044 100644 --- a/configure.in.in +++ b/configure.in.in @@ -182,9 +182,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.2 #endif ], - need_kde32_compat="no" + need_trinity2_compat="no" , - need_kde32_compat="yes" + need_trinity2_compat="yes" ) AC_COMPILE_IFELSE([ @@ -193,9 +193,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.3 #endif ], - need_kde33_compat="no" + need_trinity3_compat="no" , - need_kde33_compat="yes" + need_trinity3_compat="yes" ) AC_COMPILE_IFELSE([ @@ -204,9 +204,9 @@ AC_COMPILE_IFELSE([ #error KDE 3.4 #endif ], - need_kde34_compat="no" + need_trinity4_compat="no" , - need_kde34_compat="yes" + need_trinity4_compat="yes" ) AC_COMPILE_IFELSE([ @@ -215,24 +215,24 @@ AC_COMPILE_IFELSE([ #error KDE 3.5.x (x < 2) #endif ], - need_kde351_compat="no" + need_trinity51_compat="no" , - need_kde351_compat="yes" + need_trinity51_compat="yes" ) CXXFLAGS="$kdeversion_save_CXXFLAGS" LIBS="$kdeversion_safe_LIBS" AC_LANG_RESTORE -if test "$need_kde32_compat" = "yes"; then +if test "$need_trinity2_compat" = "yes"; then AC_MSG_RESULT([KDE 3.2.x]) else - if test "$need_kde33_compat" = "yes"; then + if test "$need_trinity3_compat" = "yes"; then AC_MSG_RESULT([KDE 3.3.x]) else - if test "$need_kde34_compat" = "yes"; then + if test "$need_trinity4_compat" = "yes"; then AC_MSG_RESULT([KDE 3.4.x]) else - if test "$need_kde351_compat" = "yes"; then + if test "$need_trinity51_compat" = "yes"; then AC_MSG_RESULT([KDE 3.5.x (x < 2)]) else AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk]) @@ -241,13 +241,13 @@ else fi fi -AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes") -AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes") -AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes") -AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes") +AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes") +AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes") +AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes") +AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes") # Keep the old KDE 3.1 test, as long as it is still used -AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no") +AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no") # --- End KDE 3.2 check --- diff --git a/doc/api/Doxyfile.koffice b/doc/api/Doxyfile.koffice index 76049d36d..13f846ead 100644 --- a/doc/api/Doxyfile.koffice +++ b/doc/api/Doxyfile.koffice @@ -119,7 +119,7 @@ RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = GENERATE_MAN = NO MAN_OUTPUT = -MAN_EXTENSION = .kde3 +MAN_EXTENSION = .trinity MAN_LINKS = YES GENERATE_XML = NO XML_OUTPUT = xml diff --git a/kexi/data/Makefile.am b/kexi/data/Makefile.am index f9a03d8d3..4df4637ee 100644 --- a/kexi/data/Makefile.am +++ b/kexi/data/Makefile.am @@ -45,8 +45,8 @@ x-kexiproject-shortcut.desktop #TODO: add x-kexi-shortcut-table etc. #kde <=3.4 -if need_kde34_compatibility - KDE34COMPAT = kde34compat +if need_trinity4_compatibility + KDE34COMPAT = trinity4compat endif SUBDIRS = $(KDE34COMPAT) diff --git a/kexi/debian/changelog b/kexi/debian/changelog index d0b174d3f..a28335c17 100644 --- a/kexi/debian/changelog +++ b/kexi/debian/changelog @@ -16,7 +16,7 @@ kexi (0.1cvs20050407-3) unstable; urgency=low kexi (0.1cvs20050407-2) unstable; urgency=low * Add the missing files that renders the package unusable - * Add debian/$(package)/usr/lib/kde3 for the dh_shlibdeps calls + * Add debian/$(package)/usr/lib/trinity for the dh_shlibdeps calls -- Igor Genibel Thu, 7 Apr 2005 17:04:40 +0200 diff --git a/kexi/debian/debiandirs b/kexi/debian/debiandirs index 62b4b368a..d341195a1 100644 --- a/kexi/debian/debiandirs +++ b/kexi/debian/debiandirs @@ -5,6 +5,6 @@ export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 export kde_cgidir=/usr/lib/cgi-bin -export kde_confdir=/etc/kde3 +export kde_confdir=/etc/trinity export kde_htmldir=/usr/share/doc/kde/HTML configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/kexi/debian/kexi-mysql-driver.install b/kexi/debian/kexi-mysql-driver.install index bb2916820..3d125a07f 100644 --- a/kexi/debian/kexi-mysql-driver.install +++ b/kexi/debian/kexi-mysql-driver.install @@ -1,6 +1,6 @@ -debian/tmp/usr/lib/kde3/kexidb_mysqldriver.so -debian/tmp/usr/lib/kde3/kexidb_mysqldriver.la -debian/tmp/usr/lib/kde3/keximigrate_mysql.so -debian/tmp/usr/lib/kde3/keximigrate_mysql.la +debian/tmp/usr/lib/trinity/kexidb_mysqldriver.so +debian/tmp/usr/lib/trinity/kexidb_mysqldriver.la +debian/tmp/usr/lib/trinity/keximigrate_mysql.so +debian/tmp/usr/lib/trinity/keximigrate_mysql.la debian/tmp/usr/share/services/kexidb_mysqldriver.desktop debian/tmp/usr/share/services/keximigrate_mysql.desktop diff --git a/kexi/debian/kexi-postgresql-driver.install b/kexi/debian/kexi-postgresql-driver.install index d605a36c6..0eb82d49a 100644 --- a/kexi/debian/kexi-postgresql-driver.install +++ b/kexi/debian/kexi-postgresql-driver.install @@ -1,7 +1,7 @@ -debian/tmp/usr/lib/kde3/kexidb_pqxxsqldriver.so -debian/tmp/usr/lib/kde3/kexidb_pqxxsqldriver.la -debian/tmp/usr/lib/kde3/keximigrate_pqxx.so -debian/tmp/usr/lib/kde3/keximigrate_pqxx.la +debian/tmp/usr/lib/trinity/kexidb_pqxxsqldriver.so +debian/tmp/usr/lib/trinity/kexidb_pqxxsqldriver.la +debian/tmp/usr/lib/trinity/keximigrate_pqxx.so +debian/tmp/usr/lib/trinity/keximigrate_pqxx.la debian/tmp/usr/share/services/kexidb_pqxxsqldriver.desktop debian/tmp/usr/share/services/keximigrate_pqxx.desktop diff --git a/kexi/debian/kexi.install b/kexi/debian/kexi.install index ddde726c6..3fdb949c7 100644 --- a/kexi/debian/kexi.install +++ b/kexi/debian/kexi.install @@ -18,18 +18,18 @@ debian/tmp/usr/lib/libkexirelationsview.la debian/tmp/usr/lib/libkexisql2.la debian/tmp/usr/lib/libkexisql3.la debian/tmp/usr/lib/libkformdesigner.la -debian/tmp/usr/lib/kde3/kexidb_sqlite2driver.la -debian/tmp/usr/lib/kde3/kexidb_sqlite3driver.la -debian/tmp/usr/lib/kde3/containers.la -debian/tmp/usr/lib/kde3/stdwidgets.la -debian/tmp/usr/lib/kde3/libkformdesigner_part.la -debian/tmp/usr/lib/kde3/kexihandler_form.la -debian/tmp/usr/lib/kde3/kexihandler_migration.la -debian/tmp/usr/lib/kde3/kexihandler_query.la -debian/tmp/usr/lib/kde3/kexihandler_relation.la -debian/tmp/usr/lib/kde3/kexihandler_table.la -debian/tmp/usr/lib/kde3/kexidbwidgets.la -debian/tmp/usr/lib/kde3/kexi.la +debian/tmp/usr/lib/trinity/kexidb_sqlite2driver.la +debian/tmp/usr/lib/trinity/kexidb_sqlite3driver.la +debian/tmp/usr/lib/trinity/containers.la +debian/tmp/usr/lib/trinity/stdwidgets.la +debian/tmp/usr/lib/trinity/libkformdesigner_part.la +debian/tmp/usr/lib/trinity/kexihandler_form.la +debian/tmp/usr/lib/trinity/kexihandler_migration.la +debian/tmp/usr/lib/trinity/kexihandler_query.la +debian/tmp/usr/lib/trinity/kexihandler_relation.la +debian/tmp/usr/lib/trinity/kexihandler_table.la +debian/tmp/usr/lib/trinity/kexidbwidgets.la +debian/tmp/usr/lib/trinity/kexi.la debian/tmp/usr/lib/libkexisql3.so.3.0.0 debian/tmp/usr/lib/libkexisql3.so.3 debian/tmp/usr/lib/libkexisql3.so @@ -73,13 +73,13 @@ debian/tmp/usr/lib/libkexiformutils.so -debian/tmp/usr/lib/kde3/kexidb_sqlite* -debian/tmp/usr/lib/kde3/containers* -debian/tmp/usr/lib/kde3/stdwidgets* -debian/tmp/usr/lib/kde3/lib* -debian/tmp/usr/lib/kde3/kexihandler* -debian/tmp/usr/lib/kde3/kexidbwidgets* -debian/tmp/usr/lib/kde3/kexi.* +debian/tmp/usr/lib/trinity/kexidb_sqlite* +debian/tmp/usr/lib/trinity/containers* +debian/tmp/usr/lib/trinity/stdwidgets* +debian/tmp/usr/lib/trinity/lib* +debian/tmp/usr/lib/trinity/kexihandler* +debian/tmp/usr/lib/trinity/kexidbwidgets* +debian/tmp/usr/lib/trinity/kexi.* debian/tmp/usr/share/applications/ debian/tmp/usr/share/icons/ debian/tmp/usr/share/mimelnk/ diff --git a/kexi/debian/overrides/kexi-postgresql-driver b/kexi/debian/overrides/kexi-postgresql-driver index 75108ab85..39e7b7432 100644 --- a/kexi/debian/overrides/kexi-postgresql-driver +++ b/kexi/debian/overrides/kexi-postgresql-driver @@ -1,2 +1,2 @@ -kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/kde3/keximigrate_pqxx.so /usr/lib -kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/kde3/kexidb_pqxxsqldriver.so /usr/lib +kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/trinity/keximigrate_pqxx.so /usr/lib +kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/trinity/kexidb_pqxxsqldriver.so /usr/lib diff --git a/kexi/debian/rules b/kexi/debian/rules index 6fd389127..bc42b136b 100644 --- a/kexi/debian/rules +++ b/kexi/debian/rules @@ -11,7 +11,7 @@ DEB_DH_MAKESHLIBS_ARGS_ALL := -n PACKAGES_WITH_LIBS := kexi kexi-postgresql-driver kexi-mysql-driver \ libkexi-dev -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib:debian/$(p)/usr/lib/kde3) +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib:debian/$(p)/usr/lib/trinity) # We need this commented out until sqlite 3.0 is available in Debian # DEB_EXTRA_CONNFIGURE_FLAGS := --without-included-sqlite diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index 9b74a65d6..6f90dc610 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -3954,7 +3954,7 @@ KexiDB: 2004-05-08 Form Designer: Extra widgets -- fixes for kde3.1 compatibility +- fixes for trinity.1 compatibility - implicit deleting is cleaner than explicit 2004-05-06 @@ -4745,7 +4745,7 @@ KexiActionProxy: - Tables in relation view: sizes fixed 2004-01-07 -- Build fixes for gcc2.95 on kde3.1 +- Build fixes for gcc2.95 on trinity.1 - Relations View: connection and viewtable focusing fixed and some actions added 2004-01-06 diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 5974845c0..7114d65b3 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -712,11 +712,11 @@ TODO::::::: dipesh just change a value, go to design mode and switch back to dataview... dipesh [KCrash handler] dipesh #3 0xb59b156f in KexiFormScrollView::createEditor () - dipesh from /usr/lib/kde3/kexihandler_form.so + dipesh from /usr/lib/trinity/kexihandler_form.so dipesh #4 0xb7e5f502 in KexiDataAwareObjectInterface::startEditCurrentCell () dipesh from /usr/lib/libkexidatatable.so.0 dipesh #5 0xb59b276a in KexiFormScrollView::valueChanged () - dipesh from /usr/lib/kde3/kexihandler_form.so + dipesh from /usr/lib/trinity/kexihandler_form.so dipesh I look where the crasher is coming from. dipesh oh, in KexiFormScrollView::createEditor dipesh column( col ) returns NULL diff --git a/kexi/doc/kexidb/kexidb.doxygen b/kexi/doc/kexidb/kexidb.doxygen index 5abed26b7..d3d316dfd 100644 --- a/kexi/doc/kexidb/kexidb.doxygen +++ b/kexi/doc/kexidb/kexidb.doxygen @@ -148,7 +148,7 @@ RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man -MAN_EXTENSION = .kde3 +MAN_EXTENSION = .trinity MAN_LINKS = YES #--------------------------------------------------------------------------- # configuration options related to the XML output diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 27878e7fe..d073b43d5 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -39,7 +39,7 @@ namespace KFormDesigner { ///////////////////////////////////////////////////////////////////////////////// EditListViewDialog::EditListViewDialog(TQWidget *parent) -//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false) +//js(trinity.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false) : KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, parent, "editlistview_dialog", true /* modal */, false) { m_column = addPage(i18n("Columns")); diff --git a/kexi/kexidb/drivers/common.pro b/kexi/kexidb/drivers/common.pro index 4795c4540..6914ca4b5 100644 --- a/kexi/kexidb/drivers/common.pro +++ b/kexi/kexidb/drivers/common.pro @@ -1,4 +1,4 @@ -CONFIG += kde3lib +CONFIG += trinitylib TEMPLATE = lib include( $(KEXI)/kexidb/common.pro ) diff --git a/kpresenter/templates/Screenpresentations/Makefile.am b/kpresenter/templates/Screenpresentations/Makefile.am index 37a77e27b..9e3e4de25 100644 --- a/kpresenter/templates/Screenpresentations/Makefile.am +++ b/kpresenter/templates/Screenpresentations/Makefile.am @@ -1,13 +1,13 @@ template_DATA = .directory GradientBlueRed.desktop \ - kde.desktop kde2.desktop kde3.desktop classroom.desktop savannah.desktop \ + kde.desktop kde2.desktop trinity.desktop classroom.desktop savannah.desktop \ SnowyMountains.desktop TotallyNewProduct.desktop \ BlueBreezeDouble.desktop BlueBreezePicture.desktop BlueBreezeSingle.desktop CopperPlain.desktop templatedir = $(kde_datadir)/kpresenter/templates/Screenpresentations templatesrc_DATA = GradientBlueRed.kpt \ - kde.kpt kde2.kpt kde3.kpt classroom.kpt savannah.kpt \ + kde.kpt kde2.kpt trinity.kpt classroom.kpt savannah.kpt \ SnowyMountains.kpt TotallyNewProduct.kpt \ BlueBreezeDouble.kpt BlueBreezePicture.kpt BlueBreezeSingle.kpt \ CopperPlain.kpt diff --git a/kpresenter/templates/Screenpresentations/kde3.desktop b/kpresenter/templates/Screenpresentations/kde3.desktop index ac29360fe..26439d7f7 100644 --- a/kpresenter/templates/Screenpresentations/kde3.desktop +++ b/kpresenter/templates/Screenpresentations/kde3.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Link -URL=.source/kde3.kpt +URL=.source/trinity.kpt Name=KDE 3 Name[ne]=KDE ३ Comment=A presentation with KDE 3 theming @@ -42,4 +42,4 @@ Comment[uz]=KDE 3 mavzulik namoyish Comment[uz@cyrillic]=KDE 3 мавзулик намойиш Comment[zh_CN]=带有 KDE 3 主题的演示文稿 Comment[zh_TW]=KDE 3 佈景主題展示 -Icon=template_kde3 +Icon=template_trinity diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html index 0bfb8a3b2..31059876d 100644 --- a/kspread/DESIGN.html +++ b/kspread/DESIGN.html @@ -730,7 +730,7 @@ because of the term Tabelle (German, literally means table). The correct term is sheet or worksheet. The English version of Microsoft uses sheet while the German version uses Tabelle.

-

Use d-pointer trick (also known pimpl) whenever possible. Such practice will help when later on +

Use d-pointer trick (also known pimpl) whenever possible. Such practice will help when later on we want to expose the API and need to maintain binary compatibility. But the most important thing is to separate the interface and the implementation. Furthermore, build time is reduced since modification on the implementation diff --git a/kspread/Doxyfile b/kspread/Doxyfile index 54f1fb396..169986c27 100644 --- a/kspread/Doxyfile +++ b/kspread/Doxyfile @@ -791,7 +791,7 @@ MAN_OUTPUT = # The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) -MAN_EXTENSION = .kde3 +MAN_EXTENSION = .trinity # If the MAN_LINKS tag is set to YES and Doxygen generates man output, # then it will generate one additional man file for each entity @@ -1147,7 +1147,7 @@ GENERATE_HTML = GENERATE_MAN = GENERATE_LATEX = TAGFILES = \ -/usr/local/kde3/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html +/usr/local/trinity/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html GENERATE_TAGFILE = ../apidocs/kspread/kspread.tag IGNORE_PREFIX = K HAVE_DOT = YES diff --git a/mimetypes/Makefile.am b/mimetypes/Makefile.am index ed1d00b87..943ef0438 100644 --- a/mimetypes/Makefile.am +++ b/mimetypes/Makefile.am @@ -1,9 +1,9 @@ -if need_kde33_compatibility - KDE33MIMEDIR = kde33 +if need_trinity3_compatibility + KDE33MIMEDIR = trinity3 endif -if need_kde351_compatibility - KDE351MIMEDIR = kde351 +if need_trinity51_compatibility + KDE351MIMEDIR = trinity51 endif SUBDIRS = $(KDE33MIMEDIR) $(KDE351MIMEDIR) -- cgit v1.2.3