From 984fbc139d1cc5991084b62a8400ceb77a6a1bd3 Mon Sep 17 00:00:00 2001 From: un1versal Date: Sun, 15 May 2016 22:52:42 +0100 Subject: various: minor fixes --- src/kvilib/ext/KviCryptEngine.cpp | 2 +- src/kvilib/irc/KviControlCodes.cpp | 12 ++++++------ src/kvirc/kernel/KviApplication.cpp | 2 +- src/kvirc/kernel/KviHtmlGenerator.cpp | 2 +- src/kvirc/ui/KviCryptController.cpp | 2 +- src/kvirc/ui/KviInputEditor.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp index d99f408aa..98cdb517f 100644 --- a/src/kvilib/ext/KviCryptEngine.cpp +++ b/src/kvilib/ext/KviCryptEngine.cpp @@ -95,7 +95,7 @@ of the window. Once an engine has been enabled all the text that you type in the input line (that is not a command obviously) is encrypted and sent to the remote endpoint. If you want to send a non-encrypted message - while an engine is working, you can use the CTRL+P escape: by placing + while an engine is working, you can use the Ctrl+P escape: by placing that character as the FIRST CHARACTER of the line you will avoid encrypting. Every engine has different capabilities: some can both encrypt and decrypt, other perform only half of the operations. Some engines diff --git a/src/kvilib/irc/KviControlCodes.cpp b/src/kvilib/irc/KviControlCodes.cpp index a08530891..c464a3dc3 100644 --- a/src/kvilib/irc/KviControlCodes.cpp +++ b/src/kvilib/irc/KviControlCodes.cpp @@ -132,7 +132,7 @@ namespace KviControlCodes } else { - //Senseless character : only a CTRL+K code + //Senseless character : only a Ctrl+K code (*pcByte1) = KviControlCodes::NoChange; (*pcByte2) = KviControlCodes::NoChange; return pwData; @@ -161,7 +161,7 @@ namespace KviControlCodes unsigned int getUnicodeColorBytes(const QString & szData, unsigned int iChar, unsigned char * pcByte1, unsigned char * pcByte2) { // - // Scans the szData for a mIrc color code XX,XX + // Scans the szData for a mIRC color code XX,XX // and fills the color values in the two bytes // @@ -177,13 +177,13 @@ namespace KviControlCodes //First we can have a digit or a comma if(((c < '0') || (c > '9'))) { - // senseless : only a CTRL+K code + //Senseless : only a Ctrl+K code (*pcByte1) = KviControlCodes::NoChange; (*pcByte2) = KviControlCodes::NoChange; return iChar; } - //Something interesting ok. + //Something interesting OK. (*pcByte1) = c - '0'; //store the code iChar++; if(iChar >= (unsigned int)szData.length()) @@ -257,7 +257,7 @@ namespace KviControlCodes const char * getColorBytes(const char * pcData, unsigned char * pcByte1, unsigned char * pcByte2) { // - // Scans the pcData for a mIrc color code XX,XX + // Scans the pcData for a mIRC color code XX,XX // and fills the color values in the two bytes // @@ -294,7 +294,7 @@ namespace KviControlCodes return pcData; } } else { - //Senseless character : only a CTRL+K code + //Senseless character : only a Ctrl+K code (*pcByte1)=KviControlCodes::NoChange; (*pcByte2)=KviControlCodes::NoChange; return pcData; diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index 7e767a7a5..f5aed37e4 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -634,7 +634,7 @@ bool KviApplication::supportsCompositing() #ifdef COMPILE_QX11INFO_SUPPORT // Qt5 does not support QX11Info::isCompositingManagerRunning() - // Well...assume we're compositing capable, should be true on all recent linux distros + // Well...assume we're compositing capable, should be true on all recent Linux distros return true; #endif // COMPILE_QX11INFO_SUPPORT #ifdef COMPILE_ON_MAC diff --git a/src/kvirc/kernel/KviHtmlGenerator.cpp b/src/kvirc/kernel/KviHtmlGenerator.cpp index f82ae217d..a5552287a 100644 --- a/src/kvirc/kernel/KviHtmlGenerator.cpp +++ b/src/kvirc/kernel/KviHtmlGenerator.cpp @@ -192,7 +192,7 @@ namespace KviHtmlGenerator } else { - // only a CTRL+K + // only a Ctrl+K uCurBack = Background; uCurFore = Foreground; } diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp index 94bba7dfe..818f5c5e2 100644 --- a/src/kvirc/ui/KviCryptController.cpp +++ b/src/kvirc/ui/KviCryptController.cpp @@ -196,7 +196,7 @@ void KviCryptController::engineHighlighted(QListWidgetItem * pItem, QListWidgetI QString szDesc = "

"; szDesc += pEngine->m_szDescription.toUtf8().data(); szDesc += "

"; - szDesc += __tr2qs("If you don't want to encrypt a particular text line then just start it with the CTRL+P prefix"); + szDesc += __tr2qs("If you don't want to encrypt a particular text line then just start it with the Ctrl+P prefix"); m_pDescriptionText->setText(szDesc); m_pEnableEncrypt->setEnabled(pEngine->m_iFlags & KviCryptEngine::CanEncrypt); m_pEncryptKeyLabel->setEnabled((pEngine->m_iFlags & KviCryptEngine::CanEncrypt) && (pEngine->m_iFlags & KviCryptEngine::WantEncryptKey)); diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index ae3bca990..b0061a78b 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -633,7 +633,7 @@ void KviInputEditor::rebuildTextBlocks() } else { - // ONLY a CTRL+K + // ONLY a Ctrl+K uCurBack = KVI_INPUT_DEF_BACK; uCurFore = KVI_INPUT_DEF_FORE; } -- cgit v1.3.1-10-gc9f91