Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
8450ca3f
Commit
8450ca3f
authored
Dec 02, 2010
by
hjk
Browse files
debugger: remove unused member
parent
c1edc308
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermainwindow.cpp
View file @
8450ca3f
...
...
@@ -48,12 +48,12 @@
#include
<coreplugin/outputpane.h>
#include
<coreplugin/rightpane.h>
#include
<projectexplorer/project
explorerconstants
.h>
#include
<projectexplorer/project.h>
#include
<projectexplorer/projectexplorer.h>
#include
<projectexplorer/projectexplorerconstants.h>
#include
<projectexplorer/runconfiguration.h>
#include
<projectexplorer/session.h>
#include
<projectexplorer/project.h>
#include
<projectexplorer/target.h>
#include
<projectexplorer/runconfiguration.h>
#include
<QtCore/QDebug>
#include
<QtCore/QList>
...
...
@@ -158,7 +158,6 @@ public:
QWeakPointer
<
RunConfiguration
>
m_previousRunConfiguration
;
bool
m_initialized
;
QSettings
*
m_settings
;
};
DebuggerMainWindowPrivate
::
DebuggerMainWindowPrivate
(
DebuggerMainWindow
*
mw
)
...
...
@@ -173,9 +172,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
,
m_activeDebugLanguages
(
AnyLanguage
)
,
m_viewsMenu
(
0
)
,
m_initialized
(
false
)
,
m_settings
(
0
)
{
}
{}
void
DebuggerMainWindowPrivate
::
updateUiOnFileListChange
()
{
...
...
@@ -270,11 +267,6 @@ void DebuggerMainWindow::updateActiveLanguages()
d
->
updateUi
();
}
DebuggerLanguages
DebuggerMainWindow
::
supportedLanguages
()
const
{
return
d
->
m_supportedLanguages
;
}
DebuggerLanguages
DebuggerMainWindow
::
activeDebugLanguages
()
const
{
return
d
->
m_activeDebugLanguages
;
...
...
@@ -585,37 +577,47 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
void
DebuggerMainWindow
::
writeSettings
()
const
{
d
->
m_settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppMode"
));
ICore
*
core
=
ICore
::
instance
();
QTC_ASSERT
(
core
,
return
);
QSettings
*
settings
=
core
->
settings
();
QTC_ASSERT
(
settings
,
return
);
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppMode"
));
QHashIterator
<
QString
,
QVariant
>
it
(
d
->
m_dockWidgetActiveStateCpp
);
while
(
it
.
hasNext
())
{
it
.
next
();
d
->
m_
settings
->
setValue
(
it
.
key
(),
it
.
value
());
settings
->
setValue
(
it
.
key
(),
it
.
value
());
}
d
->
m_
settings
->
endGroup
();
settings
->
endGroup
();
d
->
m_
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppQmlMode"
));
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppQmlMode"
));
it
=
QHashIterator
<
QString
,
QVariant
>
(
d
->
m_dockWidgetActiveStateQmlCpp
);
while
(
it
.
hasNext
())
{
it
.
next
();
d
->
m_
settings
->
setValue
(
it
.
key
(),
it
.
value
());
settings
->
setValue
(
it
.
key
(),
it
.
value
());
}
d
->
m_
settings
->
endGroup
();
settings
->
endGroup
();
}
void
DebuggerMainWindow
::
readSettings
()
{
ICore
*
core
=
ICore
::
instance
();
QTC_ASSERT
(
core
,
return
);
QSettings
*
settings
=
core
->
settings
();
QTC_ASSERT
(
settings
,
return
);
d
->
m_dockWidgetActiveStateCpp
.
clear
();
d
->
m_dockWidgetActiveStateQmlCpp
.
clear
();
d
->
m_
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppMode"
));
foreach
(
const
QString
&
key
,
d
->
m_
settings
->
childKeys
())
d
->
m_dockWidgetActiveStateCpp
.
insert
(
key
,
d
->
m_
settings
->
value
(
key
));
d
->
m_
settings
->
endGroup
();
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppMode"
));
foreach
(
const
QString
&
key
,
settings
->
childKeys
())
d
->
m_dockWidgetActiveStateCpp
.
insert
(
key
,
settings
->
value
(
key
));
settings
->
endGroup
();
d
->
m_
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppQmlMode"
));
foreach
(
const
QString
&
key
,
d
->
m_
settings
->
childKeys
())
d
->
m_dockWidgetActiveStateQmlCpp
.
insert
(
key
,
d
->
m_
settings
->
value
(
key
));
d
->
m_
settings
->
endGroup
();
settings
->
beginGroup
(
QLatin1String
(
"DebugMode.CppQmlMode"
));
foreach
(
const
QString
&
key
,
settings
->
childKeys
())
d
->
m_dockWidgetActiveStateQmlCpp
.
insert
(
key
,
settings
->
value
(
key
));
settings
->
endGroup
();
// reset initial settings when there are none yet
DebuggerLanguages
langs
=
d
->
m_activeDebugLanguages
;
...
...
@@ -630,9 +632,8 @@ void DebuggerMainWindow::readSettings()
d
->
m_activeDebugLanguages
=
langs
;
}
void
DebuggerMainWindow
::
initialize
(
QSettings
*
settings
)
void
DebuggerMainWindow
::
initialize
()
{
d
->
m_settings
=
settings
;
d
->
createViewsMenuItems
();
emit
dockResetRequested
(
AnyLanguage
);
...
...
src/plugins/debugger/debuggermainwindow.h
View file @
8450ca3f
...
...
@@ -39,7 +39,6 @@
QT_BEGIN_NAMESPACE
class
QDockWidget
;
class
QSettings
;
class
QMenu
;
QT_END_NAMESPACE
...
...
@@ -65,17 +64,14 @@ public:
// Debuggable languages are registered with this function.
void
addLanguage
(
const
DebuggerLanguage
&
language
,
const
Core
::
Context
&
context
);
// Debugger toolbars are registered with this function
// Debugger toolbars are registered with this function
.
void
setToolbar
(
const
DebuggerLanguage
&
language
,
QWidget
*
widget
);
// All supported languages
DebuggerLanguages
supportedLanguages
()
const
;
// Active languages to be debugged.
DebuggerLanguages
activeDebugLanguages
()
const
;
// Called when all dependent plugins have loaded
void
initialize
(
QSettings
*
settings
);
// Called when all dependent plugins have loaded
.
void
initialize
();
void
onModeChanged
(
Core
::
IMode
*
mode
);
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
8450ca3f
...
...
@@ -737,7 +737,7 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
#ifndef QT_DEBUG
#if 0
cmd = am->registerAction(m_
manager->m_
dumpLogAction,
cmd = am->registerAction(m_dumpLogAction,
DUMP_LOG, globalcontext);
//cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+D,Ctrl+L")));
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F11")));
...
...
@@ -1324,7 +1324,6 @@ public slots:
public:
DebuggerState
m_state
;
DebuggerMainWindow
*
m_mainWindow
;
DebuggerPlugin
*
m_manager
;
DebugMode
*
m_debugMode
;
DebuggerRunControlFactory
*
m_debuggerRunControlFactory
;
...
...
@@ -2949,7 +2948,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
ExtensionSystem
::
PluginManager
::
instance
()
->
addObject
(
m_mainWindow
);
m_mainWindow
->
addLanguage
(
CppLanguage
,
cppDebuggercontext
);
m_mainWindow
->
addLanguage
(
QmlLanguage
,
qmlDebuggerContext
);
m_mainWindow
->
initialize
(
m_coreSettings
);
m_mainWindow
->
initialize
();
readSettings
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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