From ceb73b720b32e3ab11000174b6fe744ba19b5b8e Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Tue, 2 Dec 2008 15:33:07 +0100
Subject: [PATCH 1/3] Reduced the number of generated #line directives.

---
 src/plugins/cpptools/rpp/pp-engine.cpp         | 16 ++++------------
 src/plugins/cpptools/rpp/pp-macro-expander.cpp |  3 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/plugins/cpptools/rpp/pp-engine.cpp b/src/plugins/cpptools/rpp/pp-engine.cpp
index 5128b4ce37d..a061b2942a9 100644
--- a/src/plugins/cpptools/rpp/pp-engine.cpp
+++ b/src/plugins/cpptools/rpp/pp-engine.cpp
@@ -515,8 +515,7 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
     while (true) {
         if (env.currentLine != _dot->lineno) {
             if (env.currentLine > _dot->lineno) {
-                result->append('\n');
-                result->append('#');
+                result->append("\n# ");
                 result->append(QByteArray::number(_dot->lineno));
                 result->append(' ');
                 result->append('"');
@@ -564,16 +563,6 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
         } else {
             if (_dot->joined)
                 result->append("\\\n");
-            else if (_dot->newline) {
-                result->append('\n');
-                result->append('#');
-                result->append(QByteArray::number(_dot->lineno));
-                result->append(' ');
-                result->append('"');
-                result->append(env.current_file);
-                result->append('"');
-                result->append('\n');
-            }
             else if (_dot->whitespace)
                 result->append(' ');
 
@@ -861,11 +850,14 @@ void pp::processDefine(TokenIterator firstToken, TokenIterator lastToken)
     if (isQtWord)
         macro.definition = macroId;
     else {
+        // ### make me fast!
         const char *startOfDefinition = startOfToken(*tk);
         const char *endOfDefinition = startOfToken(*lastToken);
         macro.definition.append(startOfDefinition,
                                 endOfDefinition - startOfDefinition);
         macro.definition.replace("\\\n", " ");
+        macro.definition.replace('\n', ' ');
+        macro.definition = macro.definition.trimmed();
     }
 
     env.bind(macro);
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.cpp b/src/plugins/cpptools/rpp/pp-macro-expander.cpp
index 0b224d8eea9..6b569eb132f 100644
--- a/src/plugins/cpptools/rpp/pp-macro-expander.cpp
+++ b/src/plugins/cpptools/rpp/pp-macro-expander.cpp
@@ -69,8 +69,7 @@ const char *MacroExpander::operator () (const char *__first, const char *__last,
     {
         if (*__first == '\n')
         {
-            __result->append('\n');
-            __result->append('#');
+            __result->append("\n# ");
             __result->append(QByteArray::number(env.currentLine));
             __result->append(' ');
             __result->append('"');

From d9686f5b7830b5da68f7cc39895b3522b107bbcc Mon Sep 17 00:00:00 2001
From: mae <qtc-committer@nokia.com>
Date: Tue, 2 Dec 2008 15:39:53 +0100
Subject: [PATCH 2/3] Do not call QProcess::startDetached() with an empty
 string if no external editor is defined.

---
 src/plugins/coreplugin/editormanager/editormanager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 7b2e0b23627..8fd8ef14225 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1152,7 +1152,7 @@ void EditorManager::updateActions()
 
     m_d->m_duplicateAction->setEnabled(curEditor != 0 && curEditor->duplicateSupported());
 
-    m_d->m_openInExternalEditorAction->setEnabled(curEditor != 0);
+    m_d->m_openInExternalEditorAction->setEnabled(curEditor != 0 && !m_d->m_externalEditor.isEmpty());
 }
 
 QList<IEditor*> EditorManager::openedEditors() const
@@ -1488,6 +1488,9 @@ QString EditorManager::externalEditorHelpText() const
 
 void EditorManager::openInExternalEditor()
 {
+    if (m_d->m_externalEditor.isEmpty())
+        return;
+
     IEditor *editor = currentEditor();
     if (!editor)
         return;
@@ -1499,7 +1502,6 @@ void EditorManager::openInExternalEditor()
             return;
     }
 
-
     QRect rect = editor->widget()->rect();
     QFont font = editor->widget()->font();
     QFontMetrics fm(font);

From 4bf6d6c15461986fe9cf35aad9e4d11699246766 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 2 Dec 2008 15:42:25 +0100
Subject: [PATCH 3/3] fix #endif syntax

---
 src/libs/extensionsystem/pluginview_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/extensionsystem/pluginview_p.h b/src/libs/extensionsystem/pluginview_p.h
index 4c5682d293d..e9565c1384f 100644
--- a/src/libs/extensionsystem/pluginview_p.h
+++ b/src/libs/extensionsystem/pluginview_p.h
@@ -49,4 +49,4 @@ public:
 } // namespace Internal
 } // namespace ExtensionSystem
 
-#endif PLUGINVIEW_P_H
+#endif // PLUGINVIEW_P_H