CVS commit by bmeyer: 

KMainWindow can now handle the statusbar and toolbar, removed unnecessary
functionality.


  M +3 -21     ktnefmain.cpp   1.6
  M +0 -2      ktnefmain.h   1.6


--- kdepim/ktnef/gui/ktnefmain.cpp  #1.5:1.6
@@ -61,6 +61,4 @@ KTNEFMain::KTNEFMain(QWidget *parent, co
         setupStatusbar();
 
-        setAutoSaveSettings( "MainWindow" );
-
         setupTNEF();
 
@@ -76,4 +74,5 @@ KTNEFMain::KTNEFMain(QWidget *parent, co
 
         resize(430,350);
+        setAutoSaveSettings( "MainWindow" );
 }
 
@@ -113,6 +112,6 @@ void KTNEFMain::setupActions()
         new KAction(i18n("Default Folder..."), QString("folder_open"), 0, this, SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
 
-        KStdAction::showToolbar(this, SLOT(slotShowToolbar()), actionCollection());
-        KStdAction::showStatusbar(this, SLOT(slotShowStatusbar()), actionCollection());
+        createStandardStatusBarAction();
+        setStandardToolBarMenuEnabled(true);
         KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection());
 
@@ -348,21 +347,4 @@ void KTNEFMain::slotNewToolbarConfig()
         createGUI();
         applyMainWindowSettings( KGlobal::config(), QString::fromLatin1("MainWindow") );
-}
-
-void KTNEFMain::slotShowToolbar()
-{
-        if (toolBar()->isVisible())
-                toolBar()->hide();
-        else
-                toolBar()->show();
-}
-
-void KTNEFMain::slotShowStatusbar()
-{
-        if (statusBar()->isVisible())
-                statusBar()->hide();
-        else
-                statusBar()->show();
-        setSettingsDirty();
 }
 

--- kdepim/ktnef/gui/ktnefmain.h  #1.5:1.6
@@ -49,6 +49,4 @@ protected slots:
         void slotEditToolbars();
         void slotNewToolbarConfig();
-        void slotShowToolbar();
-        void slotShowStatusbar();
         void slotShowMessageProperties();