[Kst] kdeextragear-2/kst/kst/libkstkmdi

[Andrew Walker]

CVS commit by arwalker: 

Get things to build under KDE 3.1


  A            kmultitabbar.cpp   1.1 [LGPL (v2+)]
  A            kmultitabbar.h   1.1 [LGPL (v2+)]
  A            kmultitabbar_p.h   1.1 [LGPL (v2+)]
  M +1 -1      kdockwidget.cpp   1.2
  M +2 -2      kmdimainfrm.cpp   1.3
  M +5 -1      ktabbar.cpp   1.2


--- kdeextragear-2/kst/kst/libkstkmdi/kdockwidget.cpp  #1.1:1.2
@@ -1608,5 +1608,5 @@ KDockManager::KDockManager( QWidget* mai
   
 #ifndef NO_KDE2
-  d->splitterOpaqueResize = KGlobalSettings::opaqueResize();
+  d->splitterOpaqueResize = false;
 #else
   d->splitterOpaqueResize = false;

--- kdeextragear-2/kst/kst/libkstkmdi/kmdimainfrm.cpp  #1.2:1.3
@@ -1769,10 +1769,10 @@ void KMdiMainFrm::finishIDEAlMode(bool f
     int bottomHeight=m_bottomContainer->height();
 
-
+/*
     kdDebug(760)<<"leftNames"<<leftNames<<endl;
     kdDebug(760)<<"rightNames"<<rightNames<<endl;
     kdDebug(760)<<"topNames"<<topNames<<endl;
     kdDebug(760)<<"bottomNames"<<bottomNames<<endl;
-
+*/
     delete m_leftContainer;
     m_leftContainer=0;

--- kdeextragear-2/kst/kst/libkstkmdi/ktabbar.cpp  #1.1:1.2
@@ -328,7 +328,11 @@ void KTabBar::paintLabel( QPainter *p, c
         r.setRight( r.right() + 2 );
 
+#if QT_VERSION >= 0x030200
         int inactiveXShift = style().pixelMetric( QStyle::PM_TabBarTabShiftHorizontal, this );
         int inactiveYShift = style().pixelMetric( QStyle::PM_TabBarTabShiftVertical, this );
-
+#else
+        int inactiveXShift = 0;
+        int inactiveYShift = 0;
+#endif
         int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;