diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 20:54:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 20:54:53 -0600 |
| commit | c5350fd422f9315380362df15da05550afe6c015 (patch) | |
| tree | fbef734cf47acf680ad2d4a1258d6b238caa8df0 | |
| parent | dbf456169149e6f8e241afb9f4b42ecd7230357d (diff) | |
| download | digikam-c5350fd422f9315380362df15da05550afe6c015.tar.gz digikam-c5350fd422f9315380362df15da05550afe6c015.zip | |
Rename kiobuffer and KHTML
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | digikam/digikam/Makefile.am | 2 | ||||
| -rw-r--r-- | digikam/digikam/welcomepageview.cpp | 2 | ||||
| -rw-r--r-- | digikam/digikam/welcomepageview.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 657f827..2413bad 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2099,7 +2099,7 @@ 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, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") @@ -2120,7 +2120,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") diff --git a/cmake b/cmake -Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131 +Subproject 274366fb8b90704586d7beef216b765cc0688b0 diff --git a/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am index d027592..e41214d 100644 --- a/digikam/digikam/Makefile.am +++ b/digikam/digikam/Makefile.am @@ -115,7 +115,7 @@ libdigikam_la_LIBADD = $(LIB_SQLITE3) \ $(LIB_KPARTS) \ $(LIB_KIO) \ $(LIB_KABC) \ - $(LIB_KHTML) \ + $(LIB_TDEHTML) \ $(LIBKIPI_LIBS) \ $(LIBKEXIV2_LIBS) \ $(LIB_KUTILS) \ diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index 94654d5..dfc1c23 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -48,7 +48,7 @@ namespace Digikam { WelcomePageView::WelcomePageView(TQWidget* parent) - : KHTMLPart(parent) + : TDEHTMLPart(parent) { widget()->setFocusPolicy(TQ_WheelFocus); // Let's better be paranoid and disable plugins (it defaults to enabled): diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h index dc30110..2aca456 100644 --- a/digikam/digikam/welcomepageview.h +++ b/digikam/digikam/welcomepageview.h @@ -40,7 +40,7 @@ namespace Digikam { -class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart +class DIGIKAM_EXPORT WelcomePageView : public TDEHTMLPart { Q_OBJECT |