summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnthony Fok <foka@debian.org>2018-06-14 13:37:20 -0600
committerIru Cai (vimacs) <mytbk920423@gmail.com>2018-06-15 00:43:25 +0000
commit3ee241328fdb9210a10fa6f1eca2664a5c30fdf5 (patch)
treec9af6973b1bcf84948368a8fb3ee0c01cd6923c2 /src
parent7c1e8b2bde592430934a96d3f6e2815956fc26f1 (diff)
downloadfqterm-3ee241328fdb9210a10fa6f1eca2664a5c30fdf5.tar.xz
Fix some minor typos
Credit: "Unknow" was detected by Lintian, see https://bugs.debian.org/898537
Diffstat (limited to 'src')
-rw-r--r--src/fqterm/fqterm_python.cpp10
-rw-r--r--src/terminal/internal/fqterm_decode.cpp10
-rw-r--r--src/terminal/internal/fqterm_telnet.cpp6
-rw-r--r--src/terminal/internal/fqterm_telnet.h6
-rw-r--r--src/ui/statusBar.cpp2
5 files changed, 17 insertions, 17 deletions
diff --git a/src/fqterm/fqterm_python.cpp b/src/fqterm/fqterm_python.cpp
index b4d710e..fcb071f 100644
--- a/src/fqterm/fqterm_python.cpp
+++ b/src/fqterm/fqterm_python.cpp
@@ -125,8 +125,8 @@ QString getErrOutputFile(FQTermWindow *lp) {
return getPath(USER_CONFIG) + str2;
}
-// copy current artcle for back compatible use only
-// for new coder please use getArticle
+// copy current article, for backward-compatible use only.
+// for new code, please use getArticle
static PyObject *fqterm_copyArticle(PyObject *, PyObject *args) {
long lp;
if (!PyArg_ParseTuple(args, "l", &lp)) {
@@ -140,7 +140,7 @@ static PyObject *fqterm_copyArticle(PyObject *, PyObject *args) {
QReadWriteLock& bufferLock = termWindow_->getSession()->getBufferLock();
QReadLocker locker(&bufferLock);
while (1) {
- // check it there is duplicated string
+ // check if there is duplicated string
// it starts from the end in the range of one screen height
// so this is a non-greedy match
QString strTemp;
@@ -156,7 +156,7 @@ static PyObject *fqterm_copyArticle(PyObject *, PyObject *args) {
}
QStringList::Iterator it2 = it;
bool dup = true;
- // match more to see if its duplicated
+ // match more to see if it's duplicated
for (int j = 0; j <= i; j++, it2++) {
QString str1;
termWindow_->getSession()->getBuffer()->getTextLineInTerm(j)->getAllPlainText(str1);
@@ -237,7 +237,7 @@ static PyObject *fqterm_getArticle(PyObject *, PyObject *args) {
}
QStringList::Iterator it2 = it;
bool dup = true;
- // match more to see if its duplicated
+ // match more to see if it's duplicated
for (int j = 0; j <= i && it2 != strList.end(); j++, it2++) {
QString str1;
termWindow_->getSession()->getBuffer()->getTextLineInTerm(j)->getAllPlainText(str1);
diff --git a/src/terminal/internal/fqterm_decode.cpp b/src/terminal/internal/fqterm_decode.cpp
index 49aa364..e88be45 100644
--- a/src/terminal/internal/fqterm_decode.cpp
+++ b/src/terminal/internal/fqterm_decode.cpp
@@ -324,7 +324,7 @@ const char *FQTermDecode::getStateName(const StateOption *state) {
} else if (state == VT100StateMachine::title_state_) {
return "VT100StateMachine::title_state_";
} else {
- return "Unknow";
+ return "Unknown";
}
}
@@ -436,7 +436,7 @@ static int utf8_expected_byte_count(char first_byte)
{
char expected = 0;
if (!(first_byte & 0x80))
- return 0; //1 byte ascii
+ return 0; //1 byte ASCII
else
expected++;
if (!(first_byte & 0x40))
@@ -463,7 +463,7 @@ static int gdbnbig5_expected_byte_count(char first_byte)
{
char expected = 0;
if (!(first_byte & 0x80))
- return 0; //1 byte ascii
+ return 0; //1 byte ASCII
else
expected++;
return expected;
@@ -582,12 +582,12 @@ int FQTermDecode::processInput(QByteArray& result)
// fill letters into char buffer
// TODO: this function may contain bug, need double-check.
-// 1. input should be ascii-compitable encoding.
+// 1. input should be ASCII-compatible encoding.
void FQTermDecode::normalInput() {
FQ_FUNC_TRACE("ansi", 8);
- // TODO_UTF16: check ascii-incompitable encoding.
+ // TODO_UTF16: check ASCII-incompatible encoding.
if (signed(inputData_[dataIndex_]) < 0x20 && signed(inputData_[dataIndex_]) >= 0x00) {
// not print char
return ;
diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp
index 7d710a9..179082c 100644
--- a/src/terminal/internal/fqterm_telnet.cpp
+++ b/src/terminal/internal/fqterm_telnet.cpp
@@ -1012,13 +1012,13 @@ int FQTermTelnet::ttputc(int c) {
xputc_up((char)c); /* print uninterpretted */
return 0;
}
- /* no data, if in SYNCH */
+ /* no data, if in SYNCH */
/*
if (synching)
return 0;
*/
- /* TODO: FQTermTelnet does not interpret NVT code, provide datas to upper
- layer directly. So, <cr><lf> will not be replaced with <lf>
+ /* TODO: FQTermTelnet does not interpret NVT code, provide data to upper
+ layer directly. So, <cr><lf> will not be replaced with <lf>
*/
xputc_up((char)c);
diff --git a/src/terminal/internal/fqterm_telnet.h b/src/terminal/internal/fqterm_telnet.h
index 0a0ba01..5f6447c 100644
--- a/src/terminal/internal/fqterm_telnet.h
+++ b/src/terminal/internal/fqterm_telnet.h
@@ -58,7 +58,7 @@ struct fsm_trans {
// Telnet connection, a wrapper of socket.
// It will translate raw NVT data from low level socket to ansi data,
// and then upper level application can read it.
-// It also can send ascii data (0~127).
+// It also can send ASCII data (0~127).
class FQTermTelnet: public QObject {
Q_OBJECT;
public:
@@ -72,7 +72,7 @@ class FQTermTelnet: public QObject {
const QString &strProxyPwd);
void connectHost(const QString &hostname, quint16 portnumber);
- // Read ansi data.
+ // Read ANSI data.
int read(char *data, uint maxlen);
// Write data raw data
@@ -88,7 +88,7 @@ class FQTermTelnet: public QObject {
conn_info_t *connectionInfo() { return socket->connectionInfo(); }
signals:
- void readyRead(int, int); // There are datas to be read out
+ void readyRead(int, int); // There are data to be read out
void TelnetState(int); // The state telnet, defined as TSXXXX in fqterm.h
void requestUserPwd(QString *user, QString *pwd, bool *isOK);
void warnInsecure(const QString&, bool *isOK);
diff --git a/src/ui/statusBar.cpp b/src/ui/statusBar.cpp
index 155f01d..b15084a 100644
--- a/src/ui/statusBar.cpp
+++ b/src/ui/statusBar.cpp
@@ -360,7 +360,7 @@ ProgressBar &StatusBar::newProgressOperation(QObject *owner) {
QObject *owner = (QObject*)sender(); //HACK deconsting it
KIO::Job *job = dynamic_cast<KIO::Job*>( owner );
- //FIXME doesn't seem to work for KIO::DeleteJob, it has it's own error handler and returns no error too
+ //FIXME doesn't seem to work for KIO::DeleteJob, it has its own error handler and returns no error too
// if you try to delete http urls for instance <- KDE SUCKS!
if( job && job->error() )