move thread widgets to thread/

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

diff --git a/kita/src/Makefile.am b/kita/src/Makefile.am
index 9924888..97abc6b 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 prefs write
+SUBDIRS = libkita kitaui image part thread prefs write
 # 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,16 +14,16 @@ 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 $(LIB_KFILE) $(LIB_KDEPRINT)
+kita_la_LIBADD = ./image/libkitaimage.la ./prefs/libkitapref.la ./part/libkitapart.la ./libkita/libkita.la ./kitaui/libkitaui.la ./write/libkitawrite.la ./thread/libkitathread.la $(LIB_KFILE) $(LIB_KDEPRINT)
 kita_LDADD = kita.la
 
 # which sources should be compiled for kita
-kita_la_SOURCES = main.cpp kita.cpp kitaiface.skel kitasubjectview.cpp kitaboardview.cpp threadlistview.cpp favoritelistview.cpp kitaboardtabwidget.cpp kitathreadtabwidget.cpp kitasubjecttabwidget.cpp threadlistviewbase.ui kitaboardviewbase.ui threadproperty.ui favoriteswindowbase.ui listviewitem.cpp favoriteswindow.cpp
+kita_la_SOURCES = main.cpp kita.cpp kitaiface.skel kitasubjectview.cpp kitaboardview.cpp threadlistview.cpp favoritelistview.cpp kitaboardtabwidget.cpp kitasubjecttabwidget.cpp threadlistviewbase.ui kitaboardviewbase.ui threadproperty.ui favoriteswindowbase.ui listviewitem.cpp favoriteswindow.cpp
 
 kita_SOURCES = dummy.cpp
 
 # these are the headers for your project
-noinst_HEADERS = kita.h kitasubjectview.h kitaboardview.h threadlistview.h favoritelistview.h kitaboardtabwidget.h kitathreadtabwidget.h kitasubjecttabwidget.h listviewitem.h favoriteswindow.h
+noinst_HEADERS = kita.h kitasubjectview.h kitaboardview.h threadlistview.h favoritelistview.h kitaboardtabwidget.h kitasubjecttabwidget.h listviewitem.h favoriteswindow.h
 
 # client stuff
 kita_client_LDFLAGS = $(KDE_RPATH) $(all_libraries)
@@ -48,7 +48,7 @@ kdelnk_DATA = kita.desktop
 
 # this is where the XML-GUI resource file goes
 rcdir = $(kde_datadir)/kita
-rc_DATA = kitaui.rc kitasubjecttabwidgetui.rc kitathreadtabwidgetui.rc
+rc_DATA = kitaui.rc kitasubjecttabwidgetui.rc
 
 dummy.cpp:
        echo > dummy.cpp

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index 6c3f58e..b17bbdb 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -12,11 +12,12 @@
 
 #include "prefs/prefs.h"
 
-#include "kitathreadview.h"
+#include "thread/threadview.h"
+#include "thread/threadtabwidget.h"
+
 #include "kitasubjectview.h"
 #include "kitaboardview.h"
 #include "kitaboardtabwidget.h"
-#include "kitathreadtabwidget.h"
 #include "kitasubjecttabwidget.h"
 #include "favoriteswindow.h"
 

diff --git a/kita/src/part/Makefile.am b/kita/src/part/Makefile.am
index 9694cdd..9624851 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 = kitathreadview.cpp kitathreadviewbase.ui kitahtmlpart.cpp kitahtmlview.cpp kitadomtree.cpp
+libkitapart_la_SOURCES = kitahtmlview.cpp
 
-noinst_HEADERS = kitathreadview.h kitahtmlpart.h kitahtmlview.h kitadomtree.h
+noinst_HEADERS = kitahtmlview.h
 
 METASOURCES = AUTO
 

diff --git a/kita/src/thread/.cvsignore b/kita/src/thread/.cvsignore
new file mode 100644 (file)
index 0000000..3b3e118
--- /dev/null
+++ b/kita/src/thread/.cvsignore
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+*base.cpp
+*base.h
+*.la
+*.lo
+*.moc
+*.moc.cpp
+*.all_cpp.cpp
+.deps
+.libs

diff --git a/kita/src/thread/Makefile.am b/kita/src/thread/Makefile.am
new file mode 100644 (file)
index 0000000..4f794d5
--- /dev/null
+++ b/kita/src/thread/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = $(all_includes) -I..
+METASOURCES = AUTO
+
+lib_LTLIBRARIES =  libkitathread.la
+libkitathread_la_LDFLAGS = $(all_libraries)
+
+# this is where the XML-GUI resource file goes
+rcdir = $(kde_datadir)/kita
+
+
+rc_DATA =  threadtabwidgetui.rc
+noinst_HEADERS =  domtree.h htmlpart.h threadtabwidget.h threadview.h
+libkitathread_la_SOURCES =  domtree.cpp htmlpart.cpp threadtabwidget.cpp threadview.cpp threadviewbase.ui

diff --git a/kita/src/write/writeview.cpp b/kita/src/write/writeview.cpp
index d155f8e..64e227c 100644 (file)
--- a/kita/src/write/writeview.cpp
+++ b/kita/src/write/writeview.cpp
@@ -19,7 +19,8 @@
 #include "libkita/kita-utf8.h"
 #include "libkita/kita_misc.h"
 
-#include "part/kitahtmlpart.h"
+#include "thread/htmlpart.h"
+
 #include "part/kitahtmlview.h"
 
 #include <ksqueezedtextlabel.h>