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

List:       kde-commits
Subject:    kdevelop/parts/cppsupport
From:       Roberto Raggi <roberto () kdevelop ! org>
Date:       2003-09-04 19:28:29
[Download RAW message or body]

CVS commit by raggi: 

fixed another possible crash in editor's context menu


  M +19 -15    cppsupportpart.cpp   1.220


--- kdevelop/parts/cppsupport/cppsupportpart.cpp  #1.219:1.220
@@ -433,6 +433,4 @@ void CppSupportPart::contextMenu(QPopupM
        kdDebug(9007) << "======> code model has the file: " << m_activeFileName << " = " << \
codeModel()->hasFile( m_activeFileName ) << endl;  if( codeModel()->hasFile(m_activeFileName) ){
-           QPopupMenu* m = new QPopupMenu( popup );
-           popup->insertItem( i18n("Go to definition"), m );
            QString candidate1;
            if (isHeader(m_activeFileName))
@@ -441,4 +439,8 @@ void CppSupportPart::contextMenu(QPopupM
                candidate1 = m_activeFileName;
 
+           if( codeModel()->hasFile(candidate1) ){
+               QPopupMenu* m = new QPopupMenu( popup );
+               popup->insertItem( i18n("Go to definition"), m );
+
            const FileDom file = codeModel()->fileByName( candidate1 );
            const FunctionDefinitionList functionDefinitionList = file->functionDefinitionList();
@@ -453,8 +455,7 @@ void CppSupportPart::contextMenu(QPopupM
                m->setItemParameter( id, line );
            }
+           }
 
            kdDebug() << "CppSupportPart::contextMenu 1" << endl;
-           QPopupMenu* m2 = new QPopupMenu( popup );
-           popup->insertItem( i18n("Go to declaration"), m2 );
            QString candidate;
            if (isSource(m_activeFileName))
@@ -465,4 +466,7 @@ void CppSupportPart::contextMenu(QPopupM
            if (!candidate.isEmpty() && codeModel()->hasFile(candidate) )
            {
+                QPopupMenu* m2 = new QPopupMenu( popup );
+                popup->insertItem( i18n("Go to declaration"), m2 );
+
                 FileDom file2 = codeModel()->fileByName( candidate );
                 kdDebug() << "CppSupportPart::contextMenu 3: " << file2->name() << endl;


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