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
821d4941
Commit
821d4941
authored
Feb 19, 2010
by
dt
Browse files
remove MessageManager::displayStatusMessage
parent
92cb4fca
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/coreplugin/messagemanager.cpp
View file @
821d4941
...
...
@@ -68,12 +68,6 @@ void MessageManager::showOutputPane()
m_messageOutputWindow
->
popup
(
false
);
}
void
MessageManager
::
displayStatusBarMessage
(
const
QString
&
/*text*/
,
int
/*ms*/
)
{
// TODO: Currently broken, but no one really notices, so...
//m_mainWindow->statusBar()->showMessage(text, ms);
}
void
MessageManager
::
printToOutputPane
(
const
QString
&
text
,
bool
bringToForeground
)
{
if
(
!
m_messageOutputWindow
)
...
...
src/plugins/coreplugin/messagemanager.h
View file @
821d4941
...
...
@@ -51,7 +51,6 @@ public:
static
MessageManager
*
instance
()
{
return
m_instance
;
}
void
displayStatusBarMessage
(
const
QString
&
text
,
int
ms
=
0
);
void
showOutputPane
();
public
slots
:
...
...
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
View file @
821d4941
...
...
@@ -109,13 +109,6 @@ MessageManagerPrototype::MessageManagerPrototype(QObject *parent) :
{
}
void
MessageManagerPrototype
::
displayStatusBarMessage
(
const
QString
&
text
,
int
ms
)
{
MessageManager
*
mm
=
qscriptvalue_cast
<
MessageManager
*>
(
thisObject
());
QTC_ASSERT
(
mm
,
return
);
mm
->
displayStatusBarMessage
(
text
,
ms
);
}
void
MessageManagerPrototype
::
printToOutputPane
(
const
QString
&
text
,
bool
bringToForeground
)
{
MessageManager
*
mm
=
qscriptvalue_cast
<
MessageManager
*>
(
thisObject
());
...
...
src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
View file @
821d4941
...
...
@@ -66,7 +66,6 @@ QString Manager::mimeType() const
ProjectExplorer
::
Project
*
Manager
::
openProject
(
const
QString
&
fileName
)
{
Core
::
MessageManager
*
messageManager
=
Core
::
ICore
::
instance
()
->
messageManager
();
messageManager
->
displayStatusBarMessage
(
tr
(
"Loading project %1 ..."
).
arg
(
fileName
),
50000
);
QFileInfo
fileInfo
(
fileName
);
ProjectExplorer
::
ProjectExplorerPlugin
*
projectExplorer
=
ProjectExplorer
::
ProjectExplorerPlugin
::
instance
();
...
...
src/plugins/qt4projectmanager/qt4projectmanager.cpp
View file @
821d4941
...
...
@@ -181,7 +181,6 @@ QString Qt4Manager::mimeType() const
ProjectExplorer
::
Project
*
Qt4Manager
::
openProject
(
const
QString
&
fileName
)
{
Core
::
MessageManager
*
messageManager
=
Core
::
ICore
::
instance
()
->
messageManager
();
messageManager
->
displayStatusBarMessage
(
tr
(
"Loading project %1 ..."
).
arg
(
fileName
),
50000
);
// TODO Make all file paths relative & remove this hack
// We convert the path to an absolute one here because qt4project.cpp
...
...
@@ -191,25 +190,18 @@ ProjectExplorer::Project* Qt4Manager::openProject(const QString &fileName)
if
(
canonicalFilePath
.
isEmpty
())
{
messageManager
->
printToOutputPane
(
tr
(
"Failed opening project '%1': Project file does not exist"
).
arg
(
QDir
::
toNativeSeparators
(
canonicalFilePath
)));
messageManager
->
displayStatusBarMessage
(
tr
(
"Failed opening project"
),
5000
);
return
0
;
}
foreach
(
ProjectExplorer
::
Project
*
pi
,
projectExplorer
()
->
session
()
->
projects
())
{
if
(
canonicalFilePath
==
pi
->
file
()
->
fileName
())
{
messageManager
->
printToOutputPane
(
tr
(
"Failed opening project '%1': Project already open"
).
arg
(
QDir
::
toNativeSeparators
(
canonicalFilePath
)));
messageManager
->
displayStatusBarMessage
(
tr
(
"Failed opening project"
),
5000
);
return
0
;
}
}
messageManager
->
displayStatusBarMessage
(
tr
(
"Opening %1 ..."
).
arg
(
fileName
));
QCoreApplication
::
processEvents
(
QEventLoop
::
ExcludeUserInputEvents
);
Qt4Project
*
pro
=
new
Qt4Project
(
this
,
canonicalFilePath
);
registerProject
(
pro
);
messageManager
->
displayStatusBarMessage
(
tr
(
"Done opening project"
),
5000
);
return
pro
;
}
...
...
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