From 6d0f523baa45375e0ebe2005b8abb817403f44c5 Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Thu, 15 Nov 2001 20:29:19 +0000
Subject: [PATCH] Use KMainWindow instead of KTMainWindow (fixes toolbar
 problems).

---
 DockWidget/dockmainwindow.cpp |  7 +++----
 DockWidget/dockmainwindow.h   |  4 ++--
 kdbg/dbgmainwnd.cpp           | 10 ++++++++--
 kdbg/main.cpp                 |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/DockWidget/dockmainwindow.cpp b/DockWidget/dockmainwindow.cpp
index c43aa64..56f1177 100644
--- a/DockWidget/dockmainwindow.cpp
+++ b/DockWidget/dockmainwindow.cpp
@@ -18,7 +18,7 @@
 #include "dock_close_top.xpm"
 
 DockMainWindow::DockMainWindow( const char *name )
-:KTMainWindow( name ),
+:KMainWindow( 0, name ),
   dockManager(0)
 {
 #ifdef DOCK_ORIGINAL
@@ -94,10 +94,10 @@ void DockMainWindow::setView( QWidget *view )
 {
   if ( view->isA("DockWidget") ){
     if ( view->parent() != this ) ((DockWidget*)view)->applyToWidget( this );
-    KTMainWindow::setView(view);
+      KMainWindow::setCentralWidget(view);
     viewDock = (DockWidget*)view;
   } else {
-    KTMainWindow::setView(view);
+      KMainWindow::setCentralWidget(view);
   }
 }
 
@@ -344,5 +344,4 @@ void DockMainWindow::readDockConfig( KConfig* c, QString group )
 void DockMainWindow::setDockView( QWidget* widget )
 {
   setView( widget );
-  updateRects();
 }
diff --git a/DockWidget/dockmainwindow.h b/DockWidget/dockmainwindow.h
index dc12858..2191381 100644
--- a/DockWidget/dockmainwindow.h
+++ b/DockWidget/dockmainwindow.h
@@ -8,7 +8,7 @@
 #ifndef DOCKMAINWINDOW_H
 #define DOCKMAINWINDOW_H
 
-#include <ktmainwindow.h>
+#include <kmainwindow.h>
 #include <qpixmap.h>
 
 #include "dockmanager.h"
@@ -27,7 +27,7 @@ struct dockPosData
 };
 #endif
 
-class DockMainWindow : public KTMainWindow
+class DockMainWindow : public KMainWindow
 {Q_OBJECT
 public:
   DockMainWindow( const char *name = 0L );
diff --git a/kdbg/dbgmainwnd.cpp b/kdbg/dbgmainwnd.cpp
index 37d8d7d..ba6afbf 100644
--- a/kdbg/dbgmainwnd.cpp
+++ b/kdbg/dbgmainwnd.cpp
@@ -414,10 +414,16 @@ void DebuggerMainWnd::menuCallback(int item)
 	kapp->quit();
 	break;
     case ID_VIEW_TOOLBAR:
-	enableToolBar();
+	if (toolBar()->isVisible())
+	    toolBar()->hide();
+	else
+	    toolBar()->show();
 	break;
     case ID_VIEW_STATUSBAR:
-	enableStatusBar();
+	if (statusBar()->isVisible())
+	    statusBar()->hide();
+	else
+	    statusBar()->show();
 	break;
     case ID_PROGRAM_UNTIL:
 	if (m_debugger != 0)
diff --git a/kdbg/main.cpp b/kdbg/main.cpp
index 36cf7bb..28b3141 100644
--- a/kdbg/main.cpp
+++ b/kdbg/main.cpp
@@ -97,7 +97,7 @@ int main(int argc, char** argv)
     // session management
     bool restored = false;
     if (app.isRestored()) {
-	if (KTMainWindow::canBeRestored(1)) {
+	if (KMainWindow::canBeRestored(1)) {
 	    debugger.restore(1);
 	    restored = true;
 	}
-- 
2.11.4.GIT