svnno****@sourc*****
svnno****@sourc*****
2009年 7月 6日 (月) 06:22:06 JST
Revision: 2369 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2369 Author: nogu Date: 2009-07-06 06:22:06 +0900 (Mon, 06 Jul 2009) Log Message: ----------- change include directives see also: http://techbase.kde.org/Policies/Library_Code_Policy#Getting_.23includes_right Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/bbstabwidget.cpp 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/boardview.h kita/branches/KITA-KDE4/kita/src/domtree.cpp kita/branches/KITA-KDE4/kita/src/domtree.h kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp kita/branches/KITA-KDE4/kita/src/htmlpart.cpp kita/branches/KITA-KDE4/kita/src/htmlpart.h kita/branches/KITA-KDE4/kita/src/kitaui/htmlview.cpp kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h kita/branches/KITA-KDE4/kita/src/libkita/access.cpp kita/branches/KITA-KDE4/kita/src/libkita/access.h kita/branches/KITA-KDE4/kita/src/libkita/account.cpp kita/branches/KITA-KDE4/kita/src/libkita/account.h kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp kita/branches/KITA-KDE4/kita/src/libkita/cache.h kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.cpp kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.h kita/branches/KITA-KDE4/kita/src/libkita/jbbs.cpp kita/branches/KITA-KDE4/kita/src/libkita/jbbs.h kita/branches/KITA-KDE4/kita/src/libkita/k2ch.cpp kita/branches/KITA-KDE4/kita/src/libkita/k2ch.h kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h kita/branches/KITA-KDE4/kita/src/libkita/machibbs.cpp kita/branches/KITA-KDE4/kita/src/libkita/machibbs.h kita/branches/KITA-KDE4/kita/src/libkita/thread.cpp kita/branches/KITA-KDE4/kita/src/libkita/thread.h kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h kita/branches/KITA-KDE4/kita/src/main.cpp kita/branches/KITA-KDE4/kita/src/mainwindow.cpp kita/branches/KITA-KDE4/kita/src/mainwindow.h kita/branches/KITA-KDE4/kita/src/prefs/aboneprefpage.cpp kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp kita/branches/KITA-KDE4/kita/src/prefs/prefs.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/threadtabwidget.cpp 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/writetabwidget.cpp kita/branches/KITA-KDE4/kita/src/writeview.cpp kita/branches/KITA-KDE4/kita/src/writeview.h Modified: kita/branches/KITA-KDE4/kita/src/bbstabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbstabwidget.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/bbstabwidget.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,10 +9,11 @@ ***************************************************************************/ #include "bbstabwidget.h" -#include "bbsview.h" #include <klocale.h> +#include "bbsview.h" + /*--------------------------------------------------------------*/ Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,39 +10,36 @@ #include "bbsview.h" -#include <kio/netaccess.h> +#include <QtCore/QFile> +#include <QtCore/QRegExp> +#include <QtCore/QStringList> +#include <QtCore/QTextCodec> +#include <QtGui/QClipboard> +#include <QtGui/QLayout> +#include <QtGui/QMessageBox> +#include <QtGui/QToolButton> +#include <Qt3Support/Q3ValueList> + #include <kaction.h> #include <kcombobox.h> -#include <krun.h> -#include <k3listview.h> -#include <kmenu.h> -#include <klocale.h> -#include <kdebug.h> -#include <kstandarddirs.h> #include <kconfig.h> -#include <ksimpleconfig.h> +#include <kdebug.h> #include <kdeversion.h> -#include <kmessagebox.h> #include <kiconloader.h> +#include <klocale.h> +#include <kmenu.h> +#include <kmessagebox.h> +#include <krun.h> +#include <ksimpleconfig.h> +#include <kstandarddirs.h> +#include <k3listview.h> +#include <kio/netaccess.h> -#include <qfile.h> -#include <qtextcodec.h> -#include <qstringlist.h> -#include <qregexp.h> -#include <q3valuelist.h> -#include <q3header.h> -#include <qclipboard.h> -#include <qmessagebox.h> -#include <qtoolbutton.h> -#include <qlayout.h> - #include "viewmediator.h" - #include "kitaui/listviewitem.h" - -#include "libkita/favoriteboards.h" #include "libkita/boardmanager.h" #include "libkita/config_xt.h" +#include "libkita/favoriteboards.h" #include "libkita/kita_misc.h" namespace Kita Modified: kita/branches/KITA-KDE4/kita/src/bbsview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,11 +11,11 @@ #ifndef KITABBSVIEW_H #define KITABBSVIEW_H +#include <QtGui/QWidget> +#include <Qt3Support/Q3ValueList> + #include <kparts/browserextension.h> -#include <qwidget.h> -#include <q3valuelist.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-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,22 +10,20 @@ #include "boardtabwidget.h" -#include "viewmediator.h" +#include <QtGui/QApplication> +#include <QtGui/QClipboard> -#include "libkita/boardmanager.h" - +#include <kaction.h> +#include <kactioncollection.h> #include <kdebug.h> #include <klocale.h> #include <kmenu.h> #include <krun.h> #include <kstdaccel.h> -#include <kaction.h> -#include <kactioncollection.h> -#include <qapplication.h> -#include <qclipboard.h> +#include "viewmediator.h" +#include "libkita/boardmanager.h" - KitaBoardTabWidget::KitaBoardTabWidget( QWidget* parent, Qt::WFlags f ) : KitaTabWidgetBase( parent, f ) { Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,11 +11,10 @@ #ifndef KITABOARDTABWIDGET_H #define KITABOARDTABWIDGET_H +#include "boardview.h" +#include "favoritelistview.h" #include "kitaui/tabwidgetbase.h" -#include "favoritelistview.h" -#include "boardview.h" - /** @author Hideki Ikemoto */ Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,52 +10,46 @@ #include "boardview.h" -// include files for Qt -#include <qtoolbutton.h> -#include <qtextbrowser.h> -#include <qtextcodec.h> -#include <qregexp.h> -#include <qfile.h> -#include <qclipboard.h> -#include <qapplication.h> -#include <qdatetime.h> -#include <qlabel.h> -#include <qmessagebox.h> -#include <qcombobox.h> -#include <q3header.h> -#include <q3ptrlist.h> +#include <QtCore/QDateTime> +#include <QtCore/QFile> +#include <QtCore/QRegExp> +#include <QtCore/QTextCodec> +#include <QtGui/QApplication> +#include <QtGui/QClipboard> +#include <QtGui/QComboBox> +#include <QtGui/QLabel> +#include <QtGui/QMessageBox> +#include <QtGui/QTextBrowser> +#include <QtGui/QToolButton> +#include <Qt3Support/Q3PtrList> -// kdelibs/kio -#include <kio/slaveconfig.h> -#include <kio/netaccess.h> - -// include files for KDE #include <kaction.h> -#include <kmenu.h> -#include <kwindowsystem.h> +#include <kconfig.h> +#include <kdebug.h> #include <kfilterdev.h> -#include <k3listview.h> #include <kiconloader.h> #include <klocale.h> +#include <kmenu.h> #include <krun.h> -#include <kdebug.h> -#include <kconfig.h> #include <kstandarddirs.h> +#include <kwindowsystem.h> +#include <k3listview.h> +#include <kio/netaccess.h> +#include <kio/slaveconfig.h> -#include "libkita/thread.h" -#include "libkita/kita_misc.h" -#include "libkita/favoritethreads.h" +#include "boardtabwidget.h" +#include "threadlistviewitem.h" +#include "ui_threadproperty.h" +#include "viewmediator.h" +#include "libkita/boardmanager.h" +#include "libkita/config_xt.h" #include "libkita/datmanager.h" +#include "libkita/favoritethreads.h" +#include "libkita/kita_misc.h" +#include "libkita/thread.h" #include "libkita/threadindex.h" -#include "libkita/boardmanager.h" #include "libkita/threadinfo.h" -#include "libkita/config_xt.h" -#include "ui_threadproperty.h" -#include "threadlistviewitem.h" -#include "viewmediator.h" -#include "boardtabwidget.h" - KitaBoardView::KitaBoardView( KitaBoardTabWidget* parent ) : Kita::ThreadListView( parent ) { Modified: kita/branches/KITA-KDE4/kita/src/boardview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardview.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/boardview.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -12,6 +12,7 @@ #define KITABOARDVIEW_H #include <kurl.h> + #include "threadlistview.h" class QWidget; Modified: kita/branches/KITA-KDE4/kita/src/domtree.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/domtree.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/domtree.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -13,13 +13,12 @@ #include "domtree.h" #include <kurl.h> - #include <dom/dom_text.h> -#include "libkita/datmanager.h" #include "libkita/datinfo.h" -#include "libkita/kita-utf8.h" +#include "libkita/datmanager.h" #include "libkita/kita_misc.h" +#include "libkita/kita-utf8.h" KitaDomTree::KitaDomTree( const DOM::HTMLDocument& hdoc, const KUrl& datURL ) { Modified: kita/branches/KITA-KDE4/kita/src/domtree.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/domtree.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/domtree.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,10 +11,9 @@ #ifndef KITADOMTREE_H #define KITADOMTREE_H -#include <q3valuevector.h> +#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-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,26 +10,25 @@ #include "favoritelistview.h" -#include "viewmediator.h" +#include <QtCore/QDateTime> +#include <QtGui/QApplication> +#include <QtGui/QClipboard> +#include <QtGui/QToolButton> +#include <QtGui/QLabel> -#include "libkita/favoritethreads.h" -#include "libkita/kita_misc.h" -#include "libkita/datmanager.h" -#include "libkita/boardmanager.h" -#include "libkita/thread.h" - -#include <qapplication.h> -#include <qclipboard.h> -#include <qdatetime.h> -#include <qtoolbutton.h> -#include <qlabel.h> - #include <kaction.h> #include <klocale.h> #include <kmenu.h> #include <krun.h> #include <k3listview.h> +#include "viewmediator.h" +#include "libkita/boardmanager.h" +#include "libkita/datmanager.h" +#include "libkita/favoritethreads.h" +#include "libkita/kita_misc.h" +#include "libkita/thread.h" + /** * */ Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,35 +10,32 @@ #include "htmlpart.h" +#include <QtCore/QRegExp> +#include <QtGui/QApplication> +#include <QtGui/QClipboard> +#include <QtGui/QCursor> +#include <QtGui/QMessageBox> + #include <kaction.h> -#include <kmenu.h> -#include <klocale.h> -#include <khtml_events.h> #include <kdebug.h> +#include <khtml_events.h> +#include <klocale.h> +#include <kmenu.h> #include <krun.h> - #include <dom/html_element.h> #include <dom/html_misc.h> -#include <qcursor.h> -#include <qapplication.h> -#include <qclipboard.h> -#include <qmessagebox.h> -#include <qregexp.h> - +#include "const.h" #include "domtree.h" #include "respopup.h" #include "viewmediator.h" -#include "const.h" - #include "kitaui/htmlview.h" - -#include "libkita/datmanager.h" +#include "libkita/abone.h" #include "libkita/boardmanager.h" +#include "libkita/config_xt.h" #include "libkita/datinfo.h" +#include "libkita/datmanager.h" #include "libkita/kita_misc.h" -#include "libkita/config_xt.h" -#include "libkita/abone.h" /*-------------------------------------------*/ Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,9 +11,10 @@ #ifndef KITAHTMLPART_H #define KITAHTMLPART_H +#include <QtCore/QEvent> +#include <QtGui/QFrame> + #include <khtml_part.h> -#include <qframe.h> -#include <qevent.h> /* mode */ enum { Modified: kita/branches/KITA-KDE4/kita/src/kitaui/htmlview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/kitaui/htmlview.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/kitaui/htmlview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,11 +10,11 @@ #include "htmlview.h" +#include <QtGui/QApplication> +#include <QtGui/QClipboard> + #include <khtml_part.h> -#include <qapplication.h> -#include <qclipboard.h> - KitaHTMLView::KitaHTMLView( KHTMLPart* part, QWidget *parent ) : KHTMLView( part, parent ) {} Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -12,30 +12,29 @@ #include "tabwidgetbase.h" -#include "kita_misc.h" -#include "parsemisc.h" -#include "datmanager.h" +#include <QtCore/QCustomEvent> +#include <QtGui/QApplication> +#include <QtGui/QFontMetrics> +#include <QtGui/QMessageBox> +#include <Qt3Support/Q3PtrList> -#include <klibloader.h> -#include <kmenu.h> -#include <kdebug.h> -#include <kstdaccel.h> #include <kaction.h> -#include <klocale.h> -#include <kparts/factory.h> +#include <kactioncollection.h> +#include <kconfig.h> +#include <kdebug.h> #include <kdeversion.h> #include <kglobal.h> -#include <kconfig.h> -#include <kstandarddirs.h> -#include <kactioncollection.h> +#include <klibloader.h> +#include <klocale.h> +#include <kmenu.h> #include <kshortcutsdialog.h> +#include <kstandarddirs.h> +#include <kstdaccel.h> +#include <kparts/factory.h> -#include <qapplication.h> -#include <qmessagebox.h> -#include <q3ptrlist.h> -#include <qfontmetrics.h> -//Added by qt3to4: -#include <QCustomEvent> +#include "datmanager.h" +#include "kita_misc.h" +#include "parsemisc.h" /*--------------------------------------------------------------*/ Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,20 +11,17 @@ #ifndef KITATABWIDGETBASE_H #define KITATABWIDGETBASE_H +#include <QtCore/QCustomEvent> +#include <QtCore/QEvent> +#include <Qt3Support/Q3Dict> + +#include <ktabbar.h> #include <ktabwidget.h> #include <kxmlguiclient.h> -#include <kparts/partmanager.h> +#include <k3dockwidget.h> #include <kparts/browserextension.h> +#include <kparts/partmanager.h> -#include <ktabbar.h> - -#include <k3dockwidget.h> - -#include <qevent.h> -#include <q3dict.h> -//Added by qt3to4: -#include <QCustomEvent> - class KUrl; class QIcon; class KMenu; Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/access.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/access.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -8,20 +8,21 @@ * (at your option) any later version. * ***************************************************************************/ #include "access.h" -#include "cache.h" -#include "kita_misc.h" -#include "account.h" -#include "boardmanager.h" +#include <QtCore/QDateTime> +#include <QtCore/QFile> +#include <QtCore/QRegExp> + #include <kurl.h> -#include <kio/slaveconfig.h> +#include <k3rfcdate.h> #include <kio/job.h> #include <kio/jobuidelegate.h> -#include <k3rfcdate.h> +#include <kio/slaveconfig.h> -#include <qregexp.h> -#include <qfile.h> -#include <QDateTime> +#include "account.h" +#include "boardmanager.h" +#include "cache.h" +#include "kita_misc.h" using namespace Kita; Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/access.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/access.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,10 +10,10 @@ #ifndef KITAACCESS_H #define KITAACCESS_H +#include <QtCore/QObject> + #include <kurl.h> -#include <qobject.h> - class KJob; namespace KIO { Modified: kita/branches/KITA-KDE4/kita/src/libkita/account.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/account.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/account.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,19 +9,17 @@ ***************************************************************************/ #include "account.h" -#include <kurl.h> +#include <QtCore/QRegExp> +#include <QtGui/QApplication> +#include <Qt3Support/Q3CString> -#include <kio/slaveconfig.h> -#include <kio/netaccess.h> -#include <kio/jobclasses.h> +#include <kurl.h> #include <kio/job.h> +#include <kio/jobclasses.h> #include <kio/jobuidelegate.h> +#include <kio/netaccess.h> +#include <kio/slaveconfig.h> -#include <qregexp.h> -#include <qapplication.h> -//Added by qt3to4: -#include <Q3CString> - using namespace Kita; Account* Account::instance = 0; Modified: kita/branches/KITA-KDE4/kita/src/libkita/account.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/account.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/account.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,13 +10,12 @@ #ifndef KITAACCOUNT_H #define KITAACCOUNT_H +#include <QtCore/QEventLoop> +#include <QtCore/QObject> +#include <Qt3Support/Q3CString> + #include <kdemacros.h> -#include <qobject.h> -//Added by qt3to4: -#include <Q3CString> -#include <QEventLoop> - namespace KIO { class Job; Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,28 +9,29 @@ ***************************************************************************/ #include "boardmanager.h" -#include <Q3TextStream> -#include <Q3PtrList> -#include "downloadmanager.h" -#include "cache.h" -#include "favoritethreads.h" -#include "thread.h" -#include "threadinfo.h" -#include "favoriteboards.h" -#include "kita_misc.h" -#include "threadindex.h" +#include <QtCore/QDateTime> +#include <QtCore/QDir> +#include <QtCore/QFile> +#include <QtCore/QRegExp> +#include <QtCore/QTextCodec> +#include <Qt3Support/Q3PtrList> +#include <Qt3Support/Q3TextStream> + #include <kdebug.h> +#include <kdeversion.h> +#include <kfilterdev.h> #include <kio/netaccess.h> -#include <kfilterdev.h> #include <kio/slaveconfig.h> -#include <kdeversion.h> -#include <qfile.h> -#include <qdir.h> -#include <qregexp.h> -#include <qdatetime.h> -#include <qtextcodec.h> +#include "cache.h" +#include "downloadmanager.h" +#include "favoriteboards.h" +#include "favoritethreads.h" +#include "kita_misc.h" +#include "thread.h" +#include "threadindex.h" +#include "threadinfo.h" using namespace Kita; Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,12 +11,12 @@ #ifndef KITABOARDMANAGER_H #define KITABOARDMANAGER_H +#include <QtCore/QStringList> +#include <Qt3Support/Q3PtrList> +#include <Qt3Support/Q3ValueList> + #include <kapplication.h> #include <kurl.h> -//Added by qt3to4: -#include <Q3ValueList> -#include <Q3PtrList> -#include <QStringList> class QSjisCodec; class QEucJpCodec; Modified: kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -8,13 +8,14 @@ * (at your option) any later version. * ***************************************************************************/ #include "cache.h" -#include "boardmanager.h" -#include <kurl.h> #include <kglobal.h> #include <kstandarddirs.h> #include <kprotocolmanager.h> +#include <kurl.h> +#include "boardmanager.h" + using namespace Kita; QString Cache::baseDir() Modified: kita/branches/KITA-KDE4/kita/src/libkita/cache.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/cache.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/cache.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,7 +10,7 @@ #ifndef KITACACHE_H #define KITACACHE_H -#include <qstring.h> +#include <QtCore/QString> class KUrl; Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,21 +10,22 @@ #include "datinfo.h" -#include <qregexp.h> -#include <qstringlist.h> +#include <QtCore/QRegExp> +#include <QtCore/QStringList> + #include <klocale.h> -#include "datmanager.h" +#include "abone.h" #include "access.h" -#include "thread.h" -#include "kita-utf8.h" -#include "kita-utf16.h" -#include "kita_misc.h" #include "account.h" -#include "threadindex.h" #include "cache.h" #include "config_xt.h" -#include "abone.h" +#include "datmanager.h" +#include "kita_misc.h" +#include "kita-utf16.h" +#include "kita-utf8.h" +#include "thread.h" +#include "threadindex.h" using namespace Kita; Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,13 +11,13 @@ #ifndef KITADATINFO_H #define KITADATINFO_H -#include <qobject.h> -//Added by qt3to4: -#include <Q3ValueList> +#include <QtCore/QDateTime> +#include <QtCore/QMutex> +#include <QtCore/QObject> +#include <Qt3Support/Q3ValueList> +#include <Qt3Support/Q3ValueVector> + #include <kurl.h> -#include <Q3ValueVector> -#include <qdatetime.h> -#include <qmutex.h> class QStringList; Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,21 +11,21 @@ /* DatManager manages all information about thread */ #include "datmanager.h" -#include <qobject.h> -#include <qmutex.h> -#include <qstringlist.h> -#include <qregexp.h> -#include <qfile.h> +#include <QtCore/QFile> +#include <QtCore/QMutex> +#include <QtCore/QObject> +#include <QtCore/QRegExp> +#include <QtCore/QStringList> -#include "thread.h" -#include "threadinfo.h" +#include "boardmanager.h" +#include "cache.h" #include "datinfo.h" -#include "cache.h" #include "kita_misc.h" +#include "kita-utf16.h" #include "kita-utf8.h" -#include "kita-utf16.h" +#include "thread.h" #include "threadindex.h" -#include "boardmanager.h" +#include "threadinfo.h" using namespace Kita; Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,10 +11,10 @@ #ifndef KITADATMANAGER_H #define KITADATMANAGER_H +#include <Qt3Support/Q3ValueList> + #include <kdemacros.h> -#include <q3valuelist.h> - class KUrl; class QObject; class QStringList; Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -8,12 +8,12 @@ * (at your option) any later version. * ***************************************************************************/ #include "favoriteboards.h" + +#include <QtXml/QDomDocument> +#include <Qt3Support/Q3ValueList> + #include "boardmanager.h" -#include <qdom.h> -//Added by qt3to4: -#include <Q3ValueList> - using namespace Kita; FavoriteBoards* FavoriteBoards::instance = 0; Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,9 +10,9 @@ #ifndef KITAFAVORITEBOARDS_H #define KITAFAVORITEBOARDS_H -#include <qobject.h> -//Added by qt3to4: -#include <Q3ValueList> +#include <QtCore/QObject> +#include <Qt3Support/Q3ValueList> + #include <kurl.h> class QDomNode; Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,19 +9,19 @@ ***************************************************************************/ #include "favoritethreads.h" -#include "thread.h" -#include "threadindex.h" + +#include <QtXml/QDomDocument> +#include <Qt3Support/Q3StyleSheet> +#include <Qt3Support/Q3ValueList> + +#include <kdebug.h> + #include "boardmanager.h" #include "datmanager.h" #include "kita_misc.h" +#include "thread.h" +#include "threadindex.h" -#include <kdebug.h> - -#include <q3stylesheet.h> -#include <qdom.h> -//Added by qt3to4: -#include <Q3ValueList> - // FavoriteThreadItem FavoriteThreadItem::FavoriteThreadItem() {} Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,15 +11,13 @@ #ifndef FAVORITETHREADS_H #define FAVORITETHREADS_H +#include <QtCore/QMap> +#include <Qt3Support/Q3Dict> +#include <Qt3Support/Q3PtrList> +#include <Qt3Support/Q3ValueList> + #include <kurl.h> -#include <qmap.h> -#include <qxml.h> -#include <q3ptrlist.h> -#include <q3dict.h> -//Added by qt3to4: -#include <Q3ValueList> - class QDomNode; /** Modified: kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,11 +9,11 @@ ***************************************************************************/ #include "flashcgi.h" -#include "kita_misc.h" +#include <QtCore/QTextCodec> #include <kurl.h> -#include <qtextcodec.h> +#include "kita_misc.h" FlashCGI::FlashCGI() { Modified: kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/flashcgi.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,10 +10,10 @@ #ifndef FLASHCGI_H #define FLASHCGI_H +#include <QtCore/QString> + #include <kdemacros.h> -#include <qstring.h> - /** @author Hideki Ikemoto <ikemo****@users*****> */ Modified: kita/branches/KITA-KDE4/kita/src/libkita/jbbs.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/jbbs.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/jbbs.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,11 +9,12 @@ ***************************************************************************/ #include "jbbs.h" -#include <qsjiscodec.h> // FIXME -#include "kita_misc.h" +#include <QtCore/QTextCodec> #include <kurl.h> +#include "kita_misc.h" + JBBS::JBBS() { } Modified: kita/branches/KITA-KDE4/kita/src/libkita/jbbs.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/jbbs.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/jbbs.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,10 +10,10 @@ #ifndef JBBS_H #define JBBS_H +#include <QtCore/QString> + #include <kdemacros.h> -#include <qstring.h> - /** @author Hideki Ikemoto <ikemo****@users*****> */ Modified: kita/branches/KITA-KDE4/kita/src/libkita/k2ch.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/k2ch.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/k2ch.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,11 +9,12 @@ ***************************************************************************/ #include "k2ch.h" -#include "qsjiscodec.h" -#include "kita_misc.h" +#include <QtCore/QTextCodec> #include <kurl.h> +#include "kita_misc.h" + K2ch::K2ch() { } Modified: kita/branches/KITA-KDE4/kita/src/libkita/k2ch.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/k2ch.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/k2ch.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,9 +10,10 @@ #ifndef K2CH_H #define K2CH_H +#include <QtCore/QString> + #include <kdemacros.h> -#include <qstring.h> /** @author Hideki Ikemoto <ikemo****@users*****> */ Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,23 +9,24 @@ ***************************************************************************/ #include "kita_misc.h" -#include "datinfo.h" /* struct RESDAT is defined. */ -#include "kita-utf8.h" -#include "kita-utf16.h" -#include "config_xt.h" -#include "datmanager.h" -#include <kurl.h> -#include <klocale.h> +#include <QtCore/QDateTime> +#include <QtCore/QDir> +#include <QtCore/QMutex> +#include <QtCore/QRegExp> +#include <QtCore/QTextCodec> +#include <Qt3Support/Q3CString> + #include <kdebug.h> #include <kdeversion.h> +#include <klocale.h> +#include <kurl.h> -#include <qregexp.h> -#include <qtextcodec.h> -#include <qdir.h> -#include <qmutex.h> -#include <qdatetime.h> -#include <q3cstring.h> +#include "config_xt.h" +#include "datinfo.h" /* struct RESDAT is defined. */ +#include "datmanager.h" +#include "kita-utf8.h" +#include "kita-utf16.h" #define KITA_RESDIGIT 4 Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,10 +11,10 @@ #ifndef KITAKITA_MISC_H #define KITAKITA_MISC_H +#include <QtCore/QString> + #include "boardmanager.h" -#include <qstring.h> - class KUrl; class QDateTime; Modified: kita/branches/KITA-KDE4/kita/src/libkita/machibbs.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/machibbs.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/machibbs.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,11 +9,12 @@ ***************************************************************************/ #include "machibbs.h" -#include <qsjiscodec.h> // FIXME -#include "kita_misc.h" +#include <QtCore/QTextCodec> #include <kurl.h> +#include "kita_misc.h" + MachiBBS::MachiBBS() { } Modified: kita/branches/KITA-KDE4/kita/src/libkita/machibbs.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/machibbs.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/machibbs.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,10 +10,10 @@ #ifndef MACHIBBS_H #define MACHIBBS_H +#include <QtCore/QString> + #include <kdemacros.h> -#include <qstring.h> - /** @author Hideki Ikemoto <ikemo****@users*****> */ Modified: kita/branches/KITA-KDE4/kita/src/libkita/thread.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/thread.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/thread.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,11 +10,9 @@ #include "thread.h" -#include <qregexp.h> -//Added by qt3to4: -#include <Q3ValueList> +#include <QtCore/QRegExp> +#include <Qt3Support/Q3ValueList> - using namespace Kita; Q3Dict<Thread>* Thread::m_threadDict = 0; Modified: kita/branches/KITA-KDE4/kita/src/libkita/thread.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/thread.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/thread.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,9 +11,10 @@ #ifndef KITATHREAD_H #define KITATHREAD_H +#include <Qt3Support/Q3Dict> +#include <Qt3Support/Q3ValueList> + #include <kurl.h> -#include <q3dict.h> -#include <q3valuelist.h> namespace Kita { Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -7,20 +7,20 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ + #include "threadindex.h" +#include <QtCore/QFile> +#include <Qt3Support/Q3ValueList> + #include <kconfig.h> #include <KConfigGroup> -#include <qfile.h> -//Added by qt3to4: -#include <Q3ValueList> - #include "cache.h" +#include "datmanager.h" +#include "kita_misc.h" #include "thread.h" #include "threadinfo.h" -#include "kita_misc.h" -#include "datmanager.h" using namespace Kita; Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -12,11 +12,11 @@ #define USE_INDEX +#include <QtCore/QString> +#include <Qt3Support/Q3ValueList> + #include <kdemacros.h> -#include <qstring.h> -#include <q3valuelist.h> - class KUrl; class KConfig; Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,11 +10,11 @@ #include "threadinfo.h" +#include <QtCore/QDataStream> +#include <QtCore/QMap> + #include <kurl.h> -#include <qmap.h> -#include <qdatastream.h> - KitaThreadInfo* KitaThreadInfo::instance = 0; KitaThreadInfo::KitaThreadInfo() : m_readDict() Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,10 +11,10 @@ #ifndef KITATHREADINFO_H #define KITATHREADINFO_H +#include <QtCore/QMap> + #include <kurl.h> -#include <qmap.h> - /** * * Hideki Ikemoto Modified: kita/branches/KITA-KDE4/kita/src/main.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/main.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/main.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,10 +10,10 @@ #include "mainwindow.h" -#include <kuniqueapplication.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> +#include <kuniqueapplication.h> #include "libkita/config_xt.h" Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,66 +10,64 @@ #include "mainwindow.h" -#include "prefs/prefs.h" +#include <QtCore/QEvent> +#include <QtCore/QRegExp> +#include <QtCore/QTextCodec> +#include <QtGui/QClipboard> +#include <QtGui/QLayout> +#include <QtGui/QMessageBox> +#include <QtGui/QPushButton> +#include <QtGui/QSplitter> +#include <Qt3Support/Q3DragObject> -#include "threadview.h" -#include "threadtabwidget.h" -#include "boardview.h" -#include "boardtabwidget.h" -#include "bbsview.h" -#include "bbstabwidget.h" -#include "writetabwidget.h" -#include "viewmediator.h" - -#include "libkita/threadinfo.h" -#include "libkita/favoriteboards.h" -#include "libkita/favoritethreads.h" -#include "libkita/kita_misc.h" -#include "libkita/account.h" -#include "libkita/datmanager.h" -#include "libkita/boardmanager.h" -#include "libkita/config_xt.h" -#include "libkita/asciiart.h" -#include "libkita/abone.h" - -#include <q3dragobject.h> -#include <qtextcodec.h> -#include <qevent.h> -#include <qregexp.h> -#include <qmessagebox.h> -#include <qclipboard.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qsplitter.h> - -#include <klineedit.h> +#include <kaboutdata.h> +#include <kaction.h> +#include <kactioncollection.h> +#include <kconfig.h> +#include <kdebug.h> +#include <kdeversion.h> +#include <kedittoolbar.h> +#include <kfiledialog.h> #include <kglobal.h> -#include <klocale.h> #include <kiconloader.h> +#include <klineedit.h> +#include <klocale.h> #include <kmenubar.h> -#include <kstatusbar.h> -#include <kshortcutsdialog.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> -#include <kconfig.h> -#include <kurl.h> #include <krun.h> -#include <kstandarddirs.h> -#include <kdebug.h> +#include <kshortcut.h> +#include <kshortcutsdialog.h> #include <ksimpleconfig.h> -#include <kedittoolbar.h> +#include <kstandarddirs.h> +#include <kstatusbar.h> #include <kstdaccel.h> -#include <kaction.h> #include <kstdaction.h> -#include <kshortcut.h> -#include <kaboutdata.h> -#include <kparts/partmanager.h> -#include <kdeversion.h> -#include <kxmlguifactory.h> #include <ktoggleaction.h> #include <ktoolbar.h> -#include <kactioncollection.h> +#include <kurl.h> +#include <kxmlguifactory.h> +#include <kio/netaccess.h> +#include <kparts/partmanager.h> +#include "bbstabwidget.h" +#include "bbsview.h" +#include "boardtabwidget.h" +#include "boardview.h" +#include "threadtabwidget.h" +#include "threadview.h" +#include "viewmediator.h" +#include "writetabwidget.h" +#include "libkita/abone.h" +#include "libkita/account.h" +#include "libkita/asciiart.h" +#include "libkita/boardmanager.h" +#include "libkita/config_xt.h" +#include "libkita/datmanager.h" +#include "libkita/favoriteboards.h" +#include "libkita/favoritethreads.h" +#include "libkita/kita_misc.h" +#include "libkita/threadinfo.h" +#include "prefs/prefs.h" + KitaMainWindow::KitaMainWindow() : KXmlGuiWindow( 0 ) { Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/mainwindow.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/mainwindow.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -16,8 +16,8 @@ #endif #include <kapplication.h> +#include <kurl.h> #include <kxmlguiwindow.h> -#include <kurl.h> class KPrinter; class KToggleAction; Modified: kita/branches/KITA-KDE4/kita/src/prefs/aboneprefpage.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/aboneprefpage.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/prefs/aboneprefpage.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -7,6 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ + #include "aboneprefpage.h" #include <ktextedit.h> Modified: kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,35 +10,35 @@ #include "prefs.h" +#include <QtGui/QButtonGroup> +#include <QtGui/QCheckBox> +#include <QtGui/QLabel> +#include <QtGui/QLayout> +#include <QtGui/QMessageBox> +#include <QtGui/QPushButton> +#include <QtGui/QSpinBox> +#include <Qt3Support/Q3ListBox> +#include <Qt3Support/Q3VBox> + +#include <kapplication.h> +#include <kcolorbutton.h> +#include <kcolordialog.h> +#include <kfontdialog.h> +#include <kiconloader.h> #include <klocale.h> -#include <kfontdialog.h> -#include <kcolordialog.h> +#include <kmessagebox.h> #include <kpushbutton.h> #include <ktextedit.h> -#include <kcolorbutton.h> +#include <ktoolinvocation.h> #include <kurllabel.h> -#include <kmessagebox.h> -#include <kapplication.h> -#include <kiconloader.h> -#include <ktoolinvocation.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <q3listbox.h> -#include <qmessagebox.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qbuttongroup.h> -#include <q3vbox.h> - -#include "libkita/kita_misc.h" -#include "libkita/boardmanager.h" -#include "libkita/config_xt.h" -#include "libkita/asciiart.h" #include "aboneprefpage.h" #include "ui_login_page.h" #include "ui_write_page.h" +#include "libkita/asciiart.h" +#include "libkita/boardmanager.h" +#include "libkita/config_xt.h" +#include "libkita/kita_misc.h" using namespace Kita; Modified: kita/branches/KITA-KDE4/kita/src/prefs/prefs.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/prefs.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/prefs/prefs.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,16 +11,16 @@ #ifndef KITAPREFS_H #define KITAPREFS_H +#include <QtGui/QFrame> + #include <kconfigdialog.h> -#include <qframe.h> #include "ui_asciiartprefbase.h" +#include "ui_faceprefbase.h" #include "ui_uiprefbase.h" -#include "ui_faceprefbase.h" - +#include "libkita/favoriteboards.h" #include "libkita/favoritethreads.h" #include "libkita/threadinfo.h" -#include "libkita/favoriteboards.h" class DebugPrefPage; Modified: kita/branches/KITA-KDE4/kita/src/respopup.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/respopup.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/respopup.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,19 +10,17 @@ #include "respopup.h" -#include <qapplication.h> -#include <qcursor.h> -#include <qdesktopwidget.h> +#include <QtGui/QApplication> +#include <QtGui/QCursor> +#include <QtGui/QDesktopWidget> -#include <dom/html_element.h> #include <dom/html_document.h> +#include <dom/html_element.h> +#include "const.h" #include "kitaui/htmlview.h" - #include "libkita/config_xt.h" -#include "const.h" - namespace Kita { ResPopup::ResPopup( KHTMLView* view, const KUrl& url ) Modified: kita/branches/KITA-KDE4/kita/src/respopup.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/respopup.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/respopup.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,7 +11,7 @@ #ifndef RESPOPUP_H #define RESPOPUP_H -#include <qframe.h> +#include <QtGui/QFrame> #include "htmlpart.h" Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,24 +10,21 @@ #include "threadlistview.h" -#include "viewmediator.h" +#include <QtCore/QRegExp> +#include <QtGui/QComboBox> +#include <QtGui/QToolButton> #include <kiconloader.h> -#include <k3listview.h> #include <klocale.h> #include <kurl.h> +#include <k3listview.h> -#include <qtoolbutton.h> -#include <qcombobox.h> -#include <qregexp.h> -#include <q3header.h> - -#include "libkita/thread.h" +#include "threadlistviewitem.h" +#include "viewmediator.h" #include "libkita/config_xt.h" #include "libkita/kita_misc.h" +#include "libkita/thread.h" -#include "threadlistviewitem.h" - using namespace Kita; struct Col_Attr ThreadListView::s_colAttr[] = Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadlistview.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/threadlistview.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,12 +10,13 @@ #ifndef KITATHREADLISTVIEW_H #define KITATHREADLISTVIEW_H -#include "ui_threadlistviewbase.h" +#include <Qt3Support/Q3ValueList> #include <k3listview.h> #include <kparts/browserextension.h> -#include <q3valuelist.h> +#include "ui_threadlistviewbase.h" + struct Col_Attr { const char* labelName; /// for header's label Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,31 +9,30 @@ ***************************************************************************/ #include "threadtabwidget.h" -#include "threadview.h" -#include "htmlpart.h" -#include "viewmediator.h" -#include "libkita/kita_misc.h" -#include "libkita/parsemisc.h" -#include "libkita/datmanager.h" -#include "libkita/boardmanager.h" -#include "libkita/kita-utf8.h" -#include "libkita/config_xt.h" +#include <QtCore/QRegExp> +#include <QtGui/QApplication> +#include <QtGui/QClipboard> +#include <QtGui/QMessageBox> -#include <kdebug.h> -#include <kstdaccel.h> #include <kaction.h> +#include <kactioncollection.h> +#include <kdebug.h> #include <klocale.h> #include <krun.h> #include <kstandardaction.h> -#include <kactioncollection.h> +#include <kstdaccel.h> -#include <qapplication.h> -#include <qregexp.h> -#include <qclipboard.h> -#include <qmessagebox.h> +#include "htmlpart.h" +#include "threadview.h" +#include "viewmediator.h" +#include "libkita/boardmanager.h" +#include "libkita/config_xt.h" +#include "libkita/datmanager.h" +#include "libkita/kita_misc.h" +#include "libkita/kita-utf8.h" +#include "libkita/parsemisc.h" - /*--------------------------------------------------------------------------------*/ Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,43 +11,41 @@ #include "threadview.h" -#include <krun.h> -#include <kurl.h> +#include <QtCore/QDateTime> +#include <QtGui/QClipboard> +#include <QtGui/QCursor> +#include <QtGui/QLabel> +#include <QtGui/QLayout> +#include <QtGui/QMessageBox> +#include <QtGui/QProgressDialog> +#include <QtGui/QToolButton> +#include <QtGui/QTextBrowser> + +#include <kaction.h> +#include <kapplication.h> +#include <kcombobox.h> +#include <kdebug.h> #include <khtmlview.h> #include <kiconloader.h> #include <klocale.h> -#include <kaction.h> #include <kmessagebox.h> -#include <kdebug.h> -#include <kapplication.h> +#include <krun.h> #include <ktextbrowser.h> -#include <kcombobox.h> - -#include <dom/html_inline.h> +#include <kurl.h> #include <dom/html_base.h> -#include <dom/html_list.h> #include <dom/html_document.h> +#include <dom/html_inline.h> +#include <dom/html_list.h> -#include <qclipboard.h> -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qprogressdialog.h> -#include <qcursor.h> -#include <qtextbrowser.h> -#include <qmessagebox.h> -#include <qdatetime.h> - #include "htmlpart.h" #include "viewmediator.h" - -#include "libkita/kita-utf8.h" -#include "libkita/favoritethreads.h" -#include "libkita/favoriteboards.h" -#include "libkita/datmanager.h" #include "libkita/boardmanager.h" -#include "libkita/kita_misc.h" #include "libkita/config_xt.h" +#include "libkita/datmanager.h" +#include "libkita/favoriteboards.h" +#include "libkita/favoritethreads.h" +#include "libkita/kita_misc.h" +#include "libkita/kita-utf8.h" #define MAX_LABEL_LENGTH 60 Modified: kita/branches/KITA-KDE4/kita/src/threadview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/threadview.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,11 +11,10 @@ #ifndef KITATHREADVIEW_H #define KITATHREADVIEW_H -#include <kparts/browserextension.h> +#include <ktextbrowser.h> #include <dom/html_base.h> +#include <kparts/browserextension.h> -#include <ktextbrowser.h> - class KUrl; class KitaHTMLPart; class KComboBox; Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/viewmediator.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/viewmediator.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -9,11 +9,11 @@ ***************************************************************************/ #include "viewmediator.h" +#include <krun.h> +#include <kio/netaccess.h> + #include "libkita/datmanager.h" -#include <kio/netaccess.h> -#include <krun.h> - ViewMediator* ViewMediator::instance = 0; ViewMediator::ViewMediator() Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/viewmediator.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/viewmediator.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,11 +10,11 @@ #ifndef VIEWMEDIATOR_H #define VIEWMEDIATOR_H +#include "bbstabwidget.h" +#include "boardtabwidget.h" +#include "mainwindow.h" #include "threadtabwidget.h" #include "writetabwidget.h" -#include "boardtabwidget.h" -#include "bbstabwidget.h" -#include "mainwindow.h" /** * @author Hideki Ikemoto <ikemo****@wakab*****> Modified: kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,20 +10,20 @@ #include "writetabwidget.h" -#include "libkita/kita_misc.h" -#include "libkita/datmanager.h" -#include "libkita/boardmanager.h" -#include "writeview.h" +#include <QtGui/QClipboard> +#include <QtGui/QMessageBox> +#include <kaction.h> +#include <kactioncollection.h> +#include <kapplication.h> #include <kdebug.h> +#include <klocale.h> #include <kstdaccel.h> -#include <kaction.h> -#include <klocale.h> -#include <kapplication.h> -#include <kactioncollection.h> -#include <qmessagebox.h> -#include <qclipboard.h> +#include "writeview.h" +#include "libkita/boardmanager.h" +#include "libkita/datmanager.h" +#include "libkita/kita_misc.h" /*--------------------------------------------------------------------------------*/ Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-07-05 21:22:06 UTC (rev 2369) @@ -10,45 +10,41 @@ #include "writeview.h" -#include "viewmediator.h" +#include <QtCore/QFile> +#include <QtCore/QTextCodec> +#include <QtGui/QApplication> +#include <QtGui/QCheckBox> +#include <QtGui/QComboBox> +#include <QtGui/QLabel> +#include <QtGui/QLayout> +#include <QtGui/QMessageBox> +#include <QtGui/QPushButton> +#include <QtGui/QTextEdit> -#include "libkita/datmanager.h" -#include "libkita/boardmanager.h" +#include <kdebug.h> +#include <klineedit.h> +#include <klocale.h> +#include <kmessagebox.h> +#include <ksqueezedtextlabel.h> +#include <kstandarddirs.h> +#include <ktabwidget.h> +#include <kio/job.h> + +#include "htmlpart.h" +#include "viewmediator.h" #include "libkita/account.h" -#include "libkita/kita-utf8.h" -#include "libkita/kita_misc.h" -#include "libkita/config_xt.h" #include "libkita/asciiart.h" +#include "libkita/boardmanager.h" +#include "libkita/config_xt.h" +#include "libkita/datmanager.h" +#include "libkita/flashcgi.h" +#include "libkita/jbbs.h" +#include "libkita/kita_misc.h" +#include "libkita/kita-utf8.h" #include "libkita/k2ch.h" #include "libkita/machibbs.h" -#include "libkita/jbbs.h" -#include "libkita/flashcgi.h" - -#include "htmlpart.h" - #include "kitaui/htmlview.h" -#include <ksqueezedtextlabel.h> -#include <klocale.h> -#include <kdebug.h> -#include <kstandarddirs.h> -#include <klineedit.h> -#include <kmessagebox.h> -#include <kio/job.h> - -#include <qapplication.h> -#include <qtextedit.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qmessagebox.h> -#include <ktabwidget.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtextcodec.h> - - /*--------------------------------------------------------------------*/ QCp932Codec* KitaWriteView::m_cp932Codec = NULL; Modified: kita/branches/KITA-KDE4/kita/src/writeview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.h 2009-07-05 12:21:14 UTC (rev 2368) +++ kita/branches/KITA-KDE4/kita/src/writeview.h 2009-07-05 21:22:06 UTC (rev 2369) @@ -11,10 +11,11 @@ #ifndef KITAWRITEVIEW_H #define KITAWRITEVIEW_H -#include <qwidget.h> +#include <QtGui/QWidget> +#include <Qt3Support/Q3CString> + #include <kio/job.h> #include <kparts/browserextension.h> -#include <q3cstring.h> #include "ui_writedialogbase.h" #include "writetabwidget.h"