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
4c4602b7
Commit
4c4602b7
authored
Dec 03, 2008
by
dt
Browse files
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
6477cec4
3d926c71
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/libs/cplusplus/TypeOfExpression.cpp
View file @
4c4602b7
...
...
@@ -91,7 +91,8 @@ Document::Ptr TypeOfExpression::documentForExpression(const QString &expression)
{
// create the expression's AST.
Document
::
Ptr
doc
=
Document
::
create
(
QLatin1String
(
"<completion>"
));
doc
->
setSource
(
expression
.
toUtf8
());
const
QByteArray
bytes
=
expression
.
toUtf8
();
doc
->
setSource
(
bytes
);
doc
->
parse
(
Document
::
ParseExpression
);
return
doc
;
}
src/plugins/coreplugin/editormanager/editormanager.cpp
View file @
4c4602b7
...
...
@@ -74,20 +74,6 @@ using namespace Core::Internal;
enum
{
debugEditorManager
=
0
};
QString
EditorManager
::
defaultExternalEditor
()
const
{
#ifdef Q_OS_MAC
return
m_d
->
m_core
->
resourcePath
()
+
QLatin1String
(
"/runInTerminal.command vi %f %l %c %W %H %x %y"
);
#elif defined(Q_OS_UNIX)
return
QLatin1String
(
"xterm -geom %Wx%H+%x+%y -e vi %f +%l +
\"
normal %c|
\"
"
);
#elif defined (Q_OS_WIN)
return
QLatin1String
(
"notepad %f"
);
#else
return
QString
();
#endif
}
//===================EditorManager=====================
EditorManagerPlaceHolder
*
EditorManagerPlaceHolder
::
m_current
=
0
;
...
...
@@ -388,6 +374,20 @@ QSize EditorManager::minimumSizeHint() const
return
QSize
(
400
,
300
);
}
QString
EditorManager
::
defaultExternalEditor
()
const
{
#ifdef Q_OS_MAC
return
m_d
->
m_core
->
resourcePath
()
+
QLatin1String
(
"/runInTerminal.command vi %f %l %c %W %H %x %y"
);
#elif defined(Q_OS_UNIX)
return
QLatin1String
(
"xterm -geom %Wx%H+%x+%y -e vi %f +%l +
\"
normal %c|
\"
"
);
#elif defined (Q_OS_WIN)
return
QLatin1String
(
"notepad %f"
);
#else
return
QString
();
#endif
}
EditorSplitter
*
EditorManager
::
editorSplitter
()
const
{
return
m_d
->
m_splitter
;
...
...
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