diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 21:36:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 21:36:00 -0600 |
| commit | c8eb617c9e02d6bf135c5420303524ce2f2f9613 (patch) | |
| tree | 37e7dd7220e7d4d2dc6614ecc214f8572211a913 | |
| parent | 73c2fec2c356697d87f51b2200e421a26aef1d95 (diff) | |
| download | konversation-c8eb617c9e02d6bf135c5420303524ce2f2f9613.tar.gz konversation-c8eb617c9e02d6bf135c5420303524ce2f2f9613.zip | |
Rename additional instances of KDE to TDE
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| -rw-r--r-- | konversation/src/Makefile.am | 2 | ||||
| -rw-r--r-- | konversation/src/konvisettingsdialog.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 6cfef98..0f868bd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2083,8 +2083,8 @@ if test $kde_qtver = 3; then *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2093,9 +2093,9 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") @@ -2104,8 +2104,8 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -2114,13 +2114,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/konversation/src/Makefile.am b/konversation/src/Makefile.am index e0e59d2..8ce9955 100644 --- a/konversation/src/Makefile.am +++ b/konversation/src/Makefile.am @@ -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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +konversation_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor rcdir = $(kde_datadir)/konversation rc_DATA = konversationui.rc eventsrc diff --git a/konversation/src/konvisettingsdialog.h b/konversation/src/konvisettingsdialog.h index 202cad6..b0d63f6 100644 --- a/konversation/src/konvisettingsdialog.h +++ b/konversation/src/konvisettingsdialog.h @@ -42,7 +42,7 @@ class OSD_Config; class Ignore_Config; class TabNotifications_Config; -class KDEUI_EXPORT KonviSettingsDialog : public KonviConfigDialog +class TDEUI_EXPORT KonviSettingsDialog : public KonviConfigDialog { Q_OBJECT TQ_OBJECT |