傻逼报错修改

src/ImageCompare/ImageCompareModel.cpp

@@ -1997,7 +1997,8 @@ void ImageCompareModel::preWeightReconstruction(Mat img, Mat &reConImg)
 	}
 
 	Mat matchImg = img.clone();
-	preProcessImage(matchImg, Mat());
+	Mat mat = Mat();
+	preProcessImage(matchImg, mat);
 
 	if (!mpMultiScaleModel)
 	{

src/tpMain/NetProtocol.cpp

@@ -22,7 +22,7 @@ NetProtocol::~NetProtocol()
 	
 }
 
-QString NetProtocol::packData(const int nCmd, QList<int>& lstData /*= QList<int>()*/, QString strModel /*= QString()*/)
+QString NetProtocol::packData(const int nCmd, QList<int> lstData, QString strModel)
 {
 	if (lstData.empty()) {
 		lstData = genList();

src/tpMain/NetProtocol.h

@@ -12,12 +12,11 @@ public:
 	~NetProtocol();
 	
 	static QString genAddressPort(const QString& addr, const QString &nPort);
-protected:
 	QString genCmd(int nCmd);
 	QString genData(int nData = 0);
 	QString genModel(QString strModel = QString());
 	QList<int> genList();
-	QString packData(const int nCmd, QList<int>& lstData = QList<int>(), QString strModel = QString());
+	QString packData(const int nCmd, QList<int> lstData = QList<int>(), QString strModel = QString());
 	QByteArray parseData(const QByteArray dataSrc, int &nCmd, QList<int>&lstData, QString &strModel);
 };
 

src/tpMain/cryptokey/lpHardwareInfo.cpp

@@ -125,34 +125,34 @@ void lpHardwareInfo::deviceQuery()
 
 
 	//CPU ID
-	CHAR* szSelect = "SELECT * FROM Win32_Processor WHERE (ProcessorId IS NOT NULL)";
+	CHAR* szSelect = charReCHAR("SELECT * FROM Win32_Processor WHERE (ProcessorId IS NOT NULL)");
-	WCHAR* szProperty = L"ProcessorId";
+	WCHAR* szProperty = charReWCHAR("ProcessorId");
 	deviceQuery(szSelect, szProperty, msCpuID);
 
 	//MotherBoard ID
-	szSelect = "SELECT * FROM Win32_BaseBoard WHERE (SerialNumber IS NOT NULL)";
+	szSelect = charReCHAR("SELECT * FROM Win32_BaseBoard WHERE(SerialNumber IS NOT NULL)");
-	szProperty = L"SerialNumber";
+	szProperty = charReWCHAR("SerialNumber");
 	deviceQuery(szSelect, szProperty, msMotherBoardID);
 
 	//BIOS ID
-	szSelect = "SELECT * FROM Win32_BIOS WHERE (SerialNumber IS NOT NULL)";
+	szSelect = charReCHAR("SELECT * FROM Win32_BIOS WHERE (SerialNumber IS NOT NULL)");
-	szProperty = L"SerialNumber";
+	szProperty = charReWCHAR("SerialNumber");
 	deviceQuery(szSelect, szProperty, msBiosID);
 
 	//MAC Address only Physical and not [virtual, vpn, usb, ...]
 	msMacAddress = "";
-	//szSelect = "SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \
+	//szSelect = charReCHAR("SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \
     //                  and NOT Name LIKE '%vpn%' and NOT Name LIKE '%virtual%'   \
     //                  and NOT Name LIKE '%usb%' and NOT Name LIKE '%Bluetooth%'";
-	szSelect = "SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \
+	szSelect = charReCHAR("SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \
-                and ( Name LIKE '%pci%' or PNPDeviceID LIKE '%pci%')";
+                and ( Name LIKE '%pci%' or PNPDeviceID LIKE '%pci%')");
-	szProperty = L"MACAddress";
+	szProperty = charReWCHAR("MACAddress");
 	deviceQuery(szSelect, szProperty, msMacAddress);
 
 	//hard disk only "Fixed hard disk media"
 	msHardDrive = "";
-	szSelect = "SELECT * FROM Win32_DiskDrive WHERE MediaType LIKE '%Fixed%'";
+	szSelect = charReCHAR("SELECT * FROM Wi(n32_DiskDrive WHERE MediaType LIKE '%Fixed%'");
-	szProperty = L"SerialNumber";
+	szProperty = charReWCHAR("SerialNumber");
 	deviceQuery(szSelect, szProperty, msHardDrive);
 
 	//Desktop or laptop
@@ -165,7 +165,7 @@ void lpHardwareInfo::deviceQuery(CHAR* szSelect, WCHAR* szProperty, std::string&
 	DEVICE_PROPERTY dpRst;
 
 	// TCHAT to std::string
-	auto tc2string = [&](TCHAR* ts) -> std::string {
+	auto tc2string = [&](TCHAR* ts) -> std::string& {
 		int iLen = WideCharToMultiByte(CP_ACP, 0, ts, -1, NULL, 0, NULL, NULL);
 
 		char* chRtn = new char[iLen * sizeof(char)];
@@ -229,14 +229,26 @@ void lpHardwareInfo::deviceQuery(CHAR* szSelect, WCHAR* szProperty, std::string&
 		strRslt.erase(strRslt.length() - 1);
 	}
 }
+CHAR * lpHardwareInfo::charReCHAR(const char myString[]) {
+	CHAR myCharString[100];
+	strcpy(myCharString, myString);
+	return myCharString;
+}
+WCHAR* lpHardwareInfo::charReWCHAR(const char myString[]) {
+	int bufferSize = MultiByteToWideChar(CP_UTF8, 0, myString, -1, nullptr, 0);
+	WCHAR* wideString = new WCHAR[bufferSize];
+	MultiByteToWideChar(CP_UTF8, 0, myString, -1, wideString, bufferSize);
+	return wideString;
+
+}
 
 void lpHardwareInfo::queryIsDesktop()
 {
 	HRESULT hres;
 	DEVICE_PROPERTY dpRst;
 
-	CHAR* szSelect = "SELECT * FROM Win32_SystemEnclosure";
+	CHAR* szSelect = charReCHAR("SELECT * FROM Win32_SystemEnclosure");
-	WCHAR* szProperty = L"ChassisTypes";
+	WCHAR* szProperty = charReWCHAR("ChassisTypes");
 
 	IEnumWbemClassObject *pEnumerator = NULL;
 	hres = mpSvc->ExecQuery(bstr_t("WQL"), bstr_t(szSelect),

src/tpMain/cryptokey/lpHardwareInfo.h

@@ -58,6 +58,8 @@ private:
 
 	IWbemLocator *mpLoc;
 	IWbemServices *mpSvc;
+	CHAR* charReCHAR(const char myString[]);
+	WCHAR* charReWCHAR(const char myString[]);
 
 	bool mbCoInited;
 

src/tpMain/qaddmodel.cpp

@@ -1,6 +1,8 @@
 #include "qaddmodel.h"
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QLineEdit>
+#include <QRegExpValidator>
 #include <QPixmap>
 #include "InfoFile.h"
 #pragma execution_character_set("utf-8")

src/tpMain/qipconfigdlg.cpp

@@ -1,6 +1,7 @@
 #include "qipconfigdlg.h"
 #include "InfoFile.h"
-
+#include <QLineEdit>
+#include <QRegExpValidator>
 QIPConfigDlg::QIPConfigDlg(QWidget *parent)
 	: QDialog(parent)
 {

tpvs17/tpMain/QModelMgrDlg.cpp

@@ -461,7 +461,8 @@ Q_SLOT void QModelMgrDlg::onChangeModelName()
 	QString strPath = m_pCtrl->appRoot() + pModel->getPicPath();
 	dlg.setPixmap(strPath);
 	dlg.setOldModelName(strModel);
-	dlg.SetModelsStr(m_pModelMgr->getAllModelName());
+	auto modelStr = m_pModelMgr->getAllModelName();
+	dlg.SetModelsStr(modelStr);
 	if (QDialog::Accepted == dlg.exec())
 	{
 		m_newName = dlg.getNewModelName();