svnno****@sourc*****
svnno****@sourc*****
2009年 7月 12日 (日) 00:24:24 JST
ForkRevision: 2400
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2400
Author: nogu
Date: 2009-07-12 00:24:24 +0900 (Sun, 12 Jul 2009)
Log Message:
-----------
reduce dependency
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/bbsview.cpp
kita/branches/KITA-KDE4/kita/src/boardtabwidget.h
kita/branches/KITA-KDE4/kita/src/boardview.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/boardmanager.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/favoritethreads.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/threadinfo.h
kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
kita/branches/KITA-KDE4/kita/src/prefs/prefs.h
Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-11 15:24:24 UTC (rev 2400)
@@ -14,6 +14,7 @@
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
#include <QtCore/QTextCodec>
+#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtGui/QHBoxLayout>
#include <QtGui/QMessageBox>
Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -11,6 +11,7 @@
#ifndef KITABOARDTABWIDGET_H
#define KITABOARDTABWIDGET_H
+#include "ktabbar.h"
#include "kitaui/tabwidgetbase.h"
class KitaBoardView;
Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-11 15:24:24 UTC (rev 2400)
@@ -13,6 +13,7 @@
#include <QtCore/QDateTime>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
+#include <QtGui/QMouseEvent>
#include <Qt3Support/Q3PtrList>
#include <kaction.h>
Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-07-11 15:24:24 UTC (rev 2400)
@@ -15,8 +15,10 @@
#include <QtGui/QApplication>
#include <kaction.h>
+#include <kactioncollection.h>
#include <klocale.h>
#include <kshortcutsdialog.h>
+#include <ktabbar.h>
/*--------------------------------------------------------------*/
Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -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 <k3dockwidget.h>
-#include <kparts/browserextension.h>
+#include <kparts/part.h>
#include <kparts/partmanager.h>
-class KUrl;
class QIcon;
+
class KMenu;
+class KUrl;
namespace KParts
{
Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -15,7 +15,6 @@
#include <Qt3Support/Q3PtrList>
#include <Qt3Support/Q3ValueList>
-#include <kapplication.h>
#include <kurl.h>
class QSjisCodec;
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-11 15:24:24 UTC (rev 2400)
@@ -55,11 +55,7 @@
m_thread = Thread::getByURL(m_datURL);
/* japanese strings */
-#if KDE_IS_VERSION(3, 3, 0)
m_spacestr = Kita::utf8ToUnicode(KITAUTF8_ZENSPACE);
-#else
- m_spacestr = ". ";
-#endif
m_framestr1 = Kita::utf8ToUnicode(KITAUTF8_FRAME1); /* | */
m_framestr2 = Kita::utf8ToUnicode(KITAUTF8_FRAME2); /* |- */
m_framestr3 = Kita::utf8ToUnicode(KITAUTF8_FRAME3); /* L */
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -12,7 +12,6 @@
#define KITADATINFO_H
#include <QtCore/QDateTime>
-#include <QtCore/QMutex>
#include <QtCore/QObject>
#include <Qt3Support/Q3ValueList>
#include <Qt3Support/Q3ValueVector>
Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -11,12 +11,9 @@
#ifndef FAVORITETHREADS_H
#define FAVORITETHREADS_H
-#include <QtCore/QMap>
-#include <Qt3Support/Q3Dict>
-#include <Qt3Support/Q3PtrList>
#include <Qt3Support/Q3ValueList>
-#include <kurl.h>
+#include <kdemacros.h>
class QDomNode;
Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-07-11 15:24:24 UTC (rev 2400)
@@ -17,6 +17,7 @@
#include <kurl.h>
+#include "boardmanager.h"
#include "config_xt.h"
#include "datinfo.h" /* struct RESDAT is defined. */
#include "datmanager.h"
Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -13,11 +13,13 @@
#include <QtCore/QString>
-#include "boardmanager.h"
+#include <kdemacros.h>
-class KUrl;
class QDateTime;
+class QFont;
+class KUrl;
+
struct RESDAT;
Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -13,7 +13,7 @@
#include <QtCore/QMap>
-#include <kurl.h>
+#include <kdemacros.h>
/**
*
Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-11 15:24:24 UTC (rev 2400)
@@ -12,10 +12,12 @@
#include <QtCore/QEvent>
#include <QtCore/QFile>
+#include <QtGui/QKeyEvent>
#include <QtGui/QSplitter>
#include <kaction.h>
#include <kactioncollection.h>
+#include <kapplication.h>
#include <kconfig.h>
#include <kedittoolbar.h>
#include <kglobal.h>
@@ -255,7 +257,7 @@
void KitaMainWindow::slotEditCopy()
{
- QWidget * widget = kapp->focusWidget();
+ QWidget * widget = KApplication::kApplication()->focusWidget();
if (widget) {
QKeyEvent e(QEvent::KeyPress, Qt::Key_C, Qt::ControlModifier);
Modified: kita/branches/KITA-KDE4/kita/src/prefs/prefs.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/prefs/prefs.h 2009-07-11 14:40:14 UTC (rev 2399)
+++ kita/branches/KITA-KDE4/kita/src/prefs/prefs.h 2009-07-11 15:24:24 UTC (rev 2400)
@@ -11,16 +11,11 @@
#ifndef KITAPREFS_H
#define KITAPREFS_H
-#include <QtGui/QFrame>
-
#include <kconfigdialog.h>
#include "ui_asciiartprefbase.h"
#include "ui_faceprefbase.h"
#include "ui_uiprefbase.h"
-#include "libkita/favoriteboards.h"
-#include "libkita/favoritethreads.h"
-#include "libkita/threadinfo.h"
class DebugPrefPage;