[KBear-cvs] kbear/kbear api.cpp,1.5,1.6 api.h,1.4,1.5 core.h,1.7,1.8 kbearchildview.cpp,1.5,1.6 kbearchildview.h,1.4,1.5 kbearclassicmainwindow.cpp,1.6,1.7 kbearclassicmainwindow.h,1.5,1.6 kbearmainwindow.cpp,1.25,1.26 kbearmainwindow.h,1.25,1.26 kbearmainwindowshared.cpp,1.9,1.10 kbearmainwindowshared.h,1.6,1.7 kbearoutputframe.cpp,1.11,1.12 kbearoutputframe.h,1.5,1.6 kbearoutputtoolbar.cpp,1.11,1.12 kbearoutputtoolbar.h,1.5,1.6 kbearpartmanager.cpp,1.2,1.3 kbearpartmanager.h,1.1,1.2 kbearquickconnectdlg.h,1.3,1.4 kbearsplash.h,1.6,1.7 kbeartoplevel.h,1.2,1.3 miscsettingswidget.h,1.1,1.2 pluginmanager.cpp,1.11,1.12 pluginselectwidget.h,1.2,1.3 uisettingswidget.h,1.2,1.3

[<kb...@us...>]

Update of /cvsroot/kbear/kbear/kbear
In directory sc8-pr-cvs1:/tmp/cvs-serv29832/kbear

Modified Files:
	api.cpp api.h core.h kbearchildview.cpp kbearchildview.h 
	kbearclassicmainwindow.cpp kbearclassicmainwindow.h 
	kbearmainwindow.cpp kbearmainwindow.h 
	kbearmainwindowshared.cpp kbearmainwindowshared.h 
	kbearoutputframe.cpp kbearoutputframe.h kbearoutputtoolbar.cpp 
	kbearoutputtoolbar.h kbearpartmanager.cpp kbearpartmanager.h 
	kbearquickconnectdlg.h kbearsplash.h kbeartoplevel.h 
	miscsettingswidget.h pluginmanager.cpp pluginselectwidget.h 
	uisettingswidget.h 
Log Message:
Finally fixed crash at shutdown

Index: api.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/api.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** api.cpp	26 Mar 2003 00:21:30 -0000	1.5
--- api.cpp	29 Apr 2003 20:55:50 -0000	1.6
***************
*** 52,56 ****
  }
  //-----------------------------------------------
! KBearPartManager* API::partManager() {
  	return KBearPartManager::getInstance();
  }
--- 52,56 ----
  }
  //-----------------------------------------------
! KBearPartManagerInterface* API::partManager() {
  	return KBearPartManager::getInstance();
  }

Index: api.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/api.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** api.h	26 Mar 2003 00:21:31 -0000	1.4
--- api.h	29 Apr 2003 20:55:50 -0000	1.5
***************
*** 27,30 ****
--- 27,31 ----
  class ConnectionManager;
  class TransferManager;
+ class KBearPartManagerInterface;
  }
  class KBearPartManager;
***************
*** 39,43 ****
  	static API* getInstance();
  	/** */
! 	virtual ~API();
  	/** */
  	virtual KBear::KBearCore* core();
--- 40,44 ----
  	static API* getInstance();
  	/** */
! 	~API();
  	/** */
  	virtual KBear::KBearCore* core();
***************
*** 49,53 ****
  	virtual KBear::TransferManager* transferManager();
  	/** */
! 	virtual KBearPartManager* partManager();
  private:
  		/** */
--- 50,54 ----
  	virtual KBear::TransferManager* transferManager();
  	/** */
! 	virtual KBearPartManagerInterface* partManager();
  private:
  		/** */

Index: core.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/core.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** core.h	26 Mar 2003 00:21:31 -0000	1.7
--- core.h	29 Apr 2003 20:55:50 -0000	1.8
***************
*** 32,36 ****
  		friend class API;
  	public:
! 		virtual ~Core();
  	public slots:
  		/** */
--- 32,36 ----
  		friend class API;
  	public:
! 		~Core();
  	public slots:
  		/** */

Index: kbearchildview.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearchildview.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kbearchildview.cpp	22 Apr 2003 21:07:22 -0000	1.5
--- kbearchildview.cpp	29 Apr 2003 20:55:50 -0000	1.6
***************
*** 73,77 ****
  KBearChildView::~KBearChildView(){
  	if( m_part ) {
! 		stop();
  		delete m_part;
  	}
--- 73,77 ----
  KBearChildView::~KBearChildView(){
  	if( m_part ) {
! 		m_part->stop();
  		delete m_part;
  	}
***************
*** 90,101 ****
  //-----------------------------------------------
  void KBearChildView::slotInit() {
  	if( m_connectionInfo.isLocal() ) {
  		m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KBearFileSysPartInterface>
! 									("libkbearlocalfilesyspart", this, "KBearWidget", API::getInstance(), "kbearlocalfilesyspart" );
  	}
  
  	else {
  		m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KBearFileSysPartInterface>
! 									("libkbearremotefilesyspart", this, "KBearWidget", API::getInstance(), "kbearremotefilesyspart" );
  	}
  	kdDebug()<<"KBearChildView::slotInit() received part="<<m_part<<endl;
--- 90,102 ----
  //-----------------------------------------------
  void KBearChildView::slotInit() {
+ 	KMainWindow* parent = API::getInstance()->mainWindow()->mainWindow();
  	if( m_connectionInfo.isLocal() ) {
  		m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KBearFileSysPartInterface>
! 									("libkbearlocalfilesyspart", this, "KBearWidget", parent, "kbearlocalfilesyspart" );
  	}
  
  	else {
  		m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KBearFileSysPartInterface>
! 									("libkbearremotefilesyspart", this, "KBearWidget", parent, "kbearremotefilesyspart" );
  	}
  	kdDebug()<<"KBearChildView::slotInit() received part="<<m_part<<endl;
***************
*** 104,108 ****
  		layout()->add( m_part->widget() );
  //		setupConnections();
! 		connect( API::getInstance()->mainWindow()->mainWindow()->guiFactory(),
  						SIGNAL( clientAdded( KXMLGUIClient* ) ), this, SLOT( slotClientAdded( KXMLGUIClient* ) ));
  		connect( m_part, SIGNAL( setStatusBarText( const QString& ) ), API::getInstance()->mainWindow()->statusBar(), SLOT( message( const QString& ) ) );
--- 105,109 ----
  		layout()->add( m_part->widget() );
  //		setupConnections();
! 		connect( parent->guiFactory(),
  						SIGNAL( clientAdded( KXMLGUIClient* ) ), this, SLOT( slotClientAdded( KXMLGUIClient* ) ));
  		connect( m_part, SIGNAL( setStatusBarText( const QString& ) ), API::getInstance()->mainWindow()->statusBar(), SLOT( message( const QString& ) ) );
***************
*** 116,120 ****
  						"Example for BASH users:\nexport KDEDIRS=/path/to/kbear:$KDEDIRS && kbuildsycoca\n"),
  						i18n("Unable to find a KBearFileSysPart") );
! 		API::getInstance()->mainWindow()->mainWindow()->close();
  	}
  }
--- 117,121 ----
  						"Example for BASH users:\nexport KDEDIRS=/path/to/kbear:$KDEDIRS && kbuildsycoca\n"),
  						i18n("Unable to find a KBearFileSysPart") );
! 		parent->close();
  	}
  }

Index: kbearchildview.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearchildview.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kbearchildview.h	22 Apr 2003 21:07:22 -0000	1.4
--- kbearchildview.h	29 Apr 2003 20:55:51 -0000	1.5
***************
*** 55,59 ****
  	/** */
  	KBearChildView( QWidget *parent, const ConnectionInfo& c );
! 	virtual ~KBearChildView();
  	/** */
  	virtual void setPath( QString path );
--- 55,59 ----
  	/** */
  	KBearChildView( QWidget *parent, const ConnectionInfo& c );
! 	~KBearChildView();
  	/** */
  	virtual void setPath( QString path );

Index: kbearclassicmainwindow.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearclassicmainwindow.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kbearclassicmainwindow.cpp	23 Apr 2003 20:36:13 -0000	1.6
--- kbearclassicmainwindow.cpp	29 Apr 2003 20:55:52 -0000	1.7
***************
*** 63,66 ****
--- 63,67 ----
  //-----------------------------------------------
  KBearClassicMainWindow::~KBearClassicMainWindow() {
+ 	delete m_shared;
  }
  //-----------------------------------------------

Index: kbearclassicmainwindow.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearclassicmainwindow.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kbearclassicmainwindow.h	22 Apr 2003 21:07:23 -0000	1.5
--- kbearclassicmainwindow.h	29 Apr 2003 20:55:52 -0000	1.6
***************
*** 48,52 ****
  	KBearClassicMainWindow();
  	/**  */
! 	virtual ~KBearClassicMainWindow();
  	/** */
  	virtual void embedOutputPluginView( QWidget* view, const QString& title, const QString& toolTip );
--- 48,52 ----
  	KBearClassicMainWindow();
  	/**  */
! 	~KBearClassicMainWindow();
  	/** */
  	virtual void embedOutputPluginView( QWidget* view, const QString& title, const QString& toolTip );

Index: kbearmainwindow.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindow.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** kbearmainwindow.cpp	22 Apr 2003 21:07:23 -0000	1.25
--- kbearmainwindow.cpp	29 Apr 2003 20:55:53 -0000	1.26
***************
*** 83,86 ****
--- 83,87 ----
  //-----------------------------------------------
  KBearMainWindow::~KBearMainWindow() {
+ 	delete m_shared;
  }
  //-----------------------------------------------

Index: kbearmainwindow.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindow.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** kbearmainwindow.h	22 Apr 2003 21:07:25 -0000	1.25
--- kbearmainwindow.h	29 Apr 2003 20:55:54 -0000	1.26
***************
*** 63,67 ****
  	KBearMainWindow();
  	/** Destructor */
! 	virtual ~KBearMainWindow();
  	/** */
  	virtual void raiseMainWindow();
--- 63,67 ----
  	KBearMainWindow();
  	/** Destructor */
! 	~KBearMainWindow();
  	/** */
  	virtual void raiseMainWindow();

Index: kbearmainwindowshared.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindowshared.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kbearmainwindowshared.cpp	23 Apr 2003 20:36:13 -0000	1.9
--- kbearmainwindowshared.cpp	29 Apr 2003 20:55:54 -0000	1.10
***************
*** 13,16 ****
--- 13,17 ----
  #include <qfile.h>
  #include <qvbox.h>
+ #include <qguardedptr.h>
  //////////////////////////////////////////////////////////////////////
  // KDE specific include files

Index: kbearmainwindowshared.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindowshared.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kbearmainwindowshared.h	21 Apr 2003 22:53:38 -0000	1.6
--- kbearmainwindowshared.h	29 Apr 2003 20:55:54 -0000	1.7
***************
*** 38,42 ****
  	KBearMainWindowShared( KParts::DockMainWindow* parent );
  	/** */
! 	virtual ~KBearMainWindowShared();
  	/** */
  	void createOutputToolbar( KDockWidget* dock );
--- 38,42 ----
  	KBearMainWindowShared( KParts::DockMainWindow* parent );
  	/** */
! 	~KBearMainWindowShared();
  	/** */
  	void createOutputToolbar( KDockWidget* dock );

Index: kbearoutputframe.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputframe.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** kbearoutputframe.cpp	23 Apr 2003 10:20:41 -0000	1.11
--- kbearoutputframe.cpp	29 Apr 2003 20:55:54 -0000	1.12
***************
*** 76,140 ****
  KBearOutputFrameHeader::~KBearOutputFrameHeader() {
  }
! /////////////////////////////////////////////////////////////
! // class KBearOutputFrame::KBearOutputFramePrivate
! /////////////////////////////////////////////////////////////
! class KBearOutputFrame::KBearOutputFramePrivate {
! 	public:
! 		~KBearOutputFramePrivate() {
! 			delete m_stack;
! 			delete m_title;
! 		}
! 		QWidgetStack* m_stack;
! 		QMap<int, QString> m_titleDict;
! 		KBearOutputFrameHeader* m_title;
! 		QIntDict<QWidget> m_widgets;
! };
  /////////////////////////////////////////////////////////////
  // class KBearOutputFrame
  /////////////////////////////////////////////////////////////
  KBearOutputFrame::KBearOutputFrame( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget  )
!   : KDockWidget( mainWin->manager(), "KBearOutputFrame", QPixmap(), 0L ), d( 0L )
  {
! 	d = new KBearOutputFramePrivate;
! 	d->m_stack = new QWidgetStack( this );
! 	d->m_title = new KBearOutputFrameHeader( this );
! 	connect( d->m_title, SIGNAL(closeButtonClicked() ), SIGNAL( closeButtonClicked() ) );
  	
! 	setHeader( d->m_title );
! 	setWidget( d->m_stack );	
  	manualDock( dockTarget, KDockWidget::DockBottom, 70 );
! 	d->m_stack->show();
  	mainWin->makeDockInvisible( this );
! 	d->m_stack->setMinimumHeight( 100 );
  }
  //-----------------------------------------------
  KBearOutputFrame::~KBearOutputFrame() {
- 	delete d;
- 	d = 0L;
  }
  //-----------------------------------------------
  void KBearOutputFrame::addWidget( QWidget* view, const QString& title, int  index ) {
! 	d->m_stack->addWidget( view, index );
! 	d->m_titleDict.insert( index, title );
! 	d->m_widgets.insert( index, view );
  	view->show();
! 	d->m_stack->raiseWidget( view );
  }
  //-----------------------------------------------
  int KBearOutputFrame::removeWidget( QWidget* view ) {
! 	if( ! d || ! view )
! 		return;
! 	int index = d->m_stack->id( view );
  	if( index > -1 ) {
! 		kdDebug()<<"KBearOutputFrame::removeWidget="<<d->m_titleDict[ index ] <<endl;
! 		d->m_stack->removeWidget( view );
! 		d->m_titleDict.remove( index );
! 		d->m_widgets.remove( index );
! 		if( d->m_widgets.count() > 0 ) {
! 			QIntDictIterator<QWidget> it( d->m_widgets );
  			emit newVisibleWidget( it.currentKey() );
  		}
  	}
! 	if( d->m_widgets.count() == 0 )
  		API::getInstance()->mainWindow()->mainWindow()->makeDockInvisible( this );
  	return index;
--- 76,125 ----
  KBearOutputFrameHeader::~KBearOutputFrameHeader() {
  }
! //-----------------------------------------------
  /////////////////////////////////////////////////////////////
  // class KBearOutputFrame
  /////////////////////////////////////////////////////////////
+ //-----------------------------------------------
  KBearOutputFrame::KBearOutputFrame( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget  )
!   : KDockWidget( mainWin->manager(), "KBearOutputFrame", QPixmap(), 0L )
  {
! 	m_stack = new QWidgetStack( this );
! 	m_title = new KBearOutputFrameHeader( this );
! 	connect( m_title, SIGNAL(closeButtonClicked() ), SIGNAL( closeButtonClicked() ) );
  	
! 	setHeader( m_title );
! 	setWidget( m_stack );	
  	manualDock( dockTarget, KDockWidget::DockBottom, 70 );
! 	m_stack->show();
  	mainWin->makeDockInvisible( this );
! 	m_stack->setMinimumHeight( 100 );
  }
  //-----------------------------------------------
  KBearOutputFrame::~KBearOutputFrame() {
  }
  //-----------------------------------------------
  void KBearOutputFrame::addWidget( QWidget* view, const QString& title, int  index ) {
! 	m_stack->addWidget( view, index );
! 	m_titleDict.insert( index, title );
! 	m_widgets.insert( index, view );
  	view->show();
! 	m_stack->raiseWidget( view );
  }
  //-----------------------------------------------
  int KBearOutputFrame::removeWidget( QWidget* view ) {
! 	if( ! view )
! 		return -1;
! 	int index = m_stack->id( view );
  	if( index > -1 ) {
! 		kdDebug()<<"KBearOutputFrame::removeWidget="<<m_titleDict[ index ] <<endl;
! 		m_stack->removeWidget( view );
! 		m_titleDict.remove( index );
! 		m_widgets.remove( index );
! 		if( m_widgets.count() > 0 ) {
! 			QIntDictIterator<QWidget> it( m_widgets );
  			emit newVisibleWidget( it.currentKey() );
  		}
  	}
! 	if( m_widgets.count() == 0 )
  		API::getInstance()->mainWindow()->mainWindow()->makeDockInvisible( this );
  	return index;
***************
*** 142,148 ****
  //-----------------------------------------------
  void KBearOutputFrame::setActiveIndex( int index ) {
! 	d->m_stack->raiseWidget( index );
! 	QWidget* widget = d->m_stack->widget( index );
! 	d->m_title->setTitle( d->m_titleDict[ index ] );
  	if( widget )
  		widget->setFocus();
--- 127,133 ----
  //-----------------------------------------------
  void KBearOutputFrame::setActiveIndex( int index ) {
! 	m_stack->raiseWidget( index );
! 	QWidget* widget = m_stack->widget( index );
! 	m_title->setTitle( m_titleDict[ index ] );
  	if( widget )
  		widget->setFocus();
***************
*** 151,155 ****
  int KBearOutputFrame::getWidgetIndex( QWidget* widget ) {
  	int index = -1;
! 	QIntDictIterator<QWidget> it( d->m_widgets );
      for ( ; it.current(); ++it ) {
  		if( it.current() == widget ) { 
--- 136,140 ----
  int KBearOutputFrame::getWidgetIndex( QWidget* widget ) {
  	int index = -1;
! 	QIntDictIterator<QWidget> it( m_widgets );
      for ( ; it.current(); ++it ) {
  		if( it.current() == widget ) { 

Index: kbearoutputframe.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputframe.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kbearoutputframe.h	8 Feb 2003 19:09:21 -0000	1.5
--- kbearoutputframe.h	29 Apr 2003 20:55:55 -0000	1.6
***************
*** 14,17 ****
--- 14,19 ----
  // Qt specific include files
  #include <qlabel.h>
+ #include <qmap.h>
+ #include <qintdict.h>
  //////////////////////////////////////////////////////////////////////
  // KDE specific include files
***************
*** 23,26 ****
--- 25,29 ----
  
  class QToolButton;
+ class QWidgetStack;
  class KBearOutputFrameHeader;
  namespace KParts {
***************
*** 39,43 ****
  	KBearOutputFrame( KParts::DockMainWindow* mainWin,  KDockWidget* dockTarget  );
  	/** */
! 	virtual ~KBearOutputFrame();
  	/** */
  	void addWidget( QWidget* view, const QString& title, int  index );
--- 42,46 ----
  	KBearOutputFrame( KParts::DockMainWindow* mainWin,  KDockWidget* dockTarget  );
  	/** */
! 	~KBearOutputFrame();
  	/** */
  	void addWidget( QWidget* view, const QString& title, int  index );
***************
*** 54,62 ****
  	int getWidgetIndex( QWidget* widget );
  private:
! 	class KBearOutputFramePrivate;
! 	KBearOutputFramePrivate* d;
  };
  /**
!  * 
   * @author Björn Sahlström
   **/
--- 57,67 ----
  	int getWidgetIndex( QWidget* widget );
  private:
! 	QWidgetStack* m_stack;
! 	QMap<int, QString> m_titleDict;
! 	KBearOutputFrameHeader* m_title;
! 	QIntDict<QWidget> m_widgets;
  };
  /**
!  *
   * @author Björn Sahlström
   **/
***************
*** 67,71 ****
  	KBearOutputFrameHeader( KBearOutputFrame* parent );
  	/** */
! 	virtual ~KBearOutputFrameHeader();
  	/** */
  	QString title() const { return m_title->text(); }
--- 72,76 ----
  	KBearOutputFrameHeader( KBearOutputFrame* parent );
  	/** */
! 	~KBearOutputFrameHeader();
  	/** */
  	QString title() const { return m_title->text(); }

Index: kbearoutputtoolbar.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputtoolbar.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** kbearoutputtoolbar.cpp	23 Apr 2003 10:20:42 -0000	1.11
--- kbearoutputtoolbar.cpp	29 Apr 2003 20:55:55 -0000	1.12
***************
*** 37,54 ****
  using namespace KBear;
  //-----------------------------------------------
- class KBearOutputToolBar::KBearOutputToolBarPrivate {
- 	public:
- 		~KBearOutputToolBarPrivate() {
- 			delete m_popup;
- 			delete m_clickedMapper;
- 		}
- 		int m_selected;
- 		QSignalMapper* m_clickedMapper;
- 		QIntDict<QPushButton> m_buttons;
- 		KBearOutputFrame* m_popup;
- 		int m_count;
- 		QLabel* m_pStretchSpace;
- };
- //-----------------------------------------------
  // class KBearOutputToolBar
  //-----------------------------------------------
--- 37,40 ----
***************
*** 72,76 ****
  //-----------------------------------------------
  KBearOutputToolBar::KBearOutputToolBar( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget )
! 	:	KToolBar( mainWin, "outputToolBar", false,  true ), d( 0L )
  {
  //	setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum));
--- 58,62 ----
  //-----------------------------------------------
  KBearOutputToolBar::KBearOutputToolBar( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget )
! 	:	KToolBar( mainWin, "outputToolBar", false,  true )
  {
  //	setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum));
***************
*** 82,121 ****
  	positionYourself( true );
  	
! 	d = new KBearOutputToolBarPrivate;
! 	d->m_count = 0;
! 	d->m_selected = -1;
! 	d->m_pStretchSpace = 0L;
! 	d->m_popup = new KBearOutputFrame( mainWin, dockTarget );
! 	connect( d->m_popup, SIGNAL(closeButtonClicked() ), this, SLOT( slotCloseButtonClicked() ) );
! 	connect( d->m_popup, SIGNAL( newVisibleWidget( int ) ), this, SLOT( slotNewVisibleWidget( int ) ) );
  
! 	d->m_clickedMapper = new QSignalMapper( this );
! 	connect( d->m_clickedMapper, SIGNAL( mapped( int ) ), this, SLOT( slotClicked( int ) ) );
  	
  }
  //-----------------------------------------------
  KBearOutputToolBar::~KBearOutputToolBar() {
! 	QObject::disconnect( this, 0, 0, 0 );
! 	delete d;
! 	d = 0L;
  }
  //-----------------------------------------------
  KDockWidget* KBearOutputToolBar::outputFrame() {
! 	return d->m_popup ? d->m_popup : 0L;
  }
  //-----------------------------------------------
  void KBearOutputToolBar::removeWidget( QWidget* widget ) {
! 	if( ! d || ! widget )
  		return;
! 	int index = d->m_popup->removeWidget( widget );
  	if( index >= 0 ) {
! 		if( d->m_buttons[ index ] )
! 			delete d->m_buttons[ index ];
! 		d->m_buttons.remove( index );
  	}
! 	if( d->m_buttons.count() == 0 ) {
! 		if( d->m_pStretchSpace != 0L) {
! 			delete d->m_pStretchSpace;
! 			d->m_pStretchSpace = 0L;
  		}
  	}
--- 68,104 ----
  	positionYourself( true );
  	
! 	m_buttons.setAutoDelete( true );
! 	m_count = 0;
! 	m_selected = -1;
! 	m_pStretchSpace = 0L;
! 	m_popup = new KBearOutputFrame( mainWin, dockTarget );
! 	connect( m_popup, SIGNAL(closeButtonClicked() ), this, SLOT( slotCloseButtonClicked() ) );
! 	connect( m_popup, SIGNAL( newVisibleWidget( int ) ), this, SLOT( slotNewVisibleWidget( int ) ) );
  
! 	m_clickedMapper = new QSignalMapper( this );
! 	connect( m_clickedMapper, SIGNAL( mapped( int ) ), this, SLOT( slotClicked( int ) ) );
  	
  }
  //-----------------------------------------------
  KBearOutputToolBar::~KBearOutputToolBar() {
! 	delete m_popup;
! 	delete m_clickedMapper;
  }
  //-----------------------------------------------
  KDockWidget* KBearOutputToolBar::outputFrame() {
! 	return m_popup ? m_popup : 0L;
  }
  //-----------------------------------------------
  void KBearOutputToolBar::removeWidget( QWidget* widget ) {
! 	if( ! widget )
  		return;
! 	int index = m_popup->removeWidget( widget );
  	if( index >= 0 ) {
! 		m_buttons.remove( index );
  	}
! 	if( m_buttons.count() == 0 ) {
! 		if( m_pStretchSpace != 0L) {
! 			delete m_pStretchSpace;
! 			m_pStretchSpace = 0L;
  		}
  	}
***************
*** 123,134 ****
  //-----------------------------------------------
  void KBearOutputToolBar::addWidget( QWidget* widget, const QString& name, const QString& toolTip ) {
! 	int index = d->m_count++;
! 	 if( d->m_pStretchSpace ) {
! 		delete d->m_pStretchSpace;
! 		d->m_pStretchSpace = 0L;
  		setStretchableWidget( 0L);
  	}
  
! 	d->m_popup ->addWidget( widget, name, index );
  
  	QPushButton* button = new KBearOutputToolBarButton( name, this, name.latin1() );
--- 106,117 ----
  //-----------------------------------------------
  void KBearOutputToolBar::addWidget( QWidget* widget, const QString& name, const QString& toolTip ) {
! 	int index = m_count++;
! 	 if( m_pStretchSpace ) {
! 		delete m_pStretchSpace;
! 		m_pStretchSpace = 0L;
  		setStretchableWidget( 0L);
  	}
  
! 	m_popup ->addWidget( widget, name, index );
  
  	QPushButton* button = new KBearOutputToolBarButton( name, this, name.latin1() );
***************
*** 140,152 ****
  	QToolTip::add( button, toolTip );
  	button->show();
! 	d->m_buttons.insert( index, button );
! 	d->m_clickedMapper->setMapping( button, index );
  	
! 	d->m_pStretchSpace = new QLabel( this, "empty" );
! 	d->m_pStretchSpace->setText( QString::null );
! 	setStretchableWidget( d->m_pStretchSpace);
! 	d->m_pStretchSpace->show();
  
! 	connect( button, SIGNAL( clicked() ), d->m_clickedMapper, SLOT( map() ) );
  	connect( widget, SIGNAL( destroyed() ), this, SLOT( slotWidgetDeleted() ) );
  }
--- 123,135 ----
  	QToolTip::add( button, toolTip );
  	button->show();
! 	m_buttons.insert( index, button );
! 	m_clickedMapper->setMapping( button, index );
  	
! 	m_pStretchSpace = new QLabel( this, "empty" );
! 	m_pStretchSpace->setText( QString::null );
! 	setStretchableWidget( m_pStretchSpace);
! 	m_pStretchSpace->show();
  
! 	connect( button, SIGNAL( clicked() ), m_clickedMapper, SLOT( map() ) );
  	connect( widget, SIGNAL( destroyed() ), this, SLOT( slotWidgetDeleted() ) );
  }
***************
*** 163,169 ****
  //-----------------------------------------------
  void KBearOutputToolBar::slotClicked( int index ) {
! 	if( !d && d->m_buttons.count() <= 0 )
  		return;
! 	QPushButton* button = d->m_buttons[ index ];
  	if( ! button )
  		return;
--- 146,152 ----
  //-----------------------------------------------
  void KBearOutputToolBar::slotClicked( int index ) {
! 	if( m_buttons.count() <= 0 )
  		return;
! 	QPushButton* button = m_buttons[ index ];
  	if( ! button )
  		return;
***************
*** 178,189 ****
  //-----------------------------------------------
  void KBearOutputToolBar::slotNewVisibleWidget( int index ) {
! 	if( d && d->m_popup->isVisible() )
  		setActiveIndex( index );
  }
  //-----------------------------------------------
  void KBearOutputToolBar::setActiveIndex( int index ) {
! 	if( !d && d->m_buttons.count() <= 0 )
  		return;
! 	QPushButton* button = d->m_buttons[index];
  	if( ! button )
  		return;
--- 161,172 ----
  //-----------------------------------------------
  void KBearOutputToolBar::slotNewVisibleWidget( int index ) {
! 	if( m_popup->isVisible() )
  		setActiveIndex( index );
  }
  //-----------------------------------------------
  void KBearOutputToolBar::setActiveIndex( int index ) {
! 	if( m_buttons.count() <= 0 )
  		return;
! 	QPushButton* button = m_buttons[index];
  	if( ! button )
  		return;
***************
*** 194,211 ****
  //	calculateGeometry();
  
! 	d->m_popup->setActiveIndex( index );
! 	API::getInstance()->mainWindow()->mainWindow()->makeDockVisible( d->m_popup );
! 	d->m_popup->show();
  }
  //-----------------------------------------------
  void KBearOutputToolBar::unSelect() {
! 	API::getInstance()->mainWindow()->mainWindow()->makeDockInvisible( d->m_popup );
  	unsetButtons();
  }
  //-----------------------------------------------
  void KBearOutputToolBar::unsetButtons() {
! 	if( !d && d->m_buttons.count() <= 0 )
  		return;
! 	QIntDictIterator<QPushButton> it( d->m_buttons );
  	while( it.current() ) {
  		if( it.current()->isOn() ) {
--- 177,194 ----
  //	calculateGeometry();
  
! 	m_popup->setActiveIndex( index );
! 	API::getInstance()->mainWindow()->mainWindow()->makeDockVisible( m_popup );
! 	m_popup->show();
  }
  //-----------------------------------------------
  void KBearOutputToolBar::unSelect() {
! 	API::getInstance()->mainWindow()->mainWindow()->makeDockInvisible( m_popup );
  	unsetButtons();
  }
  //-----------------------------------------------
  void KBearOutputToolBar::unsetButtons() {
! 	if( m_buttons.count() <= 0 )
  		return;
! 	QIntDictIterator<QPushButton> it( m_buttons );
  	while( it.current() ) {
  		if( it.current()->isOn() ) {

Index: kbearoutputtoolbar.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputtoolbar.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kbearoutputtoolbar.h	7 Feb 2003 00:02:56 -0000	1.5
--- kbearoutputtoolbar.h	29 Apr 2003 20:55:56 -0000	1.6
***************
*** 14,17 ****
--- 14,18 ----
  // Qt specific include files
  #include <qpushbutton.h>
+ #include <qintdict.h>
  //////////////////////////////////////////////////////////////////////
  // KDE specific include files
***************
*** 23,26 ****
--- 24,31 ----
  
  class KDockWidget;
+ class QSignalMapper;
+ class QLabel;
+ class KBearOutputFrame;
+ class KBearOutputFrame;
  namespace KParts {
  	class DockMainWindow;
***************
*** 36,40 ****
  	KBearOutputToolBarButton( const QString& text, QWidget* parent, const char* name );
  	/** */
! 	virtual ~KBearOutputToolBarButton();
  protected:
  	virtual QSize sizeHint() const;
--- 41,45 ----
  	KBearOutputToolBarButton( const QString& text, QWidget* parent, const char* name );
  	/** */
! 	~KBearOutputToolBarButton();
  protected:
  	virtual QSize sizeHint() const;
***************
*** 51,55 ****
  	KBearOutputToolBar( KParts::DockMainWindow* mainWin, KDockWidget* );
  	/** */
! 	virtual ~KBearOutputToolBar();
  	/** */
  	void addWidget( QWidget* view, const QString& name, const QString& toolTip );
--- 56,60 ----
  	KBearOutputToolBar( KParts::DockMainWindow* mainWin, KDockWidget* );
  	/** */
! 	~KBearOutputToolBar();
  	/** */
  	void addWidget( QWidget* view, const QString& name, const QString& toolTip );
***************
*** 68,73 ****
  	void unsetButtons();
  private:
! 	class KBearOutputToolBarPrivate;
! 	KBearOutputToolBarPrivate* d;
  };
  
--- 73,82 ----
  	void unsetButtons();
  private:
! 	KBearOutputFrame* m_popup;
! 	int m_selected;
! 	QSignalMapper* m_clickedMapper;
! 	QIntDict<QPushButton> m_buttons;
! 	int m_count;
! 	QLabel* m_pStretchSpace;
  };
  

Index: kbearpartmanager.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearpartmanager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kbearpartmanager.cpp	5 Apr 2003 23:07:24 -0000	1.2
--- kbearpartmanager.cpp	29 Apr 2003 20:55:56 -0000	1.3
***************
*** 27,31 ****
  //-----------------------------------------------
  KBearPartManager::KBearPartManager()
!  : KParts::PartManager( API::getInstance()->mainWindow()->mainWindow(), API::getInstance(), "KBearPartManager" )
  {
  }
--- 27,31 ----
  //-----------------------------------------------
  KBearPartManager::KBearPartManager()
!  : KBearPartManagerInterface( API::getInstance()->mainWindow()->mainWindow(), API::getInstance(), "KBearPartManager" )
  {
  }

Index: kbearpartmanager.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearpartmanager.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbearpartmanager.h	26 Mar 2003 00:21:33 -0000	1.1
--- kbearpartmanager.h	29 Apr 2003 20:55:56 -0000	1.2
***************
*** 16,24 ****
  //////////////////////////////////////////////////////////////////////
  // KDE specific include files
- #include <kparts/partmanager.h>
  //////////////////////////////////////////////////////////////////////
  // System specific include files
  //////////////////////////////////////////////////////////////////////
  // Application specific include files
  
  /**
--- 16,24 ----
  //////////////////////////////////////////////////////////////////////
  // KDE specific include files
  //////////////////////////////////////////////////////////////////////
  // System specific include files
  //////////////////////////////////////////////////////////////////////
  // Application specific include files
+ #include "kbearpartmanageriface.h"
  
  /**
***************
*** 26,30 ****
   * Björn Sahlström
   **/
! class KBearPartManager : public KParts::PartManager {
  	Q_OBJECT
  public:
--- 26,30 ----
   * Björn Sahlström
   **/
! class KBearPartManager : public KBear::KBearPartManagerInterface {
  	Q_OBJECT
  public:

Index: kbearquickconnectdlg.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearquickconnectdlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kbearquickconnectdlg.h	1 Mar 2003 22:06:33 -0000	1.3
--- kbearquickconnectdlg.h	29 Apr 2003 20:55:57 -0000	1.4
***************
*** 42,46 ****
  		KBearQuickConnectDlg(QWidget *parent, const char *name);
  		/** */
! 		virtual ~KBearQuickConnectDlg();
  	signals:
  		void openSite( const SiteInfo& );
--- 42,46 ----
  		KBearQuickConnectDlg(QWidget *parent, const char *name);
  		/** */
! 		~KBearQuickConnectDlg();
  	signals:
  		void openSite( const SiteInfo& );

Index: kbearsplash.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearsplash.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kbearsplash.h	22 Jan 2003 00:09:37 -0000	1.6
--- kbearsplash.h	29 Apr 2003 20:55:57 -0000	1.7
***************
*** 38,42 ****
  public: 
  	KBearSplash();
! 	 virtual ~KBearSplash();
  public slots:
  	void slotShowMessage( const QString& message );
--- 38,42 ----
  public: 
  	KBearSplash();
! 	 ~KBearSplash();
  public slots:
  	void slotShowMessage( const QString& message );

Index: kbeartoplevel.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbeartoplevel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kbeartoplevel.h	19 Apr 2003 08:38:02 -0000	1.2
--- kbeartoplevel.h	29 Apr 2003 20:55:58 -0000	1.3
***************
*** 37,41 ****
  	public:
  		/** */
! 		virtual ~KBearTopLevel();
  		/** */
  		static KBear::KBearMainWindowInterface* getInstance();
--- 37,41 ----
  	public:
  		/** */
! 		~KBearTopLevel();
  		/** */
  		static KBear::KBearMainWindowInterface* getInstance();

Index: miscsettingswidget.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/miscsettingswidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** miscsettingswidget.h	21 Apr 2003 22:53:38 -0000	1.1
--- miscsettingswidget.h	29 Apr 2003 20:55:58 -0000	1.2
***************
*** 25,29 ****
  	MiscSettingsWidget( QWidget* parent = 0, const char* name = 0 );
  	/** */
! 	virtual ~MiscSettingsWidget();
  	/** Note that this may return NULL*/
  	static MiscSettingsWidget* getInstance() { return s_instance; }
--- 25,29 ----
  	MiscSettingsWidget( QWidget* parent = 0, const char* name = 0 );
  	/** */
! 	~MiscSettingsWidget();
  	/** Note that this may return NULL*/
  	static MiscSettingsWidget* getInstance() { return s_instance; }

Index: pluginmanager.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/pluginmanager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pluginmanager.cpp	14 Apr 2003 23:41:29 -0000	1.11
--- pluginmanager.cpp	29 Apr 2003 20:55:58 -0000	1.12
***************
*** 19,23 ****
  #include <kmainwindow.h>
  #include <kmessagebox.h>
! #include "kapplication.h"
  #include <kglobal.h>
  #include <kiconloader.h>
--- 19,23 ----
  #include <kmainwindow.h>
  #include <kmessagebox.h>
! #include <kapplication.h>
  #include <kglobal.h>
  #include <kiconloader.h>

Index: pluginselectwidget.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/pluginselectwidget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pluginselectwidget.h	22 Jan 2003 00:09:37 -0000	1.2
--- pluginselectwidget.h	29 Apr 2003 20:55:59 -0000	1.3
***************
*** 34,38 ****
  	PluginSelectWidget( QWidget* parent, const char* name );
  	/** */
! 	virtual ~PluginSelectWidget();
  	/** */
  	virtual void applySettings() { slotAccept(); }
--- 34,38 ----
  	PluginSelectWidget( QWidget* parent, const char* name );
  	/** */
! 	~PluginSelectWidget();
  	/** */
  	virtual void applySettings() { slotAccept(); }

Index: uisettingswidget.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/uisettingswidget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uisettingswidget.h	6 Apr 2003 23:02:37 -0000	1.2
--- uisettingswidget.h	29 Apr 2003 20:55:59 -0000	1.3
***************
*** 30,34 ****
  	UISettingsWidget( QWidget* parent = 0, const char* name = 0 );
  	/** */
! 	virtual ~UISettingsWidget();
  	/**
  	* Reimplement from @ref KBear::KBearConfigWidgetIface
--- 30,34 ----
  	UISettingsWidget( QWidget* parent = 0, const char* name = 0 );
  	/** */
! 	~UISettingsWidget();
  	/**
  	* Reimplement from @ref KBear::KBearConfigWidgetIface