Commit 5adee37c authored by mae's avatar mae
Browse files

fix mac compile

parent 20158a8c
...@@ -74,10 +74,11 @@ using namespace Core::Internal; ...@@ -74,10 +74,11 @@ using namespace Core::Internal;
enum { debugEditorManager=0 }; enum { debugEditorManager=0 };
QString EditorManager::defaultExternalEditor() { QString EditorManager::defaultExternalEditor() const
{
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
return m_d->m_externalEditor = m_d->m_core->resourcePath() return m_d->m_core->resourcePath()
+QLatin1String("/runInTerminal.command vi %f %l %c %W %H %x %y"); +QLatin1String("/runInTerminal.command vi %f %l %c %W %H %x %y");
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
return QLatin1String("xterm -geom %Wx%H+%x+%y -e vi %f +%l +\"normal %c|\""); return QLatin1String("xterm -geom %Wx%H+%x+%y -e vi %f +%l +\"normal %c|\"");
#elif defined (Q_OS_WIN) #elif defined (Q_OS_WIN)
......
...@@ -156,7 +156,7 @@ public: ...@@ -156,7 +156,7 @@ public:
void setExternalEditor(const QString &); void setExternalEditor(const QString &);
QString externalEditor() const; QString externalEditor() const;
static QString defaultExternalEditor(); QString defaultExternalEditor() const;
QString externalEditorHelpText() const; QString externalEditorHelpText() const;
signals: signals:
......
...@@ -99,7 +99,7 @@ void GeneralSettings::resetInterfaceColor() ...@@ -99,7 +99,7 @@ void GeneralSettings::resetInterfaceColor()
void GeneralSettings::resetExternalEditor() void GeneralSettings::resetExternalEditor()
{ {
m_page->externalEditorEdit->setText(EditorManager::defaultExternalEditor()); m_page->externalEditorEdit->setText(EditorManager::instance()->defaultExternalEditor());
} }
void GeneralSettings::showHelpForExternalEditor() void GeneralSettings::showHelpForExternalEditor()
......
Supports Markdown
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