TDE
/
konversation
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/konversation
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent d8e2dc24f7
commit 4c4fae8200
36 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -2090,16 +2090,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2107,13 +2107,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2559,7 +2559,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3502,7 +3502,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

2
configure.in
Unescape View File

@ -92,7 +92,7 @@ KDE_CHECK_HEADER(knotifyclient.h,
KDE_CHECK_HEADER(kimiface.h,
[
AC_DEFINE(HAVE_KIMIFACE, 1, [Define if you have Kimiface headers] )
LIB_KIMIFACE="-lkimproxy"
LIB_KIMIFACE="-ltdeimproxy"
AC_SUBST(LIB_KIMIFACE)
])

16
doc/da/index.docbook
Unescape View File

@ -3083,12 +3083,12 @@ Limits on Real Name and Ident?
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -3102,19 +3102,19 @@ Limits on Real Name and Ident?
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"
<callout arearefs="pt-tdeimproxy-create-1"
><para
>Aliasset udfyldes automatisk her. Hvis du kender personens rigtige navn, erstattes aliasset med det rigtige navn. </para
></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para
>Bemærk at aliasset <emphasis
>ikke</emphasis
> vises her. I stedet, ...</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para
>Klik her. Fanebladet <guilabel
>IM-adresser</guilabel
@ -3130,7 +3130,7 @@ Limits on Real Name and Ident?
>Vinduet IM-adresser.</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase

0
doc/es/kimproxy_create_screen2.png → doc/es/tdeimproxy_create_screen2.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

0
doc/es/kimproxy_create_screen_co.png → doc/es/tdeimproxy_create_screen_co.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

16
doc/et/index.docbook
Unescape View File

@ -3117,12 +3117,12 @@ Limits on Real Name and Ident?
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -3136,19 +3136,19 @@ Limits on Real Name and Ident?
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"
<callout arearefs="pt-tdeimproxy-create-1"
><para
>Siin on hüüdnimi automaatselt ette antud. Kui tead isiku tegelikku nime, kustuta hüüdnimi ja kirjuta tegelik nimi asemele. </para
></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para
>Pane tähele, et hüüdnimi <emphasis
>ei ole</emphasis
> siin näha. Selleks...</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para
>klõpsa siia akna <guilabel
>IM aadressid</guilabel
@ -3164,7 +3164,7 @@ Limits on Real Name and Ident?
>IM aadresside aken.</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase

16
doc/it/index.docbook
Unescape View File

@ -3075,12 +3075,12 @@ Limits on Real Name and Ident?
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -3094,19 +3094,19 @@ Limits on Real Name and Ident?
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"
<callout arearefs="pt-tdeimproxy-create-1"
><para
>Il nick è inserito automaticamente qui. Se conosci il nome vero della persona, sostituiscilo al nick. </para
></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para
>Nota che il nick <emphasis
>non</emphasis
> appare qui. Invece, ..</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para
>Fai clic qui. Apparirà la finestra <guilabel
>Indirizzi IM</guilabel
@ -3122,7 +3122,7 @@ Limits on Real Name and Ident?
>La finestra Indirizzi IM.</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase

16
doc/konversation/index.docbook
Unescape View File

@ -2018,12 +2018,12 @@ choose
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -2036,15 +2036,15 @@ choose
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"><para>The &nickname; is automatically filled in here.
<callout arearefs="pt-tdeimproxy-create-1"><para>The &nickname; is automatically filled in here.
If you know the person's real name, replace the &nickname; with the real name.
</para></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para>Notice that the &nickname; does <emphasis>not</emphasis> appear here. Instead, ..</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para>Click here. The <guilabel>IM Addresses</guilabel> window appears.</para></callout>
</calloutlist>
@ -2055,7 +2055,7 @@ If you know the person's real name, replace the &nickname; with the real name.
<screeninfo>The IM Addresses Window.</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase>The IM Addresses Window.</phrase>

0
doc/konversation/kimproxy_create_screen2.png → doc/konversation/tdeimproxy_create_screen2.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
doc/konversation/kimproxy_create_screen_co.png → doc/konversation/tdeimproxy_create_screen_co.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

16
doc/pt/index.docbook
Unescape View File

@ -3103,12 +3103,12 @@ Limits on Real Name and Ident?
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -3122,19 +3122,19 @@ Limits on Real Name and Ident?
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"
<callout arearefs="pt-tdeimproxy-create-1"
><para
>O &nickname; é preenchido aqui automaticamente. Se souber o nome verdadeiro da pessoa, substitua o &nickname; pelo nome verdadeiro. </para
></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para
>Repare que o &nickname; <emphasis
>não</emphasis
> aparece aqui. Em alternativa, ....</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para
>Carregue aqui. Aparece então a janela dos <guilabel
>Endereços de IM</guilabel
@ -3150,7 +3150,7 @@ Limits on Real Name and Ident?
>A Janela dos Endereços de IM.</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase

16
doc/ru/index.docbook
Unescape View File

@ -3133,12 +3133,12 @@ Limits on Real Name and Ident?
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -3152,19 +3152,19 @@ Limits on Real Name and Ident?
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"
<callout arearefs="pt-tdeimproxy-create-1"
><para
>&nickname; здесь вводится автоматически. Если вы знаете реальное имя - замените им &nickname;. </para
></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para
>Учтите, что &nickname; <emphasis
>не</emphasis
> появляется здесь. Вместо этого, ..</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para
>Щёлкните здесь. Появится окно <guilabel
>IM-адреса</guilabel
@ -3180,7 +3180,7 @@ Limits on Real Name and Ident?
>Окно IM-адреса</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase

16
doc/sv/index.docbook
Unescape View File

@ -3107,12 +3107,12 @@ Limits on Real Name and Ident?
<mediaobjectco>
<imageobjectco>
<areaspec units="calspair">
<area id="pt-kimproxy-create-1" coords="1 1"/>
<area id="pt-kimproxy-create-2" coords="1 1"/>
<area id="pt-kimproxy-create-3" coords="1 1"/>
<area id="pt-tdeimproxy-create-1" coords="1 1"/>
<area id="pt-tdeimproxy-create-2" coords="1 1"/>
<area id="pt-tdeimproxy-create-3" coords="1 1"/>
</areaspec>
<imageobject>
<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
</imageobject>
</imageobjectco>
<textobject>
@ -3126,19 +3126,19 @@ Limits on Real Name and Ident?
<para>
<calloutlist>
<callout arearefs="pt-kimproxy-create-1"
<callout arearefs="pt-tdeimproxy-create-1"
><para
>Smeknamnet fylls automatiskt i här. Om du vet personens riktiga namn, ersätt smeknamnet med det riktiga namnet. </para
></callout>
<callout arearefs="pt-kimproxy-create-2">
<callout arearefs="pt-tdeimproxy-create-2">
<para
>Observera att smeknamnet <emphasis
>inte</emphasis
> visas här. Istället, ...</para>
</callout>
<callout arearefs="pt-kimproxy-create-3">
<callout arearefs="pt-tdeimproxy-create-3">
<para
>Klicka här. Fönstret <guilabel
>Direktmeddelandeadresser</guilabel
@ -3154,7 +3154,7 @@ Limits on Real Name and Ident?
>Fönstret Direktmeddelandeadresser.</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
</imageobject>
<textobject>
<phrase

0
doc/sv/kimproxy_create_screen2.png → doc/sv/tdeimproxy_create_screen2.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

0
doc/sv/kimproxy_create_screen_co.png → doc/sv/tdeimproxy_create_screen_co.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

2
konversation/configure.in.in
Unescape View File

@ -10,7 +10,7 @@ KDE_CHECK_HEADER(knotifyclient.h,
KDE_CHECK_HEADER(kimiface.h,
[
AC_DEFINE(HAVE_KIMIFACE, 1, [Define if you have Kimiface headers] )
LIB_KIMIFACE="-lkimproxy"
LIB_KIMIFACE="-ltdeimproxy"
AC_SUBST(LIB_KIMIFACE)
])

0
konversation/images/icons/README-kimproxy → konversation/images/icons/README-tdeimproxy
Unescape View File

0
konversation/images/icons/cr16-action-kimproxyaway.png → konversation/images/icons/cr16-action-tdeimproxyaway.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 522 B

0
konversation/images/icons/cr16-action-kimproxyoffline.png → konversation/images/icons/cr16-action-tdeimproxyoffline.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 541 B

After

Width:  |  Height:  |  Size: 541 B

0
konversation/images/icons/cr16-action-kimproxyonline.png → konversation/images/icons/cr16-action-tdeimproxyonline.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 461 B

0
konversation/images/icons/cr22-action-kimproxyaway.png → konversation/images/icons/cr22-action-tdeimproxyaway.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 686 B

After

Width:  |  Height:  |  Size: 686 B

0
konversation/images/icons/cr22-action-kimproxyoffline.png → konversation/images/icons/cr22-action-tdeimproxyoffline.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 712 B

0
konversation/images/icons/cr22-action-kimproxyonline.png → konversation/images/icons/cr22-action-tdeimproxyonline.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 591 B

0
konversation/images/icons/cr32-action-kimproxyaway.png → konversation/images/icons/cr32-action-tdeimproxyaway.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1008 B

After

Width:  |  Height:  |  Size: 1008 B

0
konversation/images/icons/cr32-action-kimproxyoffline.png → konversation/images/icons/cr32-action-tdeimproxyoffline.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
konversation/images/icons/cr32-action-kimproxyonline.png → konversation/images/icons/cr32-action-tdeimproxyonline.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 817 B

After

Width:  |  Height:  |  Size: 817 B

0
konversation/images/icons/crsc-action-kimproxyaway.svgz → konversation/images/icons/crsc-action-tdeimproxyaway.svgz
Unescape View File

0
konversation/images/icons/crsc-action-kimproxyoffline.svgz → konversation/images/icons/crsc-action-tdeimproxyoffline.svgz
Unescape View File

0
konversation/images/icons/crsc-action-kimproxyonline.svgz → konversation/images/icons/crsc-action-tdeimproxyonline.svgz
Unescape View File

2
konversation/src/Makefile.am
Unescape View File

@ -41,7 +41,7 @@ xdg_apps_DATA = konversation.desktop
INCLUDES= -Ilinkaddressbook -I$(srcdir)/linkaddressbook -Iblowfish -I$(srcdir)/blowfish\
-Iconfig -I$(srcdir)/config $(all_includes)
# the library search path.
konversation_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
konversation_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/konversation
rc_DATA = konversationui.rc eventsrc

2
konversation/src/autoreplace_preferences.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <klocale.h>
#include <klineedit.h>
#include <klistview.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
#define DIRECTION_OUTPUT 0

2
konversation/src/highlight_preferences.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <klineedit.h>
#include <kcolorbutton.h>
#include <klocale.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
#include <kiconloader.h>

12
konversation/src/images.cpp
Unescape View File

@ -39,9 +39,9 @@ Images::~Images()
{
}
TQIconSet Images::getKimproxyAway() const { return kimproxyAway; }
TQIconSet Images::getKimproxyOnline() const { return kimproxyOnline; }
TQIconSet Images::getKimproxyOffline() const { return kimproxyOffline; }
TQIconSet Images::getKimproxyAway() const { return tdeimproxyAway; }
TQIconSet Images::getKimproxyOnline() const { return tdeimproxyOnline; }
TQIconSet Images::getKimproxyOffline() const { return tdeimproxyOffline; }
TQPixmap Images::getNickIcon(NickPrivilege privilege,bool isAway) const
{
@ -73,9 +73,9 @@ void Images::initializeLeds()
void Images::initializeKimifaceIcons()
{
kimproxyAway = TDEGlobal::iconLoader()->loadIconSet("kimproxyaway",KIcon::Small);
kimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("kimproxyonline",KIcon::Small);
kimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("kimproxyoffline",KIcon::Small);
tdeimproxyAway = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyaway",KIcon::Small);
tdeimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyonline",KIcon::Small);
tdeimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyoffline",KIcon::Small);
}
// NickIcons

6
konversation/src/images.h
Unescape View File

@ -93,9 +93,9 @@ class Images : public TQObject
TQColor m_nickColor;
TQColor m_highlightsColor;
TQIconSet kimproxyAway;
TQIconSet kimproxyOnline;
TQIconSet kimproxyOffline;
TQIconSet tdeimproxyAway;
TQIconSet tdeimproxyOnline;
TQIconSet tdeimproxyOffline;
// [privilege][away]
TQPixmap nickIcons[_NickPrivilege_COUNT][2];

2
konversation/src/konsolepanel.h
Unescape View File

@ -14,7 +14,7 @@
#include "chatwindow.h"
#include <kparts/part.h>
#include <tdeparts/part.h>
class KonsolePanel : public ChatWindow

2
konversation/src/konversation.upd
Unescape View File

@ -131,7 +131,7 @@ File=konversationrc
Group=Led Colors
RemoveGroup=Led Colors
Id=0.19-cleanup-kmditaskbar
Id=0.19-cleanup-tdemditaskbar
File=konversationrc
Group=MainWindow Toolbar KMdiTaskBar
RemoveGroup=MainWindow Toolbar KMdiTaskBar

Write Preview
Loading…
Cancel
Save