From df6fcd363a27f7415a2535b864dbc4e199fd5bcc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 2 Jul 2010 14:36:18 +0200
Subject: [PATCH] Compile fix Windows.
---
src/plugins/texteditor/basetexteditor.h | 2 +-
src/plugins/texteditor/refactoroverlay.cpp | 4 ++--
src/plugins/texteditor/refactoroverlay.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 2f96437f94c..7c1ab6e6120 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -52,7 +52,7 @@ namespace Internal {
class BaseTextEditorPrivate;
class TextEditorOverlay;
class RefactorOverlay;
- class RefactorMarker;
+ struct RefactorMarker;
typedef QList<RefactorMarker> RefactorMarkers;
}
diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp
index 006de650236..520fd2b5d59 100644
--- a/src/plugins/texteditor/refactoroverlay.cpp
+++ b/src/plugins/texteditor/refactoroverlay.cpp
@@ -6,11 +6,11 @@
using namespace TextEditor::Internal;
-RefactorOverlay::RefactorOverlay(BaseTextEditor *editor) :
+RefactorOverlay::RefactorOverlay(TextEditor::BaseTextEditor *editor) :
QObject(editor),
m_editor(editor),
m_maxWidth(0),
- m_icon(":/texteditor/images/refactormarker.png")
+ m_icon(QLatin1String(":/texteditor/images/refactormarker.png"))
{
}
diff --git a/src/plugins/texteditor/refactoroverlay.h b/src/plugins/texteditor/refactoroverlay.h
index ad44b843c73..6c0c9bac3fe 100644
--- a/src/plugins/texteditor/refactoroverlay.h
+++ b/src/plugins/texteditor/refactoroverlay.h
@@ -24,7 +24,7 @@ class TEXTEDITOR_EXPORT RefactorOverlay : public QObject
{
Q_OBJECT
public:
- explicit RefactorOverlay(BaseTextEditor *editor);
+ explicit RefactorOverlay(TextEditor::BaseTextEditor *editor);
bool isEmpty() const { return m_markers.isEmpty(); }
void paint(QPainter *painter, const QRect &clip);
--
GitLab