svnno****@sourc*****
svnno****@sourc*****
2009年 7月 11日 (土) 23:40:14 JST
Revision: 2399 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2399 Author: nogu Date: 2009-07-11 23:40:14 +0900 (Sat, 11 Jul 2009) Log Message: ----------- reduce dependency Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/bbsview.cpp kita/branches/KITA-KDE4/kita/src/bbsview.h kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp kita/branches/KITA-KDE4/kita/src/boardtabwidget.h kita/branches/KITA-KDE4/kita/src/boardview.cpp kita/branches/KITA-KDE4/kita/src/domtree.h kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp kita/branches/KITA-KDE4/kita/src/favoritelistview.h kita/branches/KITA-KDE4/kita/src/htmlpart.cpp kita/branches/KITA-KDE4/kita/src/htmlpart.h kita/branches/KITA-KDE4/kita/src/mainwindow.h kita/branches/KITA-KDE4/kita/src/respopup.cpp kita/branches/KITA-KDE4/kita/src/respopup.h kita/branches/KITA-KDE4/kita/src/threadlistview.cpp kita/branches/KITA-KDE4/kita/src/threadlistview.h kita/branches/KITA-KDE4/kita/src/threadview.cpp kita/branches/KITA-KDE4/kita/src/threadview.h kita/branches/KITA-KDE4/kita/src/viewmediator.cpp kita/branches/KITA-KDE4/kita/src/viewmediator.h kita/branches/KITA-KDE4/kita/src/writeview.cpp kita/branches/KITA-KDE4/kita/src/writeview.h Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -15,12 +15,17 @@ #include <QtCore/QStringList> #include <QtCore/QTextCodec> #include <QtGui/QClipboard> +#include <QtGui/QHBoxLayout> #include <QtGui/QMessageBox> +#include <QtGui/QSpacerItem> +#include <QtGui/QVBoxLayout> +#include <Qt3Support/Q3Header> #include <Qt3Support/Q3ValueList> #include <kaction.h> #include <kcombobox.h> #include <kconfig.h> +#include <klocale.h> #include <kmenu.h> #include <kmessagebox.h> #include <krun.h> Modified: kita/branches/KITA-KDE4/kita/src/bbsview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -14,8 +14,6 @@ #include <QtGui/QWidget> #include <Qt3Support/Q3ValueList> -#include <kparts/browserextension.h> - class KComboBox; class KUrl; class K3ListView; Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -18,6 +18,8 @@ #include <kmenu.h> #include <krun.h> +#include "boardview.h" +#include "favoritelistview.h" #include "viewmediator.h" #include "libkita/boardmanager.h" Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -11,10 +11,10 @@ #ifndef KITABOARDTABWIDGET_H #define KITABOARDTABWIDGET_H -#include "boardview.h" -#include "favoritelistview.h" #include "kitaui/tabwidgetbase.h" +class KitaBoardView; + /** @author Hideki Ikemoto */ Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -22,6 +22,7 @@ #include <krun.h> #include <kstandarddirs.h> +#include "boardtabwidget.h" #include "threadlistviewitem.h" #include "ui_threadproperty.h" #include "viewmediator.h" Modified: kita/branches/KITA-KDE4/kita/src/domtree.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/domtree.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/domtree.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -13,7 +13,6 @@ #include <Qt3Support/Q3ValueVector> -#include <khtml_part.h> #include <dom/html_block.h> #include <dom/html_document.h> Modified: kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -19,6 +19,7 @@ #include <krun.h> #include <k3listview.h> +#include "threadlistviewitem.h" #include "viewmediator.h" #include "libkita/boardmanager.h" #include "libkita/datmanager.h" Modified: kita/branches/KITA-KDE4/kita/src/favoritelistview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/favoritelistview.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/favoritelistview.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -12,7 +12,6 @@ #define FAVORITELISTVIEW_H #include "threadlistview.h" -#include "threadlistviewitem.h" /** * Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -14,6 +14,9 @@ #include <QtGui/QApplication> #include <QtGui/QClipboard> #include <QtGui/QCursor> +#include <QtGui/QScrollBar> +#include <QtGui/QStyle> +#include <QtGui/QStyleOptionComplex> #include <kaction.h> #include <khtml_events.h> Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -12,7 +12,6 @@ #define KITAHTMLPART_H #include <QtCore/QEvent> -#include <QtGui/QFrame> #include <khtml_part.h> Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/mainwindow.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/mainwindow.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -15,13 +15,12 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kurl.h> #include <kxmlguiwindow.h> +class KLineEdit; class KPrinter; class KToggleAction; -class KLineEdit; +class KUrl; class KitaBBSTabWidget; class KitaBoardTabWidget; Modified: kita/branches/KITA-KDE4/kita/src/respopup.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/respopup.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/respopup.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -18,6 +18,7 @@ #include <dom/html_element.h> #include "const.h" +#include "htmlpart.h" #include "kitaui/htmlview.h" #include "libkita/config_xt.h" Modified: kita/branches/KITA-KDE4/kita/src/respopup.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/respopup.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/respopup.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -13,8 +13,12 @@ #include <QtGui/QFrame> -#include "htmlpart.h" +#include <kurl.h> +class KHTMLView; + +class KitaHTMLPart; + namespace Kita { class ResPopup : public QFrame Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -13,6 +13,7 @@ #include <kurl.h> #include <k3listview.h> +#include "threadlistviewitem.h" #include "viewmediator.h" #include "libkita/kita_misc.h" Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadlistview.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/threadlistview.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -12,11 +12,10 @@ #include <Qt3Support/Q3ValueList> -#include <k3listview.h> -#include <kparts/browserextension.h> - #include "ui_threadlistviewbase.h" +class K3ListView; + struct Col_Attr { const char* labelName; /// for header's label Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -11,7 +11,9 @@ #include "threadview.h" +#include <QtGui/QHBoxLayout> #include <QtGui/QToolButton> +#include <QtGui/QVBoxLayout> #include <kaction.h> #include <kcombobox.h> @@ -22,6 +24,7 @@ #include <dom/html_inline.h> #include "htmlpart.h" +#include "threadtabwidget.h" #include "viewmediator.h" #include "libkita/boardmanager.h" #include "libkita/datmanager.h" Modified: kita/branches/KITA-KDE4/kita/src/threadview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/threadview.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -11,22 +11,23 @@ #ifndef KITATHREADVIEW_H #define KITATHREADVIEW_H -#include <ktextbrowser.h> +#include <QtGui/QWidget> + +#include <kurl.h> #include <dom/html_base.h> -#include <kparts/browserextension.h> -class KUrl; -class KitaHTMLPart; -class KComboBox; +class QFrame; +class QHBoxLayout; +class QSpacerItem; class QToolButton; -class QSpacerItem; class QVBoxLayout; -class QHBoxLayout; + +class KComboBox; +class KXMLGUIClient; + +class KitaHTMLPart; class KitaThreadTabWidget; -#include <q3valuestack.h> // for gcc-2.9x -template <class T> class Q3ValueStack; - namespace Kita { class KitaSubjectLabel; Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/viewmediator.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/viewmediator.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -12,6 +12,11 @@ #include <krun.h> #include <kio/netaccess.h> +#include "boardtabwidget.h" +#include "favoritelistview.h" +#include "mainwindow.h" +#include "threadtabwidget.h" +#include "writetabwidget.h" #include "libkita/datmanager.h" ViewMediator* ViewMediator::instance = 0; Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/viewmediator.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/viewmediator.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -10,12 +10,16 @@ #ifndef VIEWMEDIATOR_H #define VIEWMEDIATOR_H -#include "bbstabwidget.h" -#include "boardtabwidget.h" -#include "mainwindow.h" -#include "threadtabwidget.h" -#include "writetabwidget.h" +class QString; +class KUrl; + +class KitaBoardTabWidget; +class KitaMainWindow; +class KitaThreadTabWidget; +class KitaWriteTabWidget; +class FavoriteListView; + /** * @author Hideki Ikemoto <ikemo****@wakab*****> */ Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-07-11 14:40:14 UTC (rev 2399) @@ -18,6 +18,7 @@ #include <kio/job.h> #include "viewmediator.h" +#include "writetabwidget.h" #include "libkita/account.h" #include "libkita/asciiart.h" #include "libkita/boardmanager.h" @@ -32,8 +33,6 @@ /*--------------------------------------------------------------------*/ -QCp932Codec* KitaWriteView::m_cp932Codec = 0; - /* Call setMessage() to set message later. Modified: kita/branches/KITA-KDE4/kita/src/writeview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.h 2009-07-11 13:14:32 UTC (rev 2398) +++ kita/branches/KITA-KDE4/kita/src/writeview.h 2009-07-11 14:40:14 UTC (rev 2399) @@ -15,13 +15,11 @@ #include <Qt3Support/Q3CString> #include <kio/job.h> -#include <kparts/browserextension.h> #include "ui_writedialogbase.h" -#include "writetabwidget.h" class KitaPreviewPart; -class QCp932Codec; +class KitaWriteTabWidget; /* result code */ enum{ @@ -58,7 +56,6 @@ KUrl m_bbscgi; int m_bbstype; KUrl m_datURL; - static QCp932Codec* m_cp932Codec; QString m_mailswap; void initUI();