Qt6 is stricter when casting numericals and chars. Add an explicit cast/conversion to better digest them

cast

15 files changed, 48 insertions, 48 deletions

diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index a93bb869e..a8be745e7 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -85,7 +85,7 @@ void KviIrcUserEntry::setRealName(const QString & szReal)
 			unsigned char cFore, cBack;
 			int iPos = KviControlCodes::getUnicodeColorBytes(m_szRealName, 1, &cFore, &cBack);
 			// extract smart nick color code
-			if(iPos > 1 && m_szRealName[iPos] == KviControlCodes::Reset)
+			if(iPos > 1 && m_szRealName[iPos].unicode() == KviControlCodes::Reset)
 			{
 				m_szRealName.truncate(iPos);
 				int iColor = KviNickColors::getSmartColorIntByMircColor(cFore, cBack);
diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp
index 9265bcaf1..0ac7c185c 100644
--- a/src/kvirc/kernel/KviAction.cpp
+++ b/src/kvirc/kernel/KviAction.cpp
@@ -494,7 +494,7 @@ bool KviAction::addToPopupMenu(QMenu * pMenu)
 	QString szTmp = visibleName();
 
 	if(!m_szKeySequence.isEmpty())
-		szTmp += '\t' + m_szKeySequence;
+		szTmp += "\t" + m_szKeySequence;
 
 	QAction * pAction;
 	if(pPix)
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index dbafb7e60..595b5ef5c 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -649,7 +649,7 @@ bool KviConnectAction::addToPopupMenu(QMenu * p)
 			case KviIrcContext::Idle:
 				t = m_szConnectString;
 				if(!m_szKeySequence.isEmpty())
-					t += '\t' + m_szKeySequence;
+					t += "\t" + m_szKeySequence;
 				p->addAction(t, this, SLOT(activate()));
 				break;
 			case KviIrcContext::PendingReconnection:
@@ -657,19 +657,19 @@ bool KviConnectAction::addToPopupMenu(QMenu * p)
 			case KviIrcContext::LoggingIn:
 				t = m_szAbortConnectionString;
 				if(!m_szKeySequence.isEmpty())
-					t += '\t' + m_szKeySequence;
+					t += "\t" + m_szKeySequence;
 				p->addAction(t, this, SLOT(activate()));
 				break;
 			case KviIrcContext::Connected:
 				t = m_szDisconnectString;
 				if(!m_szKeySequence.isEmpty())
-					t += '\t' + m_szKeySequence;
+					t += "\t" + m_szKeySequence;
 				p->addAction(t, this, SLOT(activate()));
 				break;
 			default:
 				t = m_szConnectString;
 				if(!m_szKeySequence.isEmpty())
-					t += '\t' + m_szKeySequence;
+					t += "\t" + m_szKeySequence;
 				pAction = p->addAction(t, this, SLOT(activate()));
 				pAction->setEnabled(false);
 				break;
@@ -679,7 +679,7 @@ bool KviConnectAction::addToPopupMenu(QMenu * p)
 	{
 		t = m_szConnectString;
 		if(!m_szKeySequence.isEmpty())
-			t += '\t' + m_szKeySequence;
+			t += "\t" + m_szKeySequence;
 		pAction = p->addAction(t, this, SLOT(activate()));
 		pAction->setEnabled(false);
 	}
@@ -1147,14 +1147,14 @@ bool KviGoAwayAction::addToPopupMenu(QMenu * p)
 			{
 				t = m_szBackString;
 				if(!m_szKeySequence.isEmpty())
-					t += '\t' + m_szKeySequence;
+					t += "\t" + m_szKeySequence;
 				p->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Away)), t, this, SLOT(activate()));
 			}
 			else
 			{
 				t = m_szAwayString;
 				if(!m_szKeySequence.isEmpty())
-					t += '\t' + m_szKeySequence;
+					t += "\t" + m_szKeySequence;
 				p->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway)), t, this, SLOT(activate()));
 			}
 		}
@@ -1162,7 +1162,7 @@ bool KviGoAwayAction::addToPopupMenu(QMenu * p)
 		{
 			t = m_szAwayString;
 			if(!m_szKeySequence.isEmpty())
-				t += '\t' + m_szKeySequence;
+				t += "\t" + m_szKeySequence;
 			pAction = p->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway)), t, this, SLOT(activate()));
 			pAction->setEnabled(false);
 		}
@@ -1171,7 +1171,7 @@ bool KviGoAwayAction::addToPopupMenu(QMenu * p)
 	{
 		t = m_szAwayString;
 		if(!m_szKeySequence.isEmpty())
-			t += '\t' + m_szKeySequence;
+			t += "\t" + m_szKeySequence;
 		pAction = p->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway)), t, this, SLOT(activate()));
 		pAction->setEnabled(false);
 	}
diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
index 3af76d648..aa39692d0 100644
--- a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
@@ -187,7 +187,7 @@ bool KviIrcConnectionServerInfo::isSupportedModeFlag(QChar c) const
 QChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) const
 {
 	if(!m_pModePrefixTable)
-		return { 0 };
+		return QChar(0);
 	for(unsigned int i = 0; i < m_uPrefixes; i++)
 	{
 		if(m_pModePrefixTable[i * 3 + 2] & flag)
@@ -199,7 +199,7 @@ QChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) const
 QChar KviIrcConnectionServerInfo::modeFlagChar(kvi_u32_t flag) const
 {
 	if(!m_pModePrefixTable)
-		return { 0 };
+		return QChar(0);
 	for(unsigned int i = 0; i < m_uPrefixes; i++)
 	{
 		if(m_pModePrefixTable[i * 3 + 2] & flag)
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 5bf3ec18a..c812b8103 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -311,7 +311,7 @@ void KviChannelWindow::getBaseLogFileName(QString & szBuffer)
 		szBuffer = szChan;
 		szBuffer.append(".");
 		if(context())
-			szBuffer.append(context()->id());
+			szBuffer.append(QString::number(context()->id()));
 		else
 			szBuffer.append("0");
 	}
@@ -1363,7 +1363,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer)
 #ifdef COMPILE_CRYPT_SUPPORT
 	if(cryptSessionInfo() && cryptSessionInfo()->m_bDoEncrypt)
 	{
-		if(szTmpBuffer[0] != KviControlCodes::CryptEscape)
+		if(szTmpBuffer[0].unicode() != KviControlCodes::CryptEscape)
 		{
 			KviCString szEncrypted;
 			cryptSessionInfo()->m_pEngine->setMaxEncryptLen(iMaxMsgLen);
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 637c982df..321ccd67e 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -387,7 +387,7 @@ void KviConsoleWindow::getBaseLogFileName(QString & buffer)
 	if(context()->connection())
 		buffer = context()->connection()->target()->network()->name();
 	else
-		buffer = context()->id();
+		buffer = QString::number(context()->id());
 }
 
 void KviConsoleWindow::showNotifyList(bool bShow, bool bIgnoreSizeChange)
@@ -824,14 +824,14 @@ void KviConsoleWindow::outputPrivmsg(KviWindow * wnd,
 				szNick.prepend(KviNickColors::getSmartColor(sum, KVI_OPTION_BOOL(KviOption_boolColorNicksWithBackground)));
 			}
 		}
-		szNick.prepend(KviControlCodes::Color);
-		szNick.append(KviControlCodes::Color);
+		szNick.prepend((char) KviControlCodes::Color);
+		szNick.append((char) KviControlCodes::Color);
 	}
 
 	if(KVI_OPTION_BOOL(KviOption_boolBoldedNicks))
 	{
-		szNick.prepend(KviControlCodes::Bold);
-		szNick.append(KviControlCodes::Bold);
+		szNick.prepend((char) KviControlCodes::Bold);
+		szNick.append((char) KviControlCodes::Bold);
 	}
 
 	QString szMessage;
@@ -1269,7 +1269,7 @@ void KviConsoleWindow::getWindowListTipText(QString & buffer)
 
 		QString szTmp;
 		QDateTime date;
-		date.setTime_t(connection()->statistics()->connectionStartTime());
+		date.setSecsSinceEpoch(connection()->statistics()->connectionStartTime());
 		switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
 		{
 			case 0:
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 752989ac4..4f05b9b5b 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -1351,7 +1351,7 @@ void KviInputEditor::iconPopupActivated(QAction * pAction)
 	QString szText = pAction->text();
 	if(!szText.isEmpty())
 	{
-		szText.prepend(KviControlCodes::Icon);
+		szText.prepend((char) KviControlCodes::Icon);
 		szText.append(' ');
 		insertText(szText);
 	}
@@ -1499,7 +1499,7 @@ void KviInputEditor::insertText(const QString & szTxt)
 			m_p->bTextBlocksDirty = true;
 
 			int iPos = 0;
-			while((iPos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[iPos] < 33))
+			while((iPos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[iPos].unicode() < 33))
 				iPos++;
 			if((iPos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[iPos] == QChar('/')))
 				m_szTextBuffer.insert(iPos, "\\");
@@ -2850,37 +2850,37 @@ void KviInputEditor::nextWordSelection()
 void KviInputEditor::insertBold()
 {
 	if(!m_bReadOnly)
-		insertChar(KviControlCodes::Bold);
+		insertChar((char) KviControlCodes::Bold);
 }
 
 void KviInputEditor::insertItalic()
 {
 	if(!m_bReadOnly)
-		insertChar(KviControlCodes::Italic);
+		insertChar((char) KviControlCodes::Italic);
 }
 
 void KviInputEditor::insertReset()
 {
 	if(!m_bReadOnly)
-		insertChar(KviControlCodes::Reset);
+		insertChar((char) KviControlCodes::Reset);
 }
 
 void KviInputEditor::insertUnderline()
 {
 	if(!m_bReadOnly)
-		insertChar(KviControlCodes::Underline);
+		insertChar((char) KviControlCodes::Underline);
 }
 
 void KviInputEditor::insertReverse()
 {
 	if(!m_bReadOnly)
-		insertChar(KviControlCodes::Reverse);
+		insertChar((char) KviControlCodes::Reverse);
 }
 
 void KviInputEditor::insertPlainText()
 {
 	if(!m_bReadOnly)
-		insertChar(KviControlCodes::CryptEscape); // DO NOT CRYPT THIS STUFF
+		insertChar((char) KviControlCodes::CryptEscape); // DO NOT CRYPT THIS STUFF
 }
 
 void KviInputEditor::insertIcon()
@@ -2888,7 +2888,7 @@ void KviInputEditor::insertIcon()
 	if(m_bReadOnly)
 		return;
 
-	insertChar(KviControlCodes::Icon); // THE NEXT WORD IS AN ICON NAME
+	insertChar((char) KviControlCodes::Icon); // THE NEXT WORD IS AN ICON NAME
 
 	popupTextIconWindow();
 }
@@ -2914,17 +2914,17 @@ void KviInputEditor::insertIconCode(const QString & szCode)
 {
 	if(m_iCursorPosition == 0)
 	{
-		insertChar(KviControlCodes::Icon);
+		insertChar((char) KviControlCodes::Icon);
 		insertText(szCode);
 		insertChar(' ');
 		return;
 	}
 
-	int idx = m_szTextBuffer.lastIndexOf(KviControlCodes::Icon, m_iCursorPosition - 1);
+	int idx = m_szTextBuffer.lastIndexOf((char) KviControlCodes::Icon, m_iCursorPosition - 1);
 	int idx2 = m_szTextBuffer.lastIndexOf(QChar(' '), m_iCursorPosition - 1);
 	if((idx == -1) || (idx2 > idx))
 	{
-		insertChar(KviControlCodes::Icon);
+		insertChar((char) KviControlCodes::Icon);
 		insertText(szCode);
 		insertChar(' ');
 		return;
@@ -2934,7 +2934,7 @@ void KviInputEditor::insertIconCode(const QString & szCode)
 
 	if(!szCode.startsWith(szPart))
 	{
-		insertChar(KviControlCodes::Icon);
+		insertChar((char) KviControlCodes::Icon);
 		insertText(szCode);
 		insertChar(' ');
 		return;
@@ -2950,7 +2950,7 @@ void KviInputEditor::insertColor()
 {
 	if(m_bReadOnly)
 		return;
-	insertChar(KviControlCodes::Color);
+	insertChar((char) KviControlCodes::Color);
 	int xPos = xPositionFromCharIndex(m_iCursorPosition);
 	if(xPos > 24)
 		xPos -= 24;
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index 57b111463..99bd1bb9c 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -2662,14 +2662,14 @@ int KviIrcView::getVisibleCharIndexAt(KviIrcViewLine *, int xPos, int yPos)
 					oldIndex = retValue; oldLeft = iLeft;
 
 					curChar = l->szText.at(l->pBlocks[i].block_start + retValue);
-					if (curChar >= 0xD800 && curChar <= 0xDC00) // Surrogate pair
+					if (curChar.unicode() >= 0xD800 && curChar.unicode() <= 0xDC00) // Surrogate pair
 					{
 						iLeft += m_pFm->horizontalAdvance(l->szText.mid(retValue), 2);
 						retValue+=2;
 					}
 					else
 					{
-						iLeft += (curChar < 0xff) ? m_iFontCharacterWidth[curChar.unicode()] : m_pFm->horizontalAdvance(curChar);
+						iLeft += (curChar.unicode() < 0xff) ? m_iFontCharacterWidth[curChar.unicode()] : m_pFm->horizontalAdvance(curChar);
 						retValue++;
 					}
 				}
diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index 73e22902d..37a6b7ea2 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -239,7 +239,7 @@ void KviQueryWindow::getBaseLogFileName(QString & szBuffer)
 		szBuffer = windowName();
 		szBuffer += ".";
 		if(context())
-			szBuffer += console()->context()->id();
+			szBuffer += QString::number(console()->context()->id());
 		else
 			szBuffer += "0";
 	}
@@ -741,7 +741,7 @@ void KviQueryWindow::ownAction(const QString & szBuffer)
 #ifdef COMPILE_CRYPT_SUPPORT
 	if(cryptSessionInfo() && cryptSessionInfo()->m_bDoEncrypt)
 	{
-		if(szTmpBuffer[0] != KviControlCodes::CryptEscape)
+		if(szTmpBuffer[0].unicode() != KviControlCodes::CryptEscape)
 		{
 			KviCString szEncrypted;
 			cryptSessionInfo()->m_pEngine->setMaxEncryptLen(iMaxMsgLen);
diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp
index b71443de8..3ce4845a3 100644
--- a/src/kvirc/ui/KviTextIconWindow.cpp
+++ b/src/kvirc/ui/KviTextIconWindow.cpp
@@ -245,7 +245,7 @@ void KviTextIconWindow::cellSelected(int row, int column)
 	QString szItem = m_pTable->cellWidget(row, column)->toolTip();
 
 	if(m_bAltMode)
-		szItem.prepend(KviControlCodes::Icon);
+		szItem.prepend((char) KviControlCodes::Icon);
 
 	if(KviInputEditor * pOwner = qobject_cast<KviInputEditor *>(m_pOwner); pOwner)
 		pOwner->insertIconCode(szItem);
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index c84a4eab6..4b7f9c288 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -124,7 +124,7 @@ QSize ChannelTreeWidgetItemDelegate::sizeHint(const QStyleOptionViewItem & sovIt
 			break;
 		case 1:
 			//users
-			return QSize(fm.horizontalAdvance(item->itemData()->m_szUsers.toInt()), iHeight);
+			return QSize(fm.horizontalAdvance(item->itemData()->m_szUsers), iHeight);
 			break;
 		case 2:
 		default:
diff --git a/src/modules/logview/ExportOperation.cpp b/src/modules/logview/ExportOperation.cpp
index 49c9f47be..1b9b453d3 100644
--- a/src/modules/logview/ExportOperation.cpp
+++ b/src/modules/logview/ExportOperation.cpp
@@ -36,8 +36,8 @@ void ExportOperation::start()
 	pFutureWatcher->setFuture(QtConcurrent::map(m_logs, [this](const std::shared_ptr<LogFile> & pLog) {
 		const QString szDate = pLog->date().toString("yyyy.MM.dd");
 		QString filename = QString("%1_%2.%3_%4").arg(pLog->typeString(), pLog->name(), pLog->network(), szDate);
-		filename.replace(QRegExp("[\\\\/:*?\"<>|]"), "_");
-		QString szLog = m_szDir + KVI_PATH_SEPARATOR_CHAR + filename;
+		filename.replace(KviRegExp("[\\\\/:*?\"<>|]"), "_");
+		QString szLog = m_szDir + QString(KVI_PATH_SEPARATOR_CHAR) + filename;
 		KviFileUtils::adjustFilePath(szLog);
 		pLog->createLog(m_type, szLog);
 	}));
diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp
index 0c15b27be..bb2235545 100644
--- a/src/modules/logview/LogFile.cpp
+++ b/src/modules/logview/LogFile.cpp
@@ -207,7 +207,7 @@ void LogFile::createLog(ExportType exportType, QString szLog, QString * pszFile)
 	/* Save export directory - this directory path is also used in the HTML export
 	 * and info is used when working with pszFile */
 	QFileInfo info(szLog);
-	szLogDir = info.absoluteDir().absolutePath() + KVI_PATH_SEPARATOR_CHAR;
+	szLogDir = info.absoluteDir().absolutePath() + QString(KVI_PATH_SEPARATOR_CHAR);
 
 	/* Reading in log file - LogFiles are read in as bytes, so '\r' isn't
 	 * sanitised by default */
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 935bdb8b0..8fa31ef04 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -837,9 +837,9 @@ void QFtpPI::readyRead()
 			}
 		}
 		QString endOfMultiLine;
-		endOfMultiLine[0] = '0' + replyCode[0];
-		endOfMultiLine[1] = '0' + replyCode[1];
-		endOfMultiLine[2] = '0' + replyCode[2];
+		endOfMultiLine[0] = QString::number(replyCode[0])[0];
+		endOfMultiLine[1] = QString::number(replyCode[1])[0];
+		endOfMultiLine[2] = QString::number(replyCode[2])[0];
 		endOfMultiLine[3] = QLatin1Char(' ');
 		QString lineCont(endOfMultiLine);
 		lineCont[3] = QLatin1Char('-');
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index f8443b7b9..27c401e88 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -281,7 +281,7 @@ KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * plainText,
 			return KviCryptEngine::EncryptError;
 		}
 	}
-	outBuffer.prepend(KviControlCodes::CryptEscape);
+	outBuffer.prepend((char) KviControlCodes::CryptEscape);
 	return KviCryptEngine::Encrypted;
 }