From kde-commits  Wed Jan 28 08:22:35 2004
From: Ariya Hidayat <ariya () kde ! org>
Date: Wed, 28 Jan 2004 08:22:35 +0000
To: kde-commits
Subject: koffice/kspread
Message-Id: <20040128082235.20AF09649 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=107528018724678

CVS commit by ariya: 

use the new KoTabBar


  M +0 -1      Makefile.am   1.203
  M +4 -4      kspread_view.cc   1.759
  M +2 -6      kspread_view.h   1.245
  M +1 -1      dialogs/kspread_dlg_preference.cc   1.106
  M +0 -1      dialogs/kspread_dlg_show.cc   1.28
  R            kspread_tabbar.cc   1.102
  R            kspread_tabbar.h   1.46


--- koffice/kspread/Makefile.am  #1.202:1.203
@@ -46,5 +46,4 @@
         kspread_style.cc  \
         kspread_style_manager.cc \
-        kspread_tabbar.cc \
         kspread_undo.cc  \
         kspread_value.cc  \

--- koffice/kspread/kspread_view.cc  #1.758:1.759
@@ -67,4 +67,5 @@
 #include <kocommandhistory.h>
 #include <kozoomaction.h>
+#include <kotabbar.h>
 #include <koTemplateCreateDia.h>
 
@@ -81,5 +82,4 @@
 #include "kspread_dlg_subtotal.h"
 #include "kspread_canvas.h"
-#include "kspread_tabbar.h"
 #include "kspread_dlg_formula.h"
 #include "kspread_dlg_special.h"
@@ -314,5 +314,5 @@ public:
     QButton *okButton;
     QButton *cancelButton;
-    KSpread::TabBar *tabBar;
+    KoTabBar *tabBar;
     KSpreadLocationEditWidget *posWidget;
     KStatusBarLabel* calcLabel;
@@ -1553,5 +1553,5 @@ KSpreadView::KSpreadView( QWidget *_pare
     d->horzScrollBar->setOrientation( QScrollBar::Horizontal );
 
-    d->tabBar = new KSpread::TabBar( this );
+    d->tabBar = new KoTabBar( this );
     d->tabBar->setReadOnly( !d->doc->isReadWrite() );
     QObject::connect( d->tabBar, SIGNAL( tabChanged( const QString& ) ), this, SLOT( changeTable( const QString& ) ) );
@@ -1767,5 +1767,5 @@ KSpreadLocationEditWidget* KSpreadView::
 }
 
-KSpread::TabBar* KSpreadView::tabBar() const
+KoTabBar* KSpreadView::tabBar() const
 {
     return d->tabBar;

--- koffice/kspread/kspread_view.h  #1.244:1.245
@@ -38,4 +38,5 @@ class QScrollBar;
 
 class KoDocumentEntry;
+class KoTabBar;
 
 class KSpreadCanvas;
@@ -52,9 +53,4 @@ class KSpreadVBorder;
 class KSpreadView;
 
-namespace KSpread
-{
-class TabBar;
-};
-
 class ViewPrivate;
 
@@ -130,5 +126,5 @@ public:
      * Returns the tab bar.
      */
-    KSpread::TabBar* tabBar() const;
+    KoTabBar* tabBar() const;
 
     void setZoom( int zoom, bool updateViews ); // change the zoom value

--- koffice/kspread/dialogs/kspread_dlg_preference.cc  #1.105:1.106
@@ -29,5 +29,4 @@
 #include "kspread_doc.h"
 #include "kspread_canvas.h"
-#include "kspread_tabbar.h"
 
 #include <kconfig.h>
@@ -38,4 +37,5 @@
 #include <kdeversion.h>
 #include <kcolorbutton.h>
+#include <kotabbar.h>
 #include <koSpellConfig.h>
 

--- koffice/kspread/dialogs/kspread_dlg_show.cc  #1.27:1.28
@@ -25,5 +25,4 @@
 #include "kspread_doc.h"
 #include "kspread_map.h"
-#include "kspread_tabbar.h"
 #include "kspread_undo.h"
 #include <qlayout.h>