[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kate/app
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2005-04-27 20:31:00
Message-ID: 20050427203100.EB2D5630 () office ! kde ! org
[Download RAW message or body]

CVS commit by cullmann: 

yeah, one eventFilter less again, hacks away


  M +10 -13    kateviewmanager.cpp   1.173
  M +0 -2      kateviewmanager.h   1.71
  M +2 -1      kateviewspacecontainer.cpp   1.164


--- kdebase/kate/app/kateviewmanager.cpp  #1.172:1.173
@@ -189,7 +189,11 @@ void KateViewManager::slotNewTab()
 {
   uint documentNumber=0;
-  if (m_currentContainer) {
-    if (m_currentContainer->activeView()) \
documentNumber=m_currentContainer->activeView()->getDoc()->documentNumber(); +
+  if (m_currentContainer)
+  {
+    if (m_currentContainer->activeView())
+      documentNumber = m_currentContainer->activeView()->getDoc()->documentNumber();
   }
+
   KateViewSpaceContainer *container=new KateViewSpaceContainer \
(m_mainWindow->tabWidget(), this);  m_viewSpaceContainerList.append(container);
@@ -195,9 +199,10 @@ void KateViewManager::slotNewTab()
   m_viewSpaceContainerList.append(container);
   m_mainWindow->tabWidget()->addTab (container, "");
-  Q_ASSERT (m_currentContainer==container);
-  container->installEventFilter(this);
+
   connect(container,SIGNAL(viewChanged()),this,SIGNAL(viewChanged()));
   connect(container,SIGNAL(viewChanged()),m_viewManager,SIGNAL(viewChanged()));
-  if (!m_init) {
+
+  if (!m_init)
+  {
     container->activateView(documentNumber);
     container->setShowFullPath(showFullPath);
@@ -255,11 +260,4 @@ void KateViewManager::activatePrevTab()
 }
 
-bool KateViewManager::eventFilter(QObject *o,QEvent *e) {
-  if (e->type()==QEvent::CaptionChange) {
-    m_mainWindow->tabWidget()->changeTab(static_cast<QWidget*>(o),static_cast<QWidget*>(o)->caption());
                
-  }
-  return false;
-}
-
 void KateViewManager::activateSpace (Kate::View* v)
 {

--- kdebase/kate/app/kateviewmanager.h  #1.70:1.71
@@ -128,6 +128,4 @@ class KateViewManager : public QObject
     friend class KateViewSpaceContainer;
 
-    bool eventFilter(QObject *o,QEvent *e);
-
     QGuardedPtr<Kate::View> guiMergedView;
 

--- kdebase/kate/app/kateviewspacecontainer.cpp  #1.163:1.164
@@ -23,4 +23,5 @@
 #include "kateviewspacecontainer.moc"
 
+#include "katetabwidget.h"
 #include "katemainwindow.h"
 #include "katedocmanager.h"
@@ -434,5 +435,5 @@ void KateViewSpaceContainer::statusMsg (
   }
 
-  setCaption(KStringHandler::lsqueeze(c,32));
+  m_viewManager->mainWindow()->tabWidget()->changeTab (this, \
KStringHandler::lsqueeze(c,32));  emit statusChanged (v, v->cursorLine(), \
v->cursorColumn(), ovr,block, mod, KStringHandler::lsqueeze(c,64));  emit statChanged \
();


[prev in list] [next in list] [prev in thread] [next in thread]