Commit 5adee37c authored by mae's avatar mae

fix mac compile

parent 20158a8c
......@@ -74,10 +74,11 @@ using namespace Core::Internal;
enum { debugEditorManager=0 };
QString EditorManager::defaultExternalEditor() {
QString EditorManager::defaultExternalEditor() const
{
#ifdef Q_OS_MAC
return m_d->m_externalEditor = m_d->m_core->resourcePath()
+QLatin1String("/runInTerminal.command vi %f %l %c %W %H %x %y");
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)
......
......@@ -156,7 +156,7 @@ public:
void setExternalEditor(const QString &);
QString externalEditor() const;
static QString defaultExternalEditor();
QString defaultExternalEditor() const;
QString externalEditorHelpText() const;
signals:
......
......@@ -99,7 +99,7 @@ void GeneralSettings::resetInterfaceColor()
void GeneralSettings::resetExternalEditor()
{
m_page->externalEditorEdit->setText(EditorManager::defaultExternalEditor());
m_page->externalEditorEdit->setText(EditorManager::instance()->defaultExternalEditor());
}
void GeneralSettings::showHelpForExternalEditor()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment