recurrence fixes

2 files changed, 2 insertions, 2 deletions

diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 09ad0c8..35d4916 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -817,129 +817,129 @@ void KToolBar::removeItemDelayed(int id)
     }
     QWidget * w = (*it);
     id2widget.remove( id );
     widget2id.remove( w );
     widgets.removeRef( w );
 
     w->blockSignals(true);
     d->idleButtons.append(w);
     layoutTimer->start( 50, TRUE );
 }
 
 
 void KToolBar::hideItem (int id)
 {
     QWidget *w = getWidget(id);
     if ( w )
         w->hide();
 }
 
 
 void KToolBar::showItem (int id)
 {
     QWidget *w = getWidget(id);
     if ( w )
         w->show();
 }
 
 
 int KToolBar::itemIndex (int id)
 {
     QWidget *w = getWidget(id);
     return w ? widgets.findRef(w) : -1;
 }
 
 
 void KToolBar::setFullSize(bool flag )
 {
     setHorizontalStretchable( flag );
     setVerticalStretchable( flag );
 }
 
 
 bool KToolBar::fullSize() const
 {
     return isHorizontalStretchable() || isVerticalStretchable();
 }
 
 
 void KToolBar::enableMoving(bool flag )
 {
 //US    setMovingEnabled(flag);
   this->mainWindow()->setToolBarsMovable(flag);    
 }
 
 
 void KToolBar::setBarPos (BarPosition bpos)
 {
     if ( !mainWindow() )
         return;
 //US    mainWindow()->moveDockWindow( this, (Dock)bpos );
     mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
 }
 
 
-KToolBar::BarPosition KToolBar::barPos() const
+const KToolBar::BarPosition KToolBar::barPos()
 {
     if ( !(QMainWindow*)mainWindow() )
         return KToolBar::Top;
 //US    Dock dock;
     QMainWindow::ToolBarDock dock;
     int dm1, dm2;
     bool dm3;
     ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
 //US    if ( dock == DockUnmanaged ) {
     if ( dock == QMainWindow::Unmanaged ) {
         return (KToolBar::BarPosition)Top;
     }
     return (BarPosition)dock;
 }
 
 
 bool KToolBar::enable(BarStatus stat)
 {
     bool mystat = isVisible();
 
     if ( (stat == Toggle && mystat) || stat == Hide )
         hide();
     else
         show();
 
     return isVisible() == mystat;
 }
 
 
 void KToolBar::setMaxHeight ( int h )
 {
     setMaximumHeight( h );
 }
 
 int KToolBar::maxHeight()
 {
     return maximumHeight();
 }
 
 
 void KToolBar::setMaxWidth (int dw)
 {
     setMaximumWidth( dw );
 }
 
 
 int KToolBar::maxWidth()
 {
     return maximumWidth();
 }
 
 
 void KToolBar::setTitle (const QString& _title)
 {
     setLabel( _title );
 }
 
 
 void KToolBar::enableFloating (bool )
 {
 }
 
 
 void KToolBar::setIconText(IconText it)
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 49ff856..7a5c114 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -685,129 +685,129 @@ public:
    *
    * Item is deleted. Toolbar is redrawn after it.
    */
     void removeItem (int id);
 
     /**
    * Remove item @p id.
    *
    * Item is deleted when toolbar is redrawn.
    */
     void removeItemDelayed (int id);
 
     /**
    * Hide item.
    */
     void hideItem (int id);
 
     /**
    * Show item.
    */
     void showItem (int id);
 
     /**
    * Returns the index of the given item.
    *
    * KDE4: make this const!
    */
     int itemIndex (int id);
 
     /**
    * Set toolbar to full parent size (default).
    *
    *  In full size mode the bar
    * extends over the parent's full width or height. If the mode is disabled
    * the toolbar tries to take as much space as it needs without wrapping, but
    * it does not exceed the parent box. You can force a certain width or
    * height with @ref setMaxWidth() or @ref setMaxHeight().
    *
    * If you want to use right-aligned items or auto-sized items you must use
    * full size mode.
    */
     void setFullSize(bool flag = true);
 
     /**
    * @return @p true if the full-size mode is enabled. Otherwise
    * it returns @false.
    */
     bool fullSize() const;
 
     /**
    * @deprecated use setMovingEnabled(bool) instead.
    * Enable or disable moving of toolbar.
    */
     void enableMoving(bool flag = true);
 
     /**
    * Set position of toolbar.
    * @see BarPosition()
    */
     void setBarPos (BarPosition bpos);
 
     /**
    * Returns position of toolbar.
    */
-    BarPosition barPos() const;
+    const BarPosition barPos();
 
   /**
    * @deprecated
    * Show, hide, or toggle toolbar.
    *
    * This method is provided for compatibility only,
    * please use show() and/or hide() instead.
    * @see BarStatus
    */
     bool enable(BarStatus stat);
 
   /**
    * @deprecated
    * Use setMaximumHeight() instead.
    */
     void setMaxHeight (int h);  // Set max height for vertical toolbars
 
   /**
    * @deprecated
    * Use maximumHeight() instead.
    * Returns the value that was set with @ref setMaxHeight().
    */
     int maxHeight();
 
   /**
    * @deprecated
    * Use setMaximumWidth() instead.
    * Set maximal width of horizontal (top or bottom) toolbar.
    */
     void setMaxWidth (int dw);
 
   /**
    * @deprecated
    * Use maximumWidth() instead.
    * Returns the value that was set with @ref setMaxWidth().
    */
     int maxWidth();
 
   /**
    * Set title for toolbar when it floats.
    *
    * Titles are however not (yet)
    * visible. You can't change toolbar's title while it's floating.
    */
     void setTitle (const QString& _title);
 
   /**
    * @deprecated
    * Use enableMoving() instead.
    */
     void enableFloating (bool arrrrrrgh);
 
   /**
    * Set the kind of painting for buttons.
    *
    * Choose from:
    * @li IconOnly (only icons),
    * @li IconTextRight (icon and text, text is left from icons),
    * @li TextOnly (only text),
    * @li IconTextBottom (icons and text, text is under icons).
    * @see IconText
    *
    */
     void setIconText(IconText it);