move kitahtmlview to kitaui/

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1678 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/Makefile.am b/kita/src/Makefile.am
index 5e05f0f..d39e0e1 100644 (file)
--- a/kita/src/Makefile.am
+++ b/kita/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for kita
 
-SUBDIRS = libkita kitaui image part thread prefs write board bbs
+SUBDIRS = libkita kitaui image thread prefs write board bbs
 # this is the program that gets installed.  it's name is used for all
 # of the other Makefile.am variables
 bin_PROGRAMS = kita kita_client
@@ -14,7 +14,7 @@ kita_la_LDFLAGS = -avoid-version -module $(KDE_RPATH) $(all_libraries)
 kita_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 
 # the libraries to link against.
-kita_la_LIBADD = ./image/libkitaimage.la ./prefs/libkitapref.la ./part/libkitapart.la ./libkita/libkita.la ./kitaui/libkitaui.la ./write/libkitawrite.la ./thread/libkitathread.la ./board/libkitaboard.la ./bbs/libkitabbs.la $(LIB_KFILE) $(LIB_KDEPRINT)
+kita_la_LIBADD = ./image/libkitaimage.la ./prefs/libkitapref.la ./libkita/libkita.la ./kitaui/libkitaui.la ./write/libkitawrite.la ./thread/libkitathread.la ./board/libkitaboard.la ./bbs/libkitabbs.la $(LIB_KFILE) $(LIB_KDEPRINT)
 kita_LDADD = kita.la
 
 # which sources should be compiled for kita

diff --git a/kita/src/kitaui/Makefile.am b/kita/src/kitaui/Makefile.am
index ade412d..52242f1 100644 (file)
--- a/kita/src/kitaui/Makefile.am
+++ b/kita/src/kitaui/Makefile.am
@@ -2,5 +2,6 @@ INCLUDES = -I$(top_srcdir)/kita/src/libkita $(all_includes)
 METASOURCES = AUTO
 lib_LTLIBRARIES =  libkitaui.la
 libkitaui_la_LDFLAGS = $(all_libraries)
-libkitaui_la_SOURCES = tabwidgetbase.cpp listviewitem.cpp
-noinst_HEADERS = tabwidgetbase.h listviewitem.h
+libkitaui_la_SOURCES = tabwidgetbase.cpp listviewitem.cpp htmlview.cpp
+noinst_HEADERS = tabwidgetbase.h listviewitem.h htmlview.h
+libkitaui_la_LIBADD = $(LIB_KHTML)

diff --git a/kita/src/part/kitahtmlview.cpp b/kita/src/kitaui/htmlview.cpp
similarity index 98%
rename from kita/src/part/kitahtmlview.cpp
rename to kita/src/kitaui/htmlview.cpp
index bb51a00..12037f2 100644 (file)
--- a/kita/src/part/kitahtmlview.cpp
+++ b/kita/src/kitaui/htmlview.cpp
@@ -8,7 +8,7 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#include "kitahtmlview.h"
+#include "htmlview.h"
 
 #include <khtml_part.h>
 

diff --git a/kita/src/part/kitahtmlview.h b/kita/src/kitaui/htmlview.h
similarity index 100%
rename from kita/src/part/kitahtmlview.h
rename to kita/src/kitaui/htmlview.h

diff --git a/kita/src/part/Makefile.am b/kita/src/part/Makefile.am
index 9624851..1b42d50 100644 (file)
--- a/kita/src/part/Makefile.am
+++ b/kita/src/part/Makefile.am
@@ -9,9 +9,9 @@ libkitapart_la_LDFLAGS = -avoid-version -module -no-undefined -L../libkita $(all
 
 libkitapart_la_LIBADD = $(top_builddir)/kita/src/libkita/libkita.la $(top_builddir)/kita/src/kitaui/libkitaui.la $(top_builddir)/kita/src/image/libkitaimage.la $(LIB_KPARTS) $(LIB_KHTML)
 
-libkitapart_la_SOURCES = kitahtmlview.cpp
+libkitapart_la_SOURCES = 
 
-noinst_HEADERS = kitahtmlview.h
+noinst_HEADERS = 
 
 METASOURCES = AUTO
 

diff --git a/kita/src/thread/htmlpart.cpp b/kita/src/thread/htmlpart.cpp
index 5aa3091..56c0b79 100644 (file)
--- a/kita/src/thread/htmlpart.cpp
+++ b/kita/src/thread/htmlpart.cpp
@@ -25,7 +25,7 @@
 #include "htmlpart.h"
 #include "domtree.h"
 
-#include "part/kitahtmlview.h"
+#include "kitaui/htmlview.h"
 
 #include "image/imageview.h"
 

diff --git a/kita/src/write/writeview.cpp b/kita/src/write/writeview.cpp
index 64e227c..1d67054 100644 (file)
--- a/kita/src/write/writeview.cpp
+++ b/kita/src/write/writeview.cpp
@@ -21,7 +21,7 @@
 
 #include "thread/htmlpart.h"
 
-#include "part/kitahtmlview.h"
+#include "kitaui/htmlview.h"
 
 #include <ksqueezedtextlabel.h>
 #include <klocale.h>