Kaynağa Gözat

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-ecb5cbfe19
tags/v3.5.13
tpearson 7 yıl önce
ebeveyn
işleme
b29a88760d

+ 1
- 1
Doxyfile.temp Dosyayı Görüntüle

@@ -144,7 +144,7 @@ RTF_EXTENSIONS_FILE    =
144 144
 #---------------------------------------------------------------------------
145 145
 GENERATE_MAN           = NO
146 146
 MAN_OUTPUT             = man
147
-MAN_EXTENSION          = .kde3
147
+MAN_EXTENSION          = .trinity
148 148
 MAN_LINKS              = YES
149 149
 #---------------------------------------------------------------------------
150 150
 # configuration options related to the XML output

+ 14
- 14
README.PACKAGERS Dosyayı Görüntüle

@@ -35,18 +35,18 @@ the corresponding 'native' libraries: libmysqlclient for MySQL; and
35 35
 and libpqxx for PostgreSQL (libpqxx in turn depends on libpq).
36 36
 
37 37
 Thus, the MySQL driver package could contain:
38
- lib/kde3/kexidb_mysqldriver.so
39
- lib/kde3/kexidb_mysqldriver.la
40
- lib/kde3/keximigrate_mysql.so
41
- lib/kde3/keximigrate_mysql.la
38
+ lib/trinity/kexidb_mysqldriver.so
39
+ lib/trinity/kexidb_mysqldriver.la
40
+ lib/trinity/keximigrate_mysql.so
41
+ lib/trinity/keximigrate_mysql.la
42 42
  share/services/kexidb_mysqldriver.desktop
43 43
  share/services/keximigrate_mysql.desktop
44 44
 
45 45
 The PostgreSQL driver package consists of the following files:
46
- lib/kde3/kexidb_pqxxsqldriver.so
47
- lib/kde3/kexidb_pqxxsqldriver.la
48
- lib/kde3/keximigrate_pqxx.so
49
- lib/kde3/keximigrate_pqxx.la
46
+ lib/trinity/kexidb_pqxxsqldriver.so
47
+ lib/trinity/kexidb_pqxxsqldriver.la
48
+ lib/trinity/keximigrate_pqxx.so
49
+ lib/trinity/keximigrate_pqxx.la
50 50
  share/services/kexidb_pqxxsqldriver.desktop
51 51
  share/services/keximigrate_pqxx.desktop
52 52
 
@@ -115,16 +115,16 @@ The scripting language plugins can be found in:
115 115
   koffice/lib/kross/python; and
116 116
   koffice/lib/kross/ruby.
117 117
 They install as:
118
-  lib/kde3/krosspython.{la,so}; and
119
-  lib/kde3/krossruby.{la,so}
118
+  lib/trinity/krosspython.{la,so}; and
119
+  lib/trinity/krossruby.{la,so}
120 120
 
121 121
 It is recommended to put each interpreter plugin into a separate
122 122
 package, and the user decide if they would like support for each
123 123
 language individually.
124 124
 
125 125
 For example, the Python scripting package may contain:
126
-  lib/kde3/krosspython.so
127
-  lib/kde3/krosspython.la
126
+  lib/trinity/krosspython.so
127
+  lib/trinity/krosspython.la
128 128
   share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
129 129
   share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
130 130
   share/apps/kexi/scripts/importxhtml/ImportXHTML.py
@@ -135,8 +135,8 @@ For example, the Python scripting package may contain:
135 135
   share/apps/chalk/scripts/reshapehisto.py
136 136
 
137 137
 and the Ruby scripting package may contain:
138
-  lib/kde3/krossruby.so
139
-  lib/kde3/krossruby.la
138
+  lib/trinity/krossruby.so
139
+  lib/trinity/krossruby.la
140 140
   share/apps/chalk/scripts/ruby/invert.rb
141 141
   share/apps/chalk/scripts/ruby/changecs.rb
142 142
   share/apps/chalk/scripts/ruby/randompaint.rb

+ 20
- 20
acinclude.m4 Dosyayı Görüntüle

@@ -479,14 +479,14 @@ if test "$1" = "default"; then
479 479
     if test "$kde_qtver" = "2"; then
480 480
       kde_moduledir='\${libdir}/kde2'
481 481
     else
482
-      kde_moduledir='\${libdir}/kde3'
482
+      kde_moduledir='\${libdir}/trinity'
483 483
     fi
484 484
   fi
485 485
   if test -z "$kde_styledir"; then
486
-    kde_styledir='\${libdir}/kde3/plugins/styles'
486
+    kde_styledir='\${libdir}/trinity/plugins/styles'
487 487
   fi
488 488
   if test -z "$kde_widgetdir"; then
489
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
489
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
490 490
   fi
491 491
   if test -z "$xdg_appsdir"; then
492 492
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
546 546
 
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549
-    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"
549
+    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"
550 550
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551 551
     if test -n "$KDEDIRS"; then
552 552
        kde_save_IFS=$IFS
@@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
580 580
         fi
581 581
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
582 582
 
583
-        kde32ornewer=1
584
-        kde33ornewer=1
583
+        trinity2ornewer=1
584
+        trinity3ornewer=1
585 585
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
586
-            kde32ornewer=
587
-            kde33ornewer=
586
+            trinity2ornewer=
587
+            trinity3ornewer=
588 588
         else
589 589
             if test "$kde_qtver" = "3"; then
590 590
               if test "$kde_qtsubver" -le 1; then
591
-                kde32ornewer=
591
+                trinity2ornewer=
592 592
               fi
593 593
               if test "$kde_qtsubver" -le 2; then
594
-                kde33ornewer=
594
+                trinity3ornewer=
595 595
               fi
596 596
               if test "$KDECONFIG" != "compiled"; then
597 597
                 if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
598
-                  kde33ornewer=
598
+                  trinity3ornewer=
599 599
                 fi
600 600
               fi
601 601
             fi
602 602
         fi
603 603
 
604
-        if test -n "$kde32ornewer"; then
604
+        if test -n "$trinity2ornewer"; then
605 605
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
606 606
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
607 607
         fi
608
-        if test -n "$kde33ornewer"; then
608
+        if test -n "$trinity3ornewer"; then
609 609
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
610 610
             AC_SUBST(MAKEKDEWIDGETS)
611 611
         fi
612 612
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
615
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
616 616
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
623 623
         fi
624 624
 
625 625
         DCOP_DEPENDENCIES='$(DCOPIDL)'
626
-        if test -n "$kde32ornewer"; then
626
+        if test -n "$trinity2ornewer"; then
627 627
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
628 628
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
629 629
             AC_SUBST(KCONFIG_COMPILER)
@@ -1784,7 +1784,7 @@ fi
1784 1784
 
1785 1785
 if test -z "$1"; then
1786 1786
 
1787
-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"
1787
+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"
1788 1788
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1789 1789
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1790 1790
 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.
1796 1796
 So, check this please and use another prefix!])
1797 1797
 fi
1798 1798
 
1799
-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}"
1799
+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}"
1800 1800
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1801 1801
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1802 1802
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1804,7 +1804,7 @@ ac_kde_libraries="$kde_libdir"
1804 1804
 
1805 1805
 kde_widgetdir=NO
1806 1806
 dnl this might be somewhere else
1807
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1807
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1808 1808
 
1809 1809
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
1810 1810
 AC_MSG_ERROR([
@@ -1812,14 +1812,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
1812 1812
 So, check this please and use another prefix!])
1813 1813
 fi
1814 1814
 
1815
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1815
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1816 1816
 AC_MSG_ERROR([
1817 1817
 I can't find the designer plugins. These are required and should have been installed
1818 1818
 by kdelibs])
1819 1819
 fi
1820 1820
 
1821 1821
 if test -n "$kde_widgetdir"; then
1822
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
1822
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
1823 1823
 fi
1824 1824
 
1825 1825
 

+ 140
- 140
chalk/doc/chalk.xmi
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 20
- 20
configure.in Dosyayı Görüntüle

@@ -249,9 +249,9 @@ AC_COMPILE_IFELSE([
249 249
 #error KDE 3.2
250 250
 #endif
251 251
 ],
252
-	need_kde32_compat="no"
252
+	need_trinity2_compat="no"
253 253
 ,
254
-	need_kde32_compat="yes"
254
+	need_trinity2_compat="yes"
255 255
 )
256 256
 
257 257
 AC_COMPILE_IFELSE([
@@ -260,9 +260,9 @@ AC_COMPILE_IFELSE([
260 260
 #error KDE 3.3
261 261
 #endif
262 262
 ],
263
-	need_kde33_compat="no"
263
+	need_trinity3_compat="no"
264 264
 ,
265
-	need_kde33_compat="yes"
265
+	need_trinity3_compat="yes"
266 266
 )
267 267
 
268 268
 AC_COMPILE_IFELSE([
@@ -271,9 +271,9 @@ AC_COMPILE_IFELSE([
271 271
 #error KDE 3.4
272 272
 #endif
273 273
 ],
274
-	need_kde34_compat="no"
274
+	need_trinity4_compat="no"
275 275
 ,
276
-	need_kde34_compat="yes"
276
+	need_trinity4_compat="yes"
277 277
 )
278 278
 
279 279
 AC_COMPILE_IFELSE([
@@ -282,24 +282,24 @@ AC_COMPILE_IFELSE([
282 282
 #error KDE 3.5.x (x < 2)
283 283
 #endif
284 284
 ],
285
-	need_kde351_compat="no"
285
+	need_trinity51_compat="no"
286 286
 ,
287
-	need_kde351_compat="yes"
287
+	need_trinity51_compat="yes"
288 288
 )
289 289
 CXXFLAGS="$kdeversion_save_CXXFLAGS"
290 290
 LIBS="$kdeversion_safe_LIBS"
291 291
 AC_LANG_RESTORE
292 292
 
293
-if test "$need_kde32_compat" = "yes"; then
293
+if test "$need_trinity2_compat" = "yes"; then
294 294
 	AC_MSG_RESULT([KDE 3.2.x])
295 295
 else
296
-	if test "$need_kde33_compat" = "yes"; then
296
+	if test "$need_trinity3_compat" = "yes"; then
297 297
 		AC_MSG_RESULT([KDE 3.3.x])
298 298
 	else 
299
-		if test "$need_kde34_compat" = "yes"; then
299
+		if test "$need_trinity4_compat" = "yes"; then
300 300
 			AC_MSG_RESULT([KDE 3.4.x])
301 301
                 else
302
-                        if test "$need_kde351_compat" = "yes"; then
302
+                        if test "$need_trinity51_compat" = "yes"; then
303 303
                                 AC_MSG_RESULT([KDE 3.5.x (x < 2)])
304 304
                         else
305 305
 			        AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
@@ -308,13 +308,13 @@ else
308 308
 	fi
309 309
 fi
310 310
 
311
-AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
312
-AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
313
-AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes")
314
-AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes")
311
+AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
312
+AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
313
+AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes")
314
+AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes")
315 315
 
316 316
 # Keep the old KDE 3.1 test, as long as it is still used
317
-AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no")
317
+AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no")
318 318
 
319 319
 # --- End KDE 3.2 check ---
320 320
 
@@ -1833,7 +1833,7 @@ AC_CONFIG_FILES([ kexi/3rdparty/kolibs/Makefile ])
1833 1833
 AC_CONFIG_FILES([ kexi/3rdparty/uuid/Makefile ])
1834 1834
 AC_CONFIG_FILES([ kexi/core/Makefile ])
1835 1835
 AC_CONFIG_FILES([ kexi/data/Makefile ])
1836
-AC_CONFIG_FILES([ kexi/data/kde34compat/Makefile ])
1836
+AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ])
1837 1837
 AC_CONFIG_FILES([ kexi/examples/Makefile ])
1838 1838
 AC_CONFIG_FILES([ kexi/formeditor/Makefile ])
1839 1839
 AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ])
@@ -2171,8 +2171,8 @@ AC_CONFIG_FILES([ lib/kwmf/Makefile ])
2171 2171
 AC_CONFIG_FILES([ lib/store/Makefile ])
2172 2172
 AC_CONFIG_FILES([ lib/store/tests/Makefile ])
2173 2173
 AC_CONFIG_FILES([ mimetypes/Makefile ])
2174
-AC_CONFIG_FILES([ mimetypes/kde33/Makefile ])
2175
-AC_CONFIG_FILES([ mimetypes/kde351/Makefile ])
2174
+AC_CONFIG_FILES([ mimetypes/trinity3/Makefile ])
2175
+AC_CONFIG_FILES([ mimetypes/trinity51/Makefile ])
2176 2176
 AC_CONFIG_FILES([ pics/Makefile ])
2177 2177
 AC_CONFIG_FILES([ pics/crystalsvg/Makefile ])
2178 2178
 AC_CONFIG_FILES([ plugins/Makefile ])

+ 17
- 17
configure.in.in Dosyayı Görüntüle

@@ -182,9 +182,9 @@ AC_COMPILE_IFELSE([
182 182
 #error KDE 3.2
183 183
 #endif
184 184
 ],
185
-	need_kde32_compat="no"
185
+	need_trinity2_compat="no"
186 186
 ,
187
-	need_kde32_compat="yes"
187
+	need_trinity2_compat="yes"
188 188
 )
189 189
 
190 190
 AC_COMPILE_IFELSE([
@@ -193,9 +193,9 @@ AC_COMPILE_IFELSE([
193 193
 #error KDE 3.3
194 194
 #endif
195 195
 ],
196
-	need_kde33_compat="no"
196
+	need_trinity3_compat="no"
197 197
 ,
198
-	need_kde33_compat="yes"
198
+	need_trinity3_compat="yes"
199 199
 )
200 200
 
201 201
 AC_COMPILE_IFELSE([
@@ -204,9 +204,9 @@ AC_COMPILE_IFELSE([
204 204
 #error KDE 3.4
205 205
 #endif
206 206
 ],
207
-	need_kde34_compat="no"
207
+	need_trinity4_compat="no"
208 208
 ,
209
-	need_kde34_compat="yes"
209
+	need_trinity4_compat="yes"
210 210
 )
211 211
 
212 212
 AC_COMPILE_IFELSE([
@@ -215,24 +215,24 @@ AC_COMPILE_IFELSE([
215 215
 #error KDE 3.5.x (x < 2)
216 216
 #endif
217 217
 ],
218
-	need_kde351_compat="no"
218
+	need_trinity51_compat="no"
219 219
 ,
220
-	need_kde351_compat="yes"
220
+	need_trinity51_compat="yes"
221 221
 )
222 222
 CXXFLAGS="$kdeversion_save_CXXFLAGS"
223 223
 LIBS="$kdeversion_safe_LIBS"
224 224
 AC_LANG_RESTORE
225 225
 
226
-if test "$need_kde32_compat" = "yes"; then
226
+if test "$need_trinity2_compat" = "yes"; then
227 227
 	AC_MSG_RESULT([KDE 3.2.x])
228 228
 else
229
-	if test "$need_kde33_compat" = "yes"; then
229
+	if test "$need_trinity3_compat" = "yes"; then
230 230
 		AC_MSG_RESULT([KDE 3.3.x])
231 231
 	else 
232
-		if test "$need_kde34_compat" = "yes"; then
232
+		if test "$need_trinity4_compat" = "yes"; then
233 233
 			AC_MSG_RESULT([KDE 3.4.x])
234 234
                 else
235
-                        if test "$need_kde351_compat" = "yes"; then
235
+                        if test "$need_trinity51_compat" = "yes"; then
236 236
                                 AC_MSG_RESULT([KDE 3.5.x (x < 2)])
237 237
                         else
238 238
 			        AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
@@ -241,13 +241,13 @@ else
241 241
 	fi
242 242
 fi
243 243
 
244
-AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
245
-AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
246
-AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes")
247
-AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes")
244
+AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
245
+AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
246
+AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes")
247
+AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes")
248 248
 
249 249
 # Keep the old KDE 3.1 test, as long as it is still used
250
-AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no")
250
+AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no")
251 251
 
252 252
 # --- End KDE 3.2 check ---
253 253
 

+ 1
- 1
doc/api/Doxyfile.koffice Dosyayı Görüntüle

@@ -119,7 +119,7 @@ RTF_STYLESHEET_FILE    =
119 119
 RTF_EXTENSIONS_FILE    = 
120 120
 GENERATE_MAN           = NO
121 121
 MAN_OUTPUT             = 
122
-MAN_EXTENSION          = .kde3
122
+MAN_EXTENSION          = .trinity
123 123
 MAN_LINKS              = YES
124 124
 GENERATE_XML           = NO
125 125
 XML_OUTPUT             = xml

+ 2
- 2
kexi/data/Makefile.am Dosyayı Görüntüle

@@ -45,8 +45,8 @@ x-kexiproject-shortcut.desktop
45 45
 #TODO: add x-kexi-shortcut-table etc.
46 46
 
47 47
 #kde <=3.4
48
-if need_kde34_compatibility
49
-  KDE34COMPAT = kde34compat
48
+if need_trinity4_compatibility
49
+  KDE34COMPAT = trinity4compat
50 50
 endif
51 51
 
52 52
 SUBDIRS = $(KDE34COMPAT)

+ 1
- 1
kexi/debian/changelog Dosyayı Görüntüle

@@ -16,7 +16,7 @@ kexi (0.1cvs20050407-3) unstable; urgency=low
16 16
 kexi (0.1cvs20050407-2) unstable; urgency=low
17 17
 
18 18
   * Add the missing files that renders the package unusable
19
-  * Add debian/$(package)/usr/lib/kde3 for the dh_shlibdeps calls
19
+  * Add debian/$(package)/usr/lib/trinity for the dh_shlibdeps calls
20 20
 
21 21
  -- Igor Genibel <igenibel@debian.org>  Thu,  7 Apr 2005 17:04:40 +0200
22 22
 

+ 1
- 1
kexi/debian/debiandirs Dosyayı Görüntüle

@@ -5,6 +5,6 @@ export infodir=/usr/share/info
5 5
 export mandir=/usr/share/man
6 6
 export qtdir=/usr/share/qt3
7 7
 export kde_cgidir=/usr/lib/cgi-bin
8
-export kde_confdir=/etc/kde3
8
+export kde_confdir=/etc/trinity
9 9
 export kde_htmldir=/usr/share/doc/kde/HTML
10 10
 configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)

+ 4
- 4
kexi/debian/kexi-mysql-driver.install Dosyayı Görüntüle

@@ -1,6 +1,6 @@
1
-debian/tmp/usr/lib/kde3/kexidb_mysqldriver.so
2
-debian/tmp/usr/lib/kde3/kexidb_mysqldriver.la
3
-debian/tmp/usr/lib/kde3/keximigrate_mysql.so
4
-debian/tmp/usr/lib/kde3/keximigrate_mysql.la
1
+debian/tmp/usr/lib/trinity/kexidb_mysqldriver.so
2
+debian/tmp/usr/lib/trinity/kexidb_mysqldriver.la
3
+debian/tmp/usr/lib/trinity/keximigrate_mysql.so
4
+debian/tmp/usr/lib/trinity/keximigrate_mysql.la
5 5
 debian/tmp/usr/share/services/kexidb_mysqldriver.desktop
6 6
 debian/tmp/usr/share/services/keximigrate_mysql.desktop

+ 4
- 4
kexi/debian/kexi-postgresql-driver.install Dosyayı Görüntüle

@@ -1,7 +1,7 @@
1
-debian/tmp/usr/lib/kde3/kexidb_pqxxsqldriver.so
2
-debian/tmp/usr/lib/kde3/kexidb_pqxxsqldriver.la
3
-debian/tmp/usr/lib/kde3/keximigrate_pqxx.so
4
-debian/tmp/usr/lib/kde3/keximigrate_pqxx.la
1
+debian/tmp/usr/lib/trinity/kexidb_pqxxsqldriver.so
2
+debian/tmp/usr/lib/trinity/kexidb_pqxxsqldriver.la
3
+debian/tmp/usr/lib/trinity/keximigrate_pqxx.so
4
+debian/tmp/usr/lib/trinity/keximigrate_pqxx.la
5 5
 debian/tmp/usr/share/services/kexidb_pqxxsqldriver.desktop
6 6
 debian/tmp/usr/share/services/keximigrate_pqxx.desktop
7 7
 

+ 19
- 19
kexi/debian/kexi.install Dosyayı Görüntüle

@@ -18,18 +18,18 @@ debian/tmp/usr/lib/libkexirelationsview.la
18 18
 debian/tmp/usr/lib/libkexisql2.la
19 19
 debian/tmp/usr/lib/libkexisql3.la
20 20
 debian/tmp/usr/lib/libkformdesigner.la
21
-debian/tmp/usr/lib/kde3/kexidb_sqlite2driver.la
22
-debian/tmp/usr/lib/kde3/kexidb_sqlite3driver.la
23
-debian/tmp/usr/lib/kde3/containers.la
24
-debian/tmp/usr/lib/kde3/stdwidgets.la
25
-debian/tmp/usr/lib/kde3/libkformdesigner_part.la
26
-debian/tmp/usr/lib/kde3/kexihandler_form.la
27
-debian/tmp/usr/lib/kde3/kexihandler_migration.la
28
-debian/tmp/usr/lib/kde3/kexihandler_query.la
29
-debian/tmp/usr/lib/kde3/kexihandler_relation.la
30
-debian/tmp/usr/lib/kde3/kexihandler_table.la
31
-debian/tmp/usr/lib/kde3/kexidbwidgets.la
32
-debian/tmp/usr/lib/kde3/kexi.la
21
+debian/tmp/usr/lib/trinity/kexidb_sqlite2driver.la
22
+debian/tmp/usr/lib/trinity/kexidb_sqlite3driver.la
23
+debian/tmp/usr/lib/trinity/containers.la
24
+debian/tmp/usr/lib/trinity/stdwidgets.la
25
+debian/tmp/usr/lib/trinity/libkformdesigner_part.la
26
+debian/tmp/usr/lib/trinity/kexihandler_form.la
27
+debian/tmp/usr/lib/trinity/kexihandler_migration.la
28
+debian/tmp/usr/lib/trinity/kexihandler_query.la
29
+debian/tmp/usr/lib/trinity/kexihandler_relation.la
30
+debian/tmp/usr/lib/trinity/kexihandler_table.la
31
+debian/tmp/usr/lib/trinity/kexidbwidgets.la
32
+debian/tmp/usr/lib/trinity/kexi.la
33 33
 debian/tmp/usr/lib/libkexisql3.so.3.0.0
34 34
 debian/tmp/usr/lib/libkexisql3.so.3
35 35
 debian/tmp/usr/lib/libkexisql3.so
@@ -73,13 +73,13 @@ debian/tmp/usr/lib/libkexiformutils.so
73 73
 
74 74
 
75 75
 
76
-debian/tmp/usr/lib/kde3/kexidb_sqlite*
77
-debian/tmp/usr/lib/kde3/containers*
78
-debian/tmp/usr/lib/kde3/stdwidgets*
79
-debian/tmp/usr/lib/kde3/lib*
80
-debian/tmp/usr/lib/kde3/kexihandler*
81
-debian/tmp/usr/lib/kde3/kexidbwidgets*
82
-debian/tmp/usr/lib/kde3/kexi.*
76
+debian/tmp/usr/lib/trinity/kexidb_sqlite*
77
+debian/tmp/usr/lib/trinity/containers*
78
+debian/tmp/usr/lib/trinity/stdwidgets*
79
+debian/tmp/usr/lib/trinity/lib*
80
+debian/tmp/usr/lib/trinity/kexihandler*
81
+debian/tmp/usr/lib/trinity/kexidbwidgets*
82
+debian/tmp/usr/lib/trinity/kexi.*
83 83
 debian/tmp/usr/share/applications/
84 84
 debian/tmp/usr/share/icons/
85 85
 debian/tmp/usr/share/mimelnk/

+ 2
- 2
kexi/debian/overrides/kexi-postgresql-driver Dosyayı Görüntüle

@@ -1,2 +1,2 @@
1
-kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/kde3/keximigrate_pqxx.so /usr/lib
2
-kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/kde3/kexidb_pqxxsqldriver.so /usr/lib
1
+kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/trinity/keximigrate_pqxx.so /usr/lib
2
+kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/trinity/kexidb_pqxxsqldriver.so /usr/lib

+ 1
- 1
kexi/debian/rules Dosyayı Görüntüle

@@ -11,7 +11,7 @@ DEB_DH_MAKESHLIBS_ARGS_ALL := -n
11 11
 PACKAGES_WITH_LIBS 	   := kexi kexi-postgresql-driver kexi-mysql-driver \
12 12
 			      libkexi-dev
13 13
 
14
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib:debian/$(p)/usr/lib/kde3)
14
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib:debian/$(p)/usr/lib/trinity)
15 15
 
16 16
 # We need this commented out until sqlite 3.0 is available in Debian
17 17
 # DEB_EXTRA_CONNFIGURE_FLAGS := --without-included-sqlite

+ 2
- 2
kexi/doc/dev/CHANGELOG-Kexi-js Dosyayı Görüntüle

@@ -3954,7 +3954,7 @@ KexiDB:
3954 3954
 
3955 3955
 2004-05-08
3956 3956
 Form Designer: Extra widgets
3957
-- fixes for kde3.1 compatibility
3957
+- fixes for trinity.1 compatibility
3958 3958
 - implicit deleting is cleaner than explicit
3959 3959
 
3960 3960
 2004-05-06
@@ -4745,7 +4745,7 @@ KexiActionProxy:
4745 4745
 - Tables in relation view: sizes fixed
4746 4746
 
4747 4747
 2004-01-07
4748
-- Build fixes for gcc2.95 on kde3.1
4748
+- Build fixes for gcc2.95 on trinity.1
4749 4749
 - Relations View: connection and viewtable focusing fixed and some actions added
4750 4750
 
4751 4751
 2004-01-06

+ 2
- 2
kexi/doc/dev/TODO-Kexi-js Dosyayı Görüntüle

@@ -712,11 +712,11 @@ TODO:::::::
712 712
 	dipesh	just change a value, go to design mode and switch back to dataview...
713 713
 	dipesh	[KCrash handler]
714 714
 	dipesh	#3 0xb59b156f in KexiFormScrollView::createEditor ()
715
-	dipesh	from /usr/lib/kde3/kexihandler_form.so
715
+	dipesh	from /usr/lib/trinity/kexihandler_form.so
716 716
 	dipesh	#4 0xb7e5f502 in KexiDataAwareObjectInterface::startEditCurrentCell ()
717 717
 	dipesh	from /usr/lib/libkexidatatable.so.0
718 718
 	dipesh	#5 0xb59b276a in KexiFormScrollView::valueChanged ()
719
-	dipesh	from /usr/lib/kde3/kexihandler_form.so
719
+	dipesh	from /usr/lib/trinity/kexihandler_form.so
720 720
 	dipesh	I look where the crasher is coming from.
721 721
 	dipesh	oh, in KexiFormScrollView::createEditor
722 722
 	dipesh	column( col ) returns NULL

+ 1
- 1
kexi/doc/kexidb/kexidb.doxygen Dosyayı Görüntüle

@@ -148,7 +148,7 @@ RTF_EXTENSIONS_FILE    =
148 148
 #---------------------------------------------------------------------------
149 149
 GENERATE_MAN           = NO
150 150
 MAN_OUTPUT             = man
151
-MAN_EXTENSION          = .kde3
151
+MAN_EXTENSION          = .trinity
152 152
 MAN_LINKS              = YES
153 153
 #---------------------------------------------------------------------------
154 154
 # configuration options related to the XML output

+ 1
- 1
kexi/formeditor/editlistviewdialog.cpp Dosyayı Görüntüle

@@ -39,7 +39,7 @@ namespace KFormDesigner {
39 39
 /////////////////////////////////////////////////////////////////////////////////
40 40
 
41 41
 EditListViewDialog::EditListViewDialog(TQWidget *parent)
42
-//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
42
+//js(trinity.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
43 43
 : KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, parent, "editlistview_dialog", true /* modal */, false)
44 44
 {
45 45
 	m_column = addPage(i18n("Columns"));

+ 1
- 1
kexi/kexidb/drivers/common.pro Dosyayı Görüntüle

@@ -1,4 +1,4 @@
1
-CONFIG += kde3lib
1
+CONFIG += trinitylib
2 2
 
3 3
 TEMPLATE	= lib
4 4
 include( $(KEXI)/kexidb/common.pro )

+ 2
- 2
kpresenter/templates/Screenpresentations/Makefile.am Dosyayı Görüntüle

@@ -1,13 +1,13 @@
1 1
 
2 2
 template_DATA = .directory GradientBlueRed.desktop \
3
-	kde.desktop kde2.desktop kde3.desktop classroom.desktop savannah.desktop \
3
+	kde.desktop kde2.desktop trinity.desktop classroom.desktop savannah.desktop \
4 4
 	SnowyMountains.desktop TotallyNewProduct.desktop \
5 5
 	BlueBreezeDouble.desktop BlueBreezePicture.desktop BlueBreezeSingle.desktop CopperPlain.desktop
6 6
 
7 7
 templatedir = $(kde_datadir)/kpresenter/templates/Screenpresentations
8 8
 
9 9
 templatesrc_DATA = GradientBlueRed.kpt \
10
-	kde.kpt kde2.kpt kde3.kpt classroom.kpt savannah.kpt \
10
+	kde.kpt kde2.kpt trinity.kpt classroom.kpt savannah.kpt \
11 11
 	SnowyMountains.kpt TotallyNewProduct.kpt \
12 12
 	BlueBreezeDouble.kpt BlueBreezePicture.kpt BlueBreezeSingle.kpt \
13 13
 	CopperPlain.kpt

+ 2
- 2
kpresenter/templates/Screenpresentations/kde3.desktop Dosyayı Görüntüle

@@ -1,6 +1,6 @@
1 1
 [Desktop Entry]
2 2
 Type=Link
3
-URL=.source/kde3.kpt
3
+URL=.source/trinity.kpt
4 4
 Name=KDE 3
5 5
 Name[ne]=KDE ३
6 6
 Comment=A presentation with KDE 3 theming
@@ -42,4 +42,4 @@ Comment[uz]=KDE 3 mavzulik namoyish
42 42
 Comment[uz@cyrillic]=KDE 3 мавзулик намойиш
43 43
 Comment[zh_CN]=带有 KDE 3 主题的演示文稿
44 44
 Comment[zh_TW]=KDE 3 佈景主題展示
45
-Icon=template_kde3
45
+Icon=template_trinity

+ 1
- 1
kspread/DESIGN.html Dosyayı Görüntüle

@@ -730,7 +730,7 @@ because of the term <i>Tabelle</i> (German, literally means table). The correct
730 730
 term is <i>sheet</i> or <i>worksheet</i>. The English version of Microsoft
731 731
 uses <i>sheet</i> while the German version uses <i>Tabelle</i>.</p>
732 732
 
733
-<p>Use <a href="http://developer.kde.org/documentation/library/kdeqt/kde3arch/devel-binarycompatibility.htm">d-pointer</a> trick (also known pimpl) whenever possible. Such practice will help when later on
733
+<p>Use <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/devel-binarycompatibility.htm">d-pointer</a> trick (also known pimpl) whenever possible. Such practice will help when later on
734 734
 we want to expose the API and need to maintain binary compatibility. But the
735 735
 most important thing is to separate the interface and the implementation.
736 736
 Furthermore, build time is reduced since modification on the implementation

+ 2
- 2
kspread/Doxyfile Dosyayı Görüntüle

@@ -791,7 +791,7 @@ MAN_OUTPUT             =
791 791
 # The MAN_EXTENSION tag determines the extension that is added to 
792 792
 # the generated man pages (default is the subroutine's section .3)
793 793
 
794
-MAN_EXTENSION          = .kde3
794
+MAN_EXTENSION          = .trinity
795 795
 
796 796
 # If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
797 797
 # then it will generate one additional man file for each entity 
@@ -1147,7 +1147,7 @@ GENERATE_HTML          =
1147 1147
 GENERATE_MAN          = 
1148 1148
 GENERATE_LATEX          = 
1149 1149
 TAGFILES = \
1150
-/usr/local/kde3/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html
1150
+/usr/local/trinity/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html
1151 1151
 GENERATE_TAGFILE       = ../apidocs/kspread/kspread.tag
1152 1152
 IGNORE_PREFIX          = K
1153 1153
 HAVE_DOT = YES

+ 4
- 4
mimetypes/Makefile.am Dosyayı Görüntüle

@@ -1,9 +1,9 @@
1
-if need_kde33_compatibility
2
-  KDE33MIMEDIR = kde33
1
+if need_trinity3_compatibility
2
+  KDE33MIMEDIR = trinity3
3 3
 endif
4 4
 
5
-if need_kde351_compatibility
6
-  KDE351MIMEDIR = kde351
5
+if need_trinity51_compatibility
6
+  KDE351MIMEDIR = trinity51
7 7
 endif
8 8
 
9 9
 SUBDIRS = $(KDE33MIMEDIR) $(KDE351MIMEDIR)

Loading…
İptal
Kaydet