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

List:       kde-commits
Subject:    kdepim/kontact/plugins/knotes
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2004-08-29 22:42:47
Message-ID: 20040829224247.3830D1D91 () office ! kde ! org
[Download RAW message or body]

CVS commit by tokoe: 

Fixed a bug which is caused by dangling pointer to the xmlguifactory, which
doesn't exists after a part switch any longer...


  M +4 -6      knotes_part.cpp   1.40
  M +0 -1      knotes_part.h   1.19


--- kdepim/kontact/plugins/knotes/knotes_part.cpp  #1.39:1.40
@@ -43,5 +43,4 @@ KNotesPart::KNotesPart( QObject *parent,
     m_noteTip( new KNoteTip( m_notesView ) ),
     m_noteEditDlg( 0 ),
-    m_context_menu( 0 ),
     m_manager( new KNotesResourceManager() )
 {
@@ -283,11 +282,10 @@ void KNotesPart::killSelectedNotes()
 void KNotesPart::popupRMB( QIconViewItem *item, const QPoint& pos )
 {
-    if ( !m_context_menu )
-        m_context_menu = static_cast<QPopupMenu *>(factory()->container( "note_context", this ));
+  QPopupMenu *contextMenu = static_cast<QPopupMenu *>( factory()->container( "note_context", this ) );
 
-    if ( !m_context_menu || !item )
+  if ( !contextMenu || !item )
         return;
 
-    m_context_menu->popup( pos );
+  contextMenu->popup( pos );
 }
 

--- kdepim/kontact/plugins/knotes/knotes_part.h  #1.18:1.19
@@ -99,5 +99,4 @@ private:
     KNoteTip *m_noteTip;
     KNoteEditDlg *m_noteEditDlg;
-    QPopupMenu *m_context_menu;
 
     KNotesResourceManager *m_manager;


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