refactoring (move method)

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

diff --git a/kita/src/part/kitahtmlpart.h b/kita/src/part/kitahtmlpart.h
index ef8f28c..6e87b61 100644 (file)
--- a/kita/src/part/kitahtmlpart.h
+++ b/kita/src/part/kitahtmlpart.h
@@ -42,7 +42,6 @@ public:
   QString contents() { return m_contents; }
   void pushCurrentPosition();
   void clearPosition() { m_pointStack.clear(); }
-  bool gobackAnchor();
   bool gotoAnchor(const QString& name);
 
   void setPrevQuery(QStringList prevQuery) { m_prevQuery = prevQuery; }
@@ -54,6 +53,8 @@ public:
   void highLightenNodes(DOM::NodeList nodes, const QStringList &query);
   static QStringList lt_gt_spliter( const QString & input );
   void displayContents(const QString& input, const KURL& urlOfInput = 0);
+public slots:
+  bool gobackAnchor();
 signals:
   void setLocationBarURL( const QString &url );
 };

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index 95fde80..ac7af5e 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -91,7 +91,7 @@ KitaThreadView::KitaThreadView(QWidget *parent, const char *name)
   connect( SearchButton, SIGNAL( clicked() ), SLOT( slotSearchButton() ) );
   connect( SearchCombo, SIGNAL( activated(int) ), SLOT( slotSearchButton() ) );
   connect( HighLightButton, SIGNAL( toggled(bool) ), SLOT( slotHighLightenButton(bool) ) );
-  connect( GobackAnchorButton, SIGNAL( clicked() ), SLOT( gobackAnchor() ) );
+  connect( GobackAnchorButton, SIGNAL( clicked() ), m_threadPart, SLOT( gobackAnchor() ) );
   connect( ReloadButton, SIGNAL( clicked() ), SLOT( slotReloadButton() ) );
 
   KParts::BrowserExtension * ext = m_threadPart->browserExtension();
@@ -267,10 +267,10 @@ void KitaThreadView::slotThreadResult(KIO::Job* job)
   m_threadData.truncate(0);
 
   if ( m_thread.datURL().hasRef() ) {
-    if ( ! gotoAnchor( m_thread.datURL().encodedHtmlRef()) )
-      gotoAnchor( m_thread.datURL().htmlRef() );
+    if ( ! m_threadPart->gotoAnchor( m_thread.datURL().encodedHtmlRef()) )
+      m_threadPart->gotoAnchor( m_thread.datURL().htmlRef() );
   } else {
-    gotoAnchor( QString().setNum(m_thread.resNum()) );
+    m_threadPart->gotoAnchor( QString().setNum(m_thread.resNum()) );
   }
   m_threadPart->clearPosition();
   m_threadPart->pushCurrentPosition();
@@ -422,14 +422,14 @@ void KitaThreadView::searchNext(const QStringList &query)
     return;
   }
 
-  gotoAnchor( QString("highlighten%1").arg( m_threadPart->nextHit() )  );
+  m_threadPart->gotoAnchor( QString("highlighten%1").arg( m_threadPart->nextHit() )  );
 }
 
 void KitaThreadView::slotOnURL(const QString& url)
 {
   emit signalChangeStatusbar(url);
 }
-
+/*
 bool KitaThreadView::gotoAnchor( const QString &name )
 {
   return m_threadPart->gotoAnchor( name );
@@ -438,13 +438,13 @@ bool KitaThreadView::gotoAnchor( const QString &name )
 bool KitaThreadView::gobackAnchor()
 {
   return m_threadPart->gobackAnchor();
-}
+}*/
 
 void KitaThreadView::slotPopupMenu( KXMLGUIClient *client, const QPoint &global, const KURL &url, const QString &mimeType, mode_t mode)
 {
   KActionCollection * collection = client->actionCollection();
   KAction * action;
-  action = new KAction( i18n("goback anchor"), SmallIcon("idea"), KShortcut(), this, SLOT( gobackAnchor() ), collection, "goback_anchor" );
+  action = new KAction( i18n("goback anchor"), SmallIcon("idea"), KShortcut(), m_threadPart, SLOT( gobackAnchor() ), collection, "goback_anchor" );
   printf("  KitaThreadView::slotPopupMenu() %p\n", action);
   emit popupMenu(client, global, url, mimeType, mode);
 }
@@ -453,14 +453,14 @@ void KitaThreadView::slotOpenURLRequest(const KURL& url, const KParts::URLArgs&
 {
   printf(" openURLRequest:: orgURL %s\n", url.url().latin1() );
   if ( url.url().at(0) == '#' ) {
-    gotoAnchor( url.ref() );
+    m_threadPart->gotoAnchor( url.ref() );
     return;
   }
   KURL datURL = filterReadCGI( url );
   if ( datURL.host() == m_thread.datURL().host()
     && datURL.path() == m_thread.datURL().path() )
   {
-    if ( datURL.hasRef() ) gotoAnchor( datURL.ref() );
+    if ( datURL.hasRef() ) m_threadPart->gotoAnchor( datURL.ref() );
     return;
   }
   emit openURLRequest(datURL, args);

diff --git a/kita/src/part/kitathreadview.h b/kita/src/part/kitathreadview.h
index 3da3fc4..c13bc03 100644 (file)
--- a/kita/src/part/kitathreadview.h
+++ b/kita/src/part/kitathreadview.h
@@ -63,11 +63,11 @@ public slots:
   void slotFontChanged(QFont& font);
 
 protected:
-  bool gotoAnchor(const QString& name);
+//  bool gotoAnchor(const QString& name);
 
 protected slots:
   void slotDOMNodeActivated(const DOM::Node &node);
-  bool gobackAnchor();
+//  bool gobackAnchor();
   void slotPopupMenu(KXMLGUIClient *, const QPoint&, const KURL&, const QString&, mode_t);
   void slotOpenURLRequest(const KURL&, const KParts::URLArgs&);