diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 20:55:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 20:55:33 -0600 |
| commit | 4c28885b3430cc76803fd93fefee122cf062a6d9 (patch) | |
| tree | d11732fdfed5ec1426c11eeebd4b9dca1dd5c69f | |
| parent | e2b4830f330ab46d77feae46bb8d60f5587af81f (diff) | |
| download | kaffeine-4c28885b3430cc76803fd93fefee122cf062a6d9.tar.gz kaffeine-4c28885b3430cc76803fd93fefee122cf062a6d9.zip | |
Rename kiobuffer and KHTML
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | kaffeine/src/input/audiobrowser/Makefile.am | 2 | ||||
| -rw-r--r-- | kaffeine/src/input/audiobrowser/googlefetcher.cpp | 2 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/dummy-part/Makefile | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ae99774..6b49cdd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,7 +2075,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") @@ -2096,7 +2096,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") @@ -2087,7 +2087,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") @@ -2108,7 +2108,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/kaffeine/src/input/audiobrowser/Makefile.am b/kaffeine/src/input/audiobrowser/Makefile.am index b743ccd..451ff96 100644 --- a/kaffeine/src/input/audiobrowser/Makefile.am +++ b/kaffeine/src/input/audiobrowser/Makefile.am @@ -21,7 +21,7 @@ libkaffeineaudiobrowser_la_LDFLAGS = $(KDE_RPATH) \ libkaffeineaudiobrowser_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \ - $(LIB_KHTML) + $(LIB_TDEHTML) # this is where the XML-GUI resource file goes shellrcdir = $(kde_datadir)/kaffeine diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp index d41d561..f12d232 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp +++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp @@ -96,7 +96,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size) // choice if we're going to screen-scrape Google. try { - KHTMLPart part; + TDEHTMLPart part; // Create empty document. diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile index 27d08b3..8d71a40 100644 --- a/kaffeine/src/player-parts/dummy-part/Makefile +++ b/kaffeine/src/player-parts/dummy-part/Makefile @@ -148,7 +148,7 @@ LIB_TDEUI = -ltdeui LIB_KDNSSD = -ltdednssd LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -ltdehtml +LIB_TDEHTML = -ltdehtml LIB_KIMPROXY = -ltdeimproxy LIB_KIO = -lkio LIB_KJS = -lkjs |