From 1d4f92c30afa3a8598f3a27881650354d65c6da1 Mon Sep 17 00:00:00 2001
From: durongze <durongze@qq.com>
Date: Sat, 11 Nov 2023 02:59:55 +0800
Subject: [PATCH] compile ok

---
 src/CmpareMode.cpp         | 1 +
 src/batchfindreplace.cpp   | 1 +
 src/cceditor/ccnotepad.cpp | 2 +-
 src/cceditor/ccnotepad.h   | 2 +-
 src/draglineedit.cpp       | 2 ++
 src/encodeconvert.cpp      | 1 +
 src/findwin.cpp            | 4 ++--
 src/langextset.cpp         | 1 +
 src/scintillaeditview.cpp  | 3 ++-
 9 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/CmpareMode.cpp b/src/CmpareMode.cpp
index 270d62a..861cb45 100755
--- a/src/CmpareMode.cpp
+++ b/src/CmpareMode.cpp
@@ -10,6 +10,7 @@
 #include <functional>
 #include <QDataStream>
 #include <QtConcurrent>
+#include <QRegExp>
 
 
 CmpareMode::CmpareMode()
diff --git a/src/batchfindreplace.cpp b/src/batchfindreplace.cpp
index e305b9f..2d037f3 100755
--- a/src/batchfindreplace.cpp
+++ b/src/batchfindreplace.cpp
@@ -7,6 +7,7 @@
 
 #include <QTableWidgetItem>
 #include <QFileDialog>
+#include <QRegExp>
 
 BatchFindReplace::BatchFindReplace(QWidget *parent)
 	: QMainWindow(parent), m_curEditWin(nullptr), m_editTabWidget(nullptr)
diff --git a/src/cceditor/ccnotepad.cpp b/src/cceditor/ccnotepad.cpp
index 3e137dc..8a1b12b 100755
--- a/src/cceditor/ccnotepad.cpp
+++ b/src/cceditor/ccnotepad.cpp
@@ -8294,7 +8294,7 @@ bool CCNotePad::nativeOpenfile(QString openFilePath)
 	this->activateWindow();
 	return true;
 }
-bool CCNotePad::nativeEvent(const QByteArray & eventType, void * message, long * result)
+bool CCNotePad::nativeEvent(const QByteArray & eventType, void * message, qintptr* result)
 {
 	MSG *param = static_cast<MSG *>(message);
 
diff --git a/src/cceditor/ccnotepad.h b/src/cceditor/ccnotepad.h
index f6364d5..36d8b7d 100755
--- a/src/cceditor/ccnotepad.h
+++ b/src/cceditor/ccnotepad.h
@@ -206,7 +206,7 @@ protected:
 	void dragLeaveEvent(QDragLeaveEvent* event);
 	bool eventFilter(QObject *watched, QEvent *event)override;
 #ifdef Q_OS_WIN
-	bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+	virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
 	bool nativeOpenfile(QString openFilePath);
 #endif
 #ifdef uos
diff --git a/src/draglineedit.cpp b/src/draglineedit.cpp
index a5e35ba..8791f0c 100755
--- a/src/draglineedit.cpp
+++ b/src/draglineedit.cpp
@@ -1,5 +1,7 @@
 #include "draglineedit.h"
 
+#include <QFile>
+
 DragLineEdit::DragLineEdit(QWidget *parent)
 	: QLineEdit(parent)
 {
diff --git a/src/encodeconvert.cpp b/src/encodeconvert.cpp
index 7cdb18a..2c14ebd 100755
--- a/src/encodeconvert.cpp
+++ b/src/encodeconvert.cpp
@@ -11,6 +11,7 @@
 #include <QtConcurrent>
 #include <QInputDialog>
 #include <QDragEnterEvent>
+#include <QTextCodec>
 
 
 const int ITEM_CODE = Qt::UserRole + 1;
diff --git a/src/findwin.cpp b/src/findwin.cpp
index ed01d60..16b489a 100755
--- a/src/findwin.cpp
+++ b/src/findwin.cpp
@@ -787,8 +787,8 @@ bool readBase(const QChar * str, int * value, int base, int size)
 		current = str[i];
 		if (current >= 'A')
 		{
-			current = current.digitValue() & 0xdf;
-			current = current.digitValue() - ('A' - '0' - 10);
+			current = (QChar)(current.digitValue() & 0xdf);
+			current = (QChar)(current.digitValue() - ('A' - '0' - 10));
 		}
 		else if (current > '9')
 			return false;
diff --git a/src/langextset.cpp b/src/langextset.cpp
index a1db834..b2139d8 100755
--- a/src/langextset.cpp
+++ b/src/langextset.cpp
@@ -7,6 +7,7 @@
 #include <QHeaderView>
 #include <QSettings>
 #include <QMessageBox>
+#include <QFile>
 
 int ITEM_CHANGED = Qt::UserRole; 
 int ITEM_LEX_ID = Qt::UserRole + 1; //对应的语法lexer的 ID
diff --git a/src/scintillaeditview.cpp b/src/scintillaeditview.cpp
index 1ad4494..e7194c5 100755
--- a/src/scintillaeditview.cpp
+++ b/src/scintillaeditview.cpp
@@ -67,6 +67,7 @@
 #include <QDesktopServices>
 #include <QDebug>
 #include <QMessageBox>
+#include <QRegExp>
 
 
 #include <stdexcept>
@@ -3424,7 +3425,7 @@ bool isUrlQueryDelimiter(QChar const c)
 void scanToUrlEnd(QString & text, int textLen, int start, int* distance)
 {
 	int p = start;
-	QChar q = 0;
+	QChar q = (QChar)0;
 	enum { sHostAndPath, sQuery, sQueryAfterDelimiter, sQueryQuotes, sQueryAfterQuotes, sFragment } s = sHostAndPath;
 	while (p < textLen)
 	{
-- 
Gitee