[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/kmix
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-04-29 13:39:41
Message-ID: 20050429133941.42B78629 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Cool, the second KMainWindow ctor added for 3.2 caused source-incompatible
changes :(. And I finally got tired of KMix crashing on exit.

Oh, and for those shaking head at me for using NULL instead of 0 - it would
have caught this problem.


  M +3 -12     KMixApp.cpp   1.9
  M +0 -4      KMixApp.h   1.4
  M +2 -2      kmix.cpp   1.200


--- kdemultimedia/kmix/KMixApp.cpp  #1.8:1.9
@@ -29,7 +29,6 @@
 
 KMixApp::KMixApp()
-    : KUniqueApplication(), m_kmix( 0 ), _lastWindowClosed( false )
+    : KUniqueApplication(), m_kmix( 0 )
 {
-   connect( this, SIGNAL(lastWindowClosed()), this, SLOT(rememberLastWindowClosed()) );
 }
 
@@ -37,8 +36,5 @@ KMixApp::KMixApp()
 KMixApp::~KMixApp()
 {
-   if ( !_lastWindowClosed) {
-       _lastWindowClosed = true;
        delete m_kmix;
-   }
 }
 
@@ -75,8 +71,3 @@ KMixApp::quitExtended()
 }
 
-void KMixApp::rememberLastWindowClosed() {
-   // remember that, so that we don't delete the MainWindow again in the destructor
-   _lastWindowClosed = true;
-}
-
 #include "KMixApp.moc"

--- kdemultimedia/kmix/KMixApp.h  #1.3:1.4
@@ -20,10 +20,6 @@ Q_OBJECT
     void stopUpdatesOnVisibility();
 
- private slots:
-    void rememberLastWindowClosed();
-    
  private:
     KMixWindow *m_kmix;
-    bool       _lastWindowClosed;
 };
 

--- kdemultimedia/kmix/kmix.cpp  #1.199:1.200
@@ -62,5 +62,5 @@
  */
 KMixWindow::KMixWindow()
-        : KMainWindow(0, 0, 0 ), m_showTicks( true ),
+        : KMainWindow(0, 0, 0, 0), m_showTicks( true ),
         m_dockWidget( 0L )
 {


[prev in list] [next in list] [prev in thread] [next in thread]