From 5adee37c8c9638278cebee9fbbde44999bb9e2a9 Mon Sep 17 00:00:00 2001
From: mae <qtc-committer@nokia.com>
Date: Wed, 3 Dec 2008 14:25:23 +0100
Subject: [PATCH] fix mac compile

---
 src/plugins/coreplugin/editormanager/editormanager.cpp | 7 ++++---
 src/plugins/coreplugin/editormanager/editormanager.h   | 2 +-
 src/plugins/coreplugin/generalsettings.cpp             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index e546cc53de5..0092513693b 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -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)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 480d99bf6bb..b71791f36bf 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -156,7 +156,7 @@ public:
 
     void setExternalEditor(const QString &);
     QString externalEditor() const;
-    static QString defaultExternalEditor();
+    QString defaultExternalEditor() const;
     QString externalEditorHelpText() const;
 
 signals:
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 5aebb87d943..5edfda207e8 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -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()