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

13 files changed, 41 insertions, 41 deletions

diff --git a/kexi/data/Makefile.am b/kexi/data/Makefile.am
index f9a03d8d..4df4637e 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 d0b174d3..a28335c1 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 <igenibel@debian.org>  Thu,  7 Apr 2005 17:04:40 +0200
 
diff --git a/kexi/debian/debiandirs b/kexi/debian/debiandirs
index 62b4b368..d341195a 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 bb291682..3d125a07 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 d605a36c..0eb82d49 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 ddde726c..3fdb949c 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 75108ab8..39e7b743 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 6fd38912..bc42b136 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 9b74a65d..6f90dc61 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 5974845c..7114d65b 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 5abed26b..d3d316df 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 27878e7f..d073b43d 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 4795c454..6914ca4b 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 )