From 4c4fae82004afd73efa631047c624818a8e56624 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:11:44 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 26 ++++++++++----------- configure.in | 2 +- doc/da/index.docbook | 16 ++++++------- doc/es/kimproxy_create_screen2.png | Bin 23653 -> 0 bytes doc/es/kimproxy_create_screen_co.png | Bin 58631 -> 0 bytes doc/es/tdeimproxy_create_screen2.png | Bin 0 -> 23653 bytes doc/es/tdeimproxy_create_screen_co.png | Bin 0 -> 58631 bytes doc/et/index.docbook | 16 ++++++------- doc/it/index.docbook | 16 ++++++------- doc/konversation/index.docbook | 16 ++++++------- doc/konversation/kimproxy_create_screen2.png | Bin 11652 -> 0 bytes doc/konversation/kimproxy_create_screen_co.png | Bin 53752 -> 0 bytes doc/konversation/tdeimproxy_create_screen2.png | Bin 0 -> 11652 bytes doc/konversation/tdeimproxy_create_screen_co.png | Bin 0 -> 53752 bytes doc/pt/index.docbook | 16 ++++++------- doc/ru/index.docbook | 16 ++++++------- doc/sv/index.docbook | 16 ++++++------- doc/sv/kimproxy_create_screen2.png | Bin 9386 -> 0 bytes doc/sv/kimproxy_create_screen_co.png | Bin 19640 -> 0 bytes doc/sv/tdeimproxy_create_screen2.png | Bin 0 -> 9386 bytes doc/sv/tdeimproxy_create_screen_co.png | Bin 0 -> 19640 bytes konversation/configure.in.in | 2 +- konversation/images/icons/README-kimproxy | 5 ---- konversation/images/icons/README-tdeimproxy | 5 ++++ .../images/icons/cr16-action-kimproxyaway.png | Bin 522 -> 0 bytes .../images/icons/cr16-action-kimproxyoffline.png | Bin 541 -> 0 bytes .../images/icons/cr16-action-kimproxyonline.png | Bin 461 -> 0 bytes .../images/icons/cr16-action-tdeimproxyaway.png | Bin 0 -> 522 bytes .../images/icons/cr16-action-tdeimproxyoffline.png | Bin 0 -> 541 bytes .../images/icons/cr16-action-tdeimproxyonline.png | Bin 0 -> 461 bytes .../images/icons/cr22-action-kimproxyaway.png | Bin 686 -> 0 bytes .../images/icons/cr22-action-kimproxyoffline.png | Bin 712 -> 0 bytes .../images/icons/cr22-action-kimproxyonline.png | Bin 591 -> 0 bytes .../images/icons/cr22-action-tdeimproxyaway.png | Bin 0 -> 686 bytes .../images/icons/cr22-action-tdeimproxyoffline.png | Bin 0 -> 712 bytes .../images/icons/cr22-action-tdeimproxyonline.png | Bin 0 -> 591 bytes .../images/icons/cr32-action-kimproxyaway.png | Bin 1008 -> 0 bytes .../images/icons/cr32-action-kimproxyoffline.png | Bin 1031 -> 0 bytes .../images/icons/cr32-action-kimproxyonline.png | Bin 817 -> 0 bytes .../images/icons/cr32-action-tdeimproxyaway.png | Bin 0 -> 1008 bytes .../images/icons/cr32-action-tdeimproxyoffline.png | Bin 0 -> 1031 bytes .../images/icons/cr32-action-tdeimproxyonline.png | Bin 0 -> 817 bytes .../images/icons/crsc-action-kimproxyaway.svgz | Bin 1272 -> 0 bytes .../images/icons/crsc-action-kimproxyoffline.svgz | Bin 1284 -> 0 bytes .../images/icons/crsc-action-kimproxyonline.svgz | Bin 1305 -> 0 bytes .../images/icons/crsc-action-tdeimproxyaway.svgz | Bin 0 -> 1272 bytes .../icons/crsc-action-tdeimproxyoffline.svgz | Bin 0 -> 1284 bytes .../images/icons/crsc-action-tdeimproxyonline.svgz | Bin 0 -> 1305 bytes konversation/src/Makefile.am | 2 +- konversation/src/autoreplace_preferences.cpp | 2 +- konversation/src/highlight_preferences.cpp | 2 +- konversation/src/images.cpp | 12 +++++----- konversation/src/images.h | 6 ++--- konversation/src/konsolepanel.h | 2 +- konversation/src/konversation.upd | 2 +- 55 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 doc/es/kimproxy_create_screen2.png delete mode 100644 doc/es/kimproxy_create_screen_co.png create mode 100644 doc/es/tdeimproxy_create_screen2.png create mode 100644 doc/es/tdeimproxy_create_screen_co.png delete mode 100644 doc/konversation/kimproxy_create_screen2.png delete mode 100644 doc/konversation/kimproxy_create_screen_co.png create mode 100644 doc/konversation/tdeimproxy_create_screen2.png create mode 100644 doc/konversation/tdeimproxy_create_screen_co.png delete mode 100644 doc/sv/kimproxy_create_screen2.png delete mode 100644 doc/sv/kimproxy_create_screen_co.png create mode 100644 doc/sv/tdeimproxy_create_screen2.png create mode 100644 doc/sv/tdeimproxy_create_screen_co.png delete mode 100644 konversation/images/icons/README-kimproxy create mode 100644 konversation/images/icons/README-tdeimproxy delete mode 100644 konversation/images/icons/cr16-action-kimproxyaway.png delete mode 100644 konversation/images/icons/cr16-action-kimproxyoffline.png delete mode 100644 konversation/images/icons/cr16-action-kimproxyonline.png create mode 100644 konversation/images/icons/cr16-action-tdeimproxyaway.png create mode 100644 konversation/images/icons/cr16-action-tdeimproxyoffline.png create mode 100644 konversation/images/icons/cr16-action-tdeimproxyonline.png delete mode 100644 konversation/images/icons/cr22-action-kimproxyaway.png delete mode 100644 konversation/images/icons/cr22-action-kimproxyoffline.png delete mode 100644 konversation/images/icons/cr22-action-kimproxyonline.png create mode 100644 konversation/images/icons/cr22-action-tdeimproxyaway.png create mode 100644 konversation/images/icons/cr22-action-tdeimproxyoffline.png create mode 100644 konversation/images/icons/cr22-action-tdeimproxyonline.png delete mode 100644 konversation/images/icons/cr32-action-kimproxyaway.png delete mode 100644 konversation/images/icons/cr32-action-kimproxyoffline.png delete mode 100644 konversation/images/icons/cr32-action-kimproxyonline.png create mode 100644 konversation/images/icons/cr32-action-tdeimproxyaway.png create mode 100644 konversation/images/icons/cr32-action-tdeimproxyoffline.png create mode 100644 konversation/images/icons/cr32-action-tdeimproxyonline.png delete mode 100644 konversation/images/icons/crsc-action-kimproxyaway.svgz delete mode 100644 konversation/images/icons/crsc-action-kimproxyoffline.svgz delete mode 100644 konversation/images/icons/crsc-action-kimproxyonline.svgz create mode 100644 konversation/images/icons/crsc-action-tdeimproxyaway.svgz create mode 100644 konversation/images/icons/crsc-action-tdeimproxyoffline.svgz create mode 100644 konversation/images/icons/crsc-action-tdeimproxyonline.svgz diff --git a/acinclude.m4 b/acinclude.m4 index 0ea3119..f7ddb78 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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) diff --git a/configure.in b/configure.in index 2135ff1..b2e6511 100644 --- a/configure.in +++ b/configure.in @@ -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) ]) diff --git a/doc/da/index.docbook b/doc/da/index.docbook index b17382b..2e224a3 100644 --- a/doc/da/index.docbook +++ b/doc/da/index.docbook @@ -3083,12 +3083,12 @@ Limits on Real Name and Ident? - - - + + + - + @@ -3102,19 +3102,19 @@ Limits on Real Name and Ident? -Aliasset udfyldes automatisk her. Hvis du kender personens rigtige navn, erstattes aliasset med det rigtige navn. - + Bemærk at aliasset ikke vises her. I stedet, ... - + Klik her. Fanebladet IM-adresserVinduet IM-adresser. - + - - - + + + - + @@ -3136,19 +3136,19 @@ Limits on Real Name and Ident? -Siin on hüüdnimi automaatselt ette antud. Kui tead isiku tegelikku nime, kustuta hüüdnimi ja kirjuta tegelik nimi asemele. - + Pane tähele, et hüüdnimi ei ole siin näha. Selleks... - + klõpsa siia akna IM aadressidIM aadresside aken. - + - - - + + + - + @@ -3094,19 +3094,19 @@ Limits on Real Name and Ident? -Il nick è inserito automaticamente qui. Se conosci il nome vero della persona, sostituiscilo al nick. - + Nota che il nick non appare qui. Invece, .. - + Fai clic qui. Apparirà la finestra Indirizzi IMLa finestra Indirizzi IM. - + - - - + + + - + @@ -2036,15 +2036,15 @@ choose -The &nickname; is automatically filled in here. +The &nickname; is automatically filled in here. If you know the person's real name, replace the &nickname; with the real name. - + Notice that the &nickname; does not appear here. Instead, .. - + Click here. The IM Addresses window appears. @@ -2055,7 +2055,7 @@ If you know the person's real name, replace the &nickname; with the real name. The IM Addresses Window. - + The IM Addresses Window. diff --git a/doc/konversation/kimproxy_create_screen2.png b/doc/konversation/kimproxy_create_screen2.png deleted file mode 100644 index 9e48ffb..0000000 Binary files a/doc/konversation/kimproxy_create_screen2.png and /dev/null differ diff --git a/doc/konversation/kimproxy_create_screen_co.png b/doc/konversation/kimproxy_create_screen_co.png deleted file mode 100644 index 281460d..0000000 Binary files a/doc/konversation/kimproxy_create_screen_co.png and /dev/null differ diff --git a/doc/konversation/tdeimproxy_create_screen2.png b/doc/konversation/tdeimproxy_create_screen2.png new file mode 100644 index 0000000..9e48ffb Binary files /dev/null and b/doc/konversation/tdeimproxy_create_screen2.png differ diff --git a/doc/konversation/tdeimproxy_create_screen_co.png b/doc/konversation/tdeimproxy_create_screen_co.png new file mode 100644 index 0000000..281460d Binary files /dev/null and b/doc/konversation/tdeimproxy_create_screen_co.png differ diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook index 68a814a..57a8894 100644 --- a/doc/pt/index.docbook +++ b/doc/pt/index.docbook @@ -3103,12 +3103,12 @@ Limits on Real Name and Ident? - - - + + + - + @@ -3122,19 +3122,19 @@ Limits on Real Name and Ident? -O &nickname; é preenchido aqui automaticamente. Se souber o nome verdadeiro da pessoa, substitua o &nickname; pelo nome verdadeiro. - + Repare que o &nickname; não aparece aqui. Em alternativa, .... - + Carregue aqui. Aparece então a janela dos Endereços de IMA Janela dos Endereços de IM. - + - - - + + + - + @@ -3152,19 +3152,19 @@ Limits on Real Name and Ident? -&nickname; здесь вводится автоматически. Если вы знаете реальное имя - замените им &nickname;. - + Учтите, что &nickname; не появляется здесь. Вместо этого, .. - + Щёлкните здесь. Появится окно IM-адресаОкно IM-адреса - + - - - + + + - + @@ -3126,19 +3126,19 @@ Limits on Real Name and Ident? -Smeknamnet fylls automatiskt i här. Om du vet personens riktiga namn, ersätt smeknamnet med det riktiga namnet. - + Observera att smeknamnet inte visas här. Istället, ... - + Klicka här. Fönstret DirektmeddelandeadresserFönstret Direktmeddelandeadresser. - + #include #include -#include +#include #include #define DIRECTION_OUTPUT 0 diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp index c8f884f..936ff2d 100644 --- a/konversation/src/highlight_preferences.cpp +++ b/konversation/src/highlight_preferences.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/konversation/src/images.cpp b/konversation/src/images.cpp index 133dd15..4ffb2c0 100644 --- a/konversation/src/images.cpp +++ b/konversation/src/images.cpp @@ -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 diff --git a/konversation/src/images.h b/konversation/src/images.h index 4f61c62..b985a3e 100644 --- a/konversation/src/images.h +++ b/konversation/src/images.h @@ -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]; diff --git a/konversation/src/konsolepanel.h b/konversation/src/konsolepanel.h index 88c0f81..91c66d5 100644 --- a/konversation/src/konsolepanel.h +++ b/konversation/src/konsolepanel.h @@ -14,7 +14,7 @@ #include "chatwindow.h" -#include +#include class KonsolePanel : public ChatWindow diff --git a/konversation/src/konversation.upd b/konversation/src/konversation.upd index 0909314..5944d8a 100644 --- a/konversation/src/konversation.upd +++ b/konversation/src/konversation.upd @@ -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 -- cgit v1.2.1