|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/autotests/src/plaintextsearch_test.cpp
|
| @@ -25,6 +25,8 @@
#include <QtTestWidgets>
+Q_DECLARE_METATYPE(KTextEditor::Range)
+
QTEST_MAIN(PlainTextSearchTest)
QtMessageHandler PlainTextSearchTest::s_msgHandler = 0;
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/autotests/src/regexpsearch_test.cpp
^
|
| @@ -25,6 +25,8 @@
#include <QtTestWidgets>
+Q_DECLARE_METATYPE(KTextEditor::Range)
+
QTEST_MAIN(RegExpSearchTest)
#define testNewRow() (QTest::newRow(QString("line %1").arg(__LINE__).toLatin1().data()))
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/autotests/src/scriptdocument_test.cpp
^
|
| @@ -25,6 +25,8 @@
#include <QtTestWidgets>
+Q_DECLARE_METATYPE(KTextEditor::Cursor)
+
QTEST_MAIN(ScriptDocumentTest)
QtMessageHandler ScriptDocumentTest::s_msgHandler = 0;
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/src/include/ktexteditor/cursor.h
^
|
| @@ -352,7 +352,6 @@
}
Q_DECLARE_TYPEINFO(KTextEditor::Cursor, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(KTextEditor::Cursor)
/**
* QHash function for KTextEditor::Cursor.
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/src/include/ktexteditor/range.h
^
|
| @@ -567,7 +567,6 @@
}
Q_DECLARE_TYPEINFO(KTextEditor::Range, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(KTextEditor::Range)
/**
* QHash function for KTextEditor::Range.
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/src/spellcheck/ontheflycheck.cpp
^
|
| @@ -69,8 +69,8 @@
this, SLOT(addView(KTextEditor::Document*,KTextEditor::View*)));
connect(document, SIGNAL(highlightingModeChanged(KTextEditor::Document*)),
this, SLOT(updateConfig()));
- connect(&document->buffer(), SIGNAL(respellCheckBlock(int,int)),
- this, SLOT(handleRespellCheckBlock(int,int)));
+ connect(&document->buffer(), SIGNAL(respellCheckBlock(KTextEditor::DocumentPrivate*,int,int)),
+ this, SLOT(handleRespellCheckBlock(KTextEditor::DocumentPrivate*,int,int)));
// load the settings for the speller
updateConfig();
@@ -119,8 +119,11 @@
}
}
-void KateOnTheFlyChecker::handleRespellCheckBlock(int start, int end)
+void KateOnTheFlyChecker::handleRespellCheckBlock(KTextEditor::DocumentPrivate *kateDocument, int start, int end)
{
+ Q_ASSERT(kateDocument == m_document);
+ Q_UNUSED(kateDocument);
+
ON_THE_FLY_DEBUG << start << end;
KTextEditor::Range range(start, 0, end, m_document->lineLength(end));
bool listEmpty = m_modificationList.isEmpty();
@@ -655,7 +658,7 @@
void KateOnTheFlyChecker::updateConfig()
{
ON_THE_FLY_DEBUG;
- //m_speller.restore();
+ m_speller.restore();
}
void KateOnTheFlyChecker::refreshSpellCheck(const KTextEditor::Range &range)
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/src/spellcheck/ontheflycheck.h
^
|
| @@ -132,7 +132,7 @@
void handleModifiedRanges();
void handleInsertedText(const KTextEditor::Range &range);
void handleRemovedText(const KTextEditor::Range &range);
- void handleRespellCheckBlock(int start, int end);
+ void handleRespellCheckBlock(KTextEditor::DocumentPrivate *document, int start, int end);
bool removeRangeFromModificationList(KTextEditor::MovingRange *range);
void clearModificationList();
};
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/src/utils/kateconfig.cpp
^
|
| @@ -34,7 +34,6 @@
#include <QTextCodec>
#include <QStringListModel>
-#include <QSettings>
//BEGIN KateConfig
KateConfig::KateConfig()
@@ -1148,10 +1147,8 @@
if (isGlobal()) {
// WARNING: this is slightly hackish, but it's currently the only way to
// do it, see also the KTextEdit class
- QSettings settings(QStringLiteral("KDE"), QStringLiteral("Sonnet"));
- return settings.value(QStringLiteral("checkerEnabledByDefault"), false).toBool();
- //KConfigGroup configGroup(KSharedConfig::openConfig(), "Spelling");
- //return configGroup.readEntry("checkerEnabledByDefault", false);
+ KConfigGroup configGroup(KSharedConfig::openConfig(), "Spelling");
+ return configGroup.readEntry("checkerEnabledByDefault", false);
}
if (m_onTheFlySpellCheckSet) {
return m_onTheFlySpellCheck;
|
|
[-]
[+]
|
Changed |
ktexteditor-5.9.0.tar.xz/src/view/kateview.h
^
|
| @@ -968,5 +968,11 @@
}
+/**
+ * metatype register
+ */
+Q_DECLARE_METATYPE(KTextEditor::Cursor)
+Q_DECLARE_METATYPE(KTextEditor::Range)
+
#endif
|
