Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
5f3faaff
Commit
5f3faaff
authored
Jan 13, 2009
by
con
Browse files
Fixes: - ProgressManager --> ProgressManagerPrivate
parent
c9889120
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/plugins/coreplugin/coreplugin.pro
View file @
5f3faaff
...
...
@@ -112,7 +112,7 @@ HEADERS += mainwindow.h \
dialogs
/
openwithdialog
.
h
\
dialogs
/
iwizard
.
h
\
dialogs
/
ioptionspage
.
h
\
progressmanager
/
progressmanager
.
h
\
progressmanager
/
progressmanager
_p
.
h
\
progressmanager
/
progressview
.
h
\
progressmanager
/
progresspie
.
h
\
progressmanager
/
futureprogress
.
h
\
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
5f3faaff
...
...
@@ -49,7 +49,7 @@
#include "newdialog.h"
#include "outputpane.h"
#include "plugindialog.h"
#include "progressmanager.h"
#include "progressmanager
_p
.h"
#include "progressview.h"
#include "shortcutsettings.h"
#include "vcsmanager.h"
...
...
@@ -118,7 +118,7 @@ MainWindow::MainWindow() :
m_actionManager
(
new
ActionManagerPrivate
(
this
,
m_uniqueIDManager
)),
m_editorManager
(
0
),
m_fileManager
(
new
FileManager
(
m_coreImpl
,
this
)),
m_progressManager
(
new
ProgressManager
()),
m_progressManager
(
new
ProgressManager
Private
()),
m_scriptManager
(
new
ScriptManager
(
this
,
m_coreImpl
)),
m_variableManager
(
new
VariableManager
(
this
)),
m_vcsManager
(
new
VCSManager
()),
...
...
src/plugins/coreplugin/mainwindow.h
View file @
5f3faaff
...
...
@@ -80,7 +80,7 @@ class FancyTabWidget;
class
GeneralSettings
;
class
NavigationWidget
;
class
OutputPane
;
class
ProgressManager
;
class
ProgressManager
Private
;
class
ShortcutSettings
;
class
ViewManager
;
class
VersionDialog
;
...
...
@@ -180,7 +180,7 @@ private:
EditorManager
*
m_editorManager
;
FileManager
*
m_fileManager
;
MessageManager
*
m_messageManager
;
ProgressManager
*
m_progressManager
;
ProgressManager
Private
*
m_progressManager
;
ScriptManagerInterface
*
m_scriptManager
;
VariableManager
*
m_variableManager
;
VCSManager
*
m_vcsManager
;
...
...
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View file @
5f3faaff
...
...
@@ -31,7 +31,7 @@
**
***************************************************************************/
#include "progressmanager.h"
#include "progressmanager
_p
.h"
#include "progressview.h"
#include "coreimpl.h"
#include "baseview.h"
...
...
@@ -44,7 +44,7 @@
using
namespace
Core
;
using
namespace
Core
::
Internal
;
ProgressManager
::
ProgressManager
(
QObject
*
parent
)
ProgressManager
Private
::
ProgressManager
Private
(
QObject
*
parent
)
:
ProgressManagerInterface
(
parent
)
{
m_progressView
=
new
ProgressView
;
...
...
@@ -52,15 +52,15 @@ ProgressManager::ProgressManager(QObject *parent)
connect
(
core
,
SIGNAL
(
coreAboutToClose
()),
this
,
SLOT
(
cancelAllRunningTasks
()));
}
ProgressManager
::~
ProgressManager
()
ProgressManager
Private
::~
ProgressManager
Private
()
{
}
void
ProgressManager
::
init
()
void
ProgressManager
Private
::
init
()
{
}
void
ProgressManager
::
cancelTasks
(
const
QString
&
type
)
void
ProgressManager
Private
::
cancelTasks
(
const
QString
&
type
)
{
QMap
<
QFutureWatcher
<
void
>
*
,
QString
>::
iterator
task
=
m_runningTasks
.
begin
();
while
(
task
!=
m_runningTasks
.
end
())
{
...
...
@@ -75,7 +75,7 @@ void ProgressManager::cancelTasks(const QString &type)
}
}
void
ProgressManager
::
cancelAllRunningTasks
()
void
ProgressManager
Private
::
cancelAllRunningTasks
()
{
QMap
<
QFutureWatcher
<
void
>
*
,
QString
>::
const_iterator
task
=
m_runningTasks
.
constBegin
();
while
(
task
!=
m_runningTasks
.
constEnd
())
{
...
...
@@ -87,7 +87,7 @@ void ProgressManager::cancelAllRunningTasks()
m_runningTasks
.
clear
();
}
FutureProgress
*
ProgressManager
::
addTask
(
const
QFuture
<
void
>
&
future
,
const
QString
&
title
,
const
QString
&
type
,
PersistentType
persistency
)
FutureProgress
*
ProgressManager
Private
::
addTask
(
const
QFuture
<
void
>
&
future
,
const
QString
&
title
,
const
QString
&
type
,
PersistentType
persistency
)
{
QFutureWatcher
<
void
>
*
watcher
=
new
QFutureWatcher
<
void
>
();
m_runningTasks
.
insert
(
watcher
,
type
);
...
...
@@ -96,12 +96,12 @@ FutureProgress *ProgressManager::addTask(const QFuture<void> &future, const QStr
return
m_progressView
->
addTask
(
future
,
title
,
type
,
persistency
);
}
QWidget
*
ProgressManager
::
progressView
()
QWidget
*
ProgressManager
Private
::
progressView
()
{
return
m_progressView
;
}
void
ProgressManager
::
taskFinished
()
void
ProgressManager
Private
::
taskFinished
()
{
QObject
*
taskObject
=
sender
();
QTC_ASSERT
(
taskObject
,
return
);
...
...
src/plugins/coreplugin/progressmanager/progressmanager.h
→
src/plugins/coreplugin/progressmanager/progressmanager
_p
.h
View file @
5f3faaff
...
...
@@ -31,8 +31,8 @@
**
***************************************************************************/
#ifndef PROGRESSMANAGER_H
#define PROGRESSMANAGER_H
#ifndef PROGRESSMANAGER_
P_
H
#define PROGRESSMANAGER_
P_
H
#include "progressmanagerinterface.h"
...
...
@@ -45,12 +45,12 @@ namespace Internal {
class
ProgressView
;
class
ProgressManager
:
public
Core
::
ProgressManagerInterface
class
ProgressManager
Private
:
public
Core
::
ProgressManagerInterface
{
Q_OBJECT
public:
ProgressManager
(
QObject
*
parent
=
0
);
~
ProgressManager
();
ProgressManager
Private
(
QObject
*
parent
=
0
);
~
ProgressManager
Private
();
void
init
();
FutureProgress
*
addTask
(
const
QFuture
<
void
>
&
future
,
const
QString
&
title
,
const
QString
&
type
,
PersistentType
persistency
);
...
...
@@ -71,4 +71,4 @@ private:
}
// namespace Internal
}
// namespace Core
#endif // PROGRESSMANAGER_H
#endif // PROGRESSMANAGER_
P_
H
src/plugins/cpptools/cppmodelmanager.cpp
View file @
5f3faaff
...
...
@@ -49,7 +49,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/progressmanager
interface
.h>
#include <utils/qtcassert.h>
...
...
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