Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
40a91b31
Commit
40a91b31
authored
Jan 20, 2009
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix access to uninitialized m_core member that should have not been
there anymore
parent
757ea721
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
11 deletions
+4
-11
src/plugins/cppeditor/cppeditor.cpp
src/plugins/cppeditor/cppeditor.cpp
+3
-3
src/plugins/cppeditor/cppeditor.h
src/plugins/cppeditor/cppeditor.h
+1
-8
No files found.
src/plugins/cppeditor/cppeditor.cpp
View file @
40a91b31
...
...
@@ -334,10 +334,10 @@ void CPPEditor::jumpToMethod(int)
if
(
!
symbol
)
return
;
m_core
->
editorManager
()
->
addCurrentPositionToNavigationHistory
(
true
);
Core
::
ICore
::
instance
()
->
editorManager
()
->
addCurrentPositionToNavigationHistory
(
true
);
int
line
=
symbol
->
line
();
gotoLine
(
line
);
m_core
->
editorManager
()
->
addCurrentPositionToNavigationHistory
();
Core
::
ICore
::
instance
()
->
editorManager
()
->
addCurrentPositionToNavigationHistory
();
setFocus
();
}
...
...
@@ -655,7 +655,7 @@ void CPPEditor::contextMenuEvent(QContextMenuEvent *e)
menu
->
removeAction
(
lastAction
);
Core
::
ActionContainer
*
mcontext
=
m_core
->
actionManager
()
->
actionContainer
(
CppEditor
::
Constants
::
M_CONTEXT
);
Core
::
ICore
::
instance
()
->
actionManager
()
->
actionContainer
(
CppEditor
::
Constants
::
M_CONTEXT
);
QMenu
*
contextMenu
=
mcontext
->
menu
();
foreach
(
QAction
*
action
,
contextMenu
->
actions
())
...
...
src/plugins/cppeditor/cppeditor.h
View file @
40a91b31
...
...
@@ -35,20 +35,14 @@
#define CPPEDITOR_H
#include "cppeditorenums.h"
#include <cplusplus/CppDocument.h>
#include <texteditor/basetexteditor.h>
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
class
QAction
;
class
QComboBox
;
class
QStringListModel
;
QT_END_NAMESPACE
namespace
Core
{
class
ICore
;
}
namespace
CPlusPlus
{
class
OverviewModel
;
class
Symbol
;
...
...
@@ -136,7 +130,6 @@ private:
bool
openEditorAt
(
CPlusPlus
::
Symbol
*
symbol
);
Core
::
ICore
*
m_core
;
CppTools
::
CppModelManagerInterface
*
m_modelManager
;
QList
<
int
>
m_contexts
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment