summaryrefslogtreecommitdiff
path: root/src/terminal
diff options
context:
space:
mode:
Diffstat (limited to 'src/terminal')
-rw-r--r--src/terminal/fqterm_buffer.cpp6
-rw-r--r--src/terminal/fqterm_buffer.h6
-rw-r--r--src/terminal/fqterm_session.cpp4
-rw-r--r--src/terminal/fqterm_session.h4
-rw-r--r--src/terminal/fqterm_text_line.h2
-rw-r--r--src/terminal/internal/fqterm_telnet.cpp4
-rw-r--r--src/terminal/internal/fqterm_telnet.h2
-rw-r--r--src/terminal/internal/fqterm_zmodem.cpp8
-rw-r--r--src/terminal/internal/fqterm_zmodem.h2
9 files changed, 19 insertions, 19 deletions
diff --git a/src/terminal/fqterm_buffer.cpp b/src/terminal/fqterm_buffer.cpp
index 8d7deeb..1a79f61 100644
--- a/src/terminal/fqterm_buffer.cpp
+++ b/src/terminal/fqterm_buffer.cpp
@@ -447,11 +447,11 @@ void FQTermBuffer::moveCaretOffset(int column_offset, int row_offset, bool scrol
scroll_if_necessary);
}
-void FQTermBuffer::changeCaretPosition(int coloumn, int row) {
+void FQTermBuffer::changeCaretPosition(int column, int row) {
if (is_origin_mode_) {
- moveCaretTo(coloumn, row + top_row_);
+ moveCaretTo(column, row + top_row_);
} else {
- moveCaretTo(coloumn, row);
+ moveCaretTo(column, row);
}
}
diff --git a/src/terminal/fqterm_buffer.h b/src/terminal/fqterm_buffer.h
index d22e2a3..6cd9e1a 100644
--- a/src/terminal/fqterm_buffer.h
+++ b/src/terminal/fqterm_buffer.h
@@ -166,8 +166,8 @@ class FQTermBuffer: public QObject {
// be marked as changed.
void moveCaretOffset(int coloumn_offset, int row_offset,
bool scroll_if_necessary = false);
- void moveCaretTo(int coloumn, int row, bool scroll_if_necessary = false);
- void changeCaretPosition(int coloumn, int row);
+ void moveCaretTo(int column, int row, bool scroll_if_necessary = false);
+ void changeCaretPosition(int column, int row);
void saveCaret();
void restoreCaret();
@@ -280,7 +280,7 @@ class FQTermBuffer: public QObject {
bool is_origin_mode_; // Is origin or absolute mode.
bool is_autowrap_mode_; // Is auto-wrap mode enabled.
bool is_autorepeat_mode_; // Is auto-repeat mode enabled.
- bool is_lightbg_mode_; // Is ligth background or dark backgrond mode.
+ bool is_lightbg_mode_; // Is light background or dark backgrond mode.
// Selection in buffer. If section start and end are in the same
// line, start.x should be equal to or less than end.x. Otherwise
diff --git a/src/terminal/fqterm_session.cpp b/src/terminal/fqterm_session.cpp
index 9e8fab8..ff1bd26 100644
--- a/src/terminal/fqterm_session.cpp
+++ b/src/terminal/fqterm_session.cpp
@@ -958,7 +958,7 @@ void FQTermSession::doAutoLogin() {
telnet_->write(&ch, 1);
}
- // smth ignore continous input, so sleep 1 sec :)
+ // smth ignore continuous input, so sleep 1 sec :)
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
Sleep(1000);
#else
@@ -1045,7 +1045,7 @@ void FQTermSession::readReady(int size, int raw_size) {
//QToolTip::remove(this, screen_->mapToRect(m_rcUrl));
// message received
- // 03/19/2003. the caret posion removed as a message judgement
+ // 03/19/2003. the caret position removed as a message judgement
// because smth.org changed
if (decoder_->bellReceive()) {
emit startAlert();
diff --git a/src/terminal/fqterm_session.h b/src/terminal/fqterm_session.h
index e28a590..17e35d0 100644
--- a/src/terminal/fqterm_session.h
+++ b/src/terminal/fqterm_session.h
@@ -133,7 +133,7 @@ class FQTermSession: public QObject {
static const QString protocolPrefix[];
PageState getPageState();
- // Set current cursor postion to pt,
+ // Set current cursor position to pt,
// return whether the selection rectangle is changed.
// the output parameter rc be a rectangle including both
// the new and the old selection region.
@@ -163,7 +163,7 @@ class FQTermSession: public QObject {
// Set current screen start line to help detect cursor type
- // and select rectangle corresponding to current cursor postion.
+ // and select rectangle corresponding to current cursor position.
void setScreenStart(int);
diff --git a/src/terminal/fqterm_text_line.h b/src/terminal/fqterm_text_line.h
index 72ff4c0..cb47d4d 100644
--- a/src/terminal/fqterm_text_line.h
+++ b/src/terminal/fqterm_text_line.h
@@ -112,7 +112,7 @@ class FQTermTextLine {
void deleteText(unsigned cell_begin, unsigned cell_end);
void deleteAllText();
- // If cell_begin is a begining of a readable character, return
+ // If cell_begin is a beginning of a readable character, return
// cell_begin itself, otherwise return the previous cell which starts a
// readable character.
unsigned getCellBegin(unsigned cell_begin) const;
diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp
index 4555f83..ea2740b 100644
--- a/src/terminal/internal/fqterm_telnet.cpp
+++ b/src/terminal/internal/fqterm_telnet.cpp
@@ -591,7 +591,7 @@ int FQTermTelnet::write(const char *data, uint len) {
// process keyboard input
// because we use GUI, there is no need to support a "command mode"
- // So the keyboard-input FSM isnt' necessary.
+ // So the keyboard-input FSM isn't necessary.
uint i;
@@ -1015,7 +1015,7 @@ int FQTermTelnet::ttputc(int c) {
if (synching)
return 0;
*/
- /* TODO: FQTermTelnet doesnot interpret NVT code, provide datas to upper
+ /* TODO: FQTermTelnet does not interpret NVT code, provide datas 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 1e086e0..90595cc 100644
--- a/src/terminal/internal/fqterm_telnet.h
+++ b/src/terminal/internal/fqterm_telnet.h
@@ -36,7 +36,7 @@ namespace FQTerm {
#define NSSTATES 3 // # of Telnet Option Subnegotiation FSM States
#define NCHRS 256 // # of valid characters
-// decleration
+// declaration
class FQTermTelnet;
// actionFunc is a pointer, point to a FQTermTelnet's func
typedef int(FQTermTelnet:: *ptrActionFunc)(int c);
diff --git a/src/terminal/internal/fqterm_zmodem.cpp b/src/terminal/internal/fqterm_zmodem.cpp
index 11abaae..93f698d 100644
--- a/src/terminal/internal/fqterm_zmodem.cpp
+++ b/src/terminal/internal/fqterm_zmodem.cpp
@@ -767,7 +767,7 @@ int FQTermZmodem::ZmodemAbort(ZModem *info) {
ZOFlush(info);
transferstate = transferstop; // transfer complete
- ZmodemReset(info); //Tranfer complete, zmodem return to receive state
+ ZmodemReset(info); //Transfer complete, zmodem return to receive state
zmodemlog("ZmodemAbort[%s]: send CAN\n", sname(info));
return ZXmitStr(canistr, sizeof(canistr), info);
@@ -2822,7 +2822,7 @@ int FQTermZmodem::GotRinit(ZModem *info) {
itFile = strFileList.begin();
QFileInfo fi(*itFile);
- FQ_TRACE("zmodem", 0) << "Number of files to be transfered: "
+ FQ_TRACE("zmodem", 0) << "Number of files to be transferred: "
<< strFileList.count();
char *filename = strdup(fi.absoluteFilePath().toLatin1());
char *rfilename = strdup(fi.fileName().toLatin1());
@@ -2947,7 +2947,7 @@ int FQTermZmodem::SkipFile(ZModem *info) {
ZStatus(FileEnd, 0, info->rfilename);
fclose(info->file);
- // stupid SMTH doesnt send further command, kick
+ // stupid SMTH doesn't send further command, kick
// lets send files in the list
info->state = TStart;
return GotRinit(info);
@@ -2977,7 +2977,7 @@ int FQTermZmodem::OverAndOut(ZModem *info) {
transferstate = transferstop; // transfer complete
- ZmodemReset(info); //Tranfer complete, zmodem return to receive state
+ ZmodemReset(info); //Transfer complete, zmodem return to receive state
return ZmDone;
}
diff --git a/src/terminal/internal/fqterm_zmodem.h b/src/terminal/internal/fqterm_zmodem.h
index bd1f4f4..cee1e58 100644
--- a/src/terminal/internal/fqterm_zmodem.h
+++ b/src/terminal/internal/fqterm_zmodem.h
@@ -136,7 +136,7 @@ typedef enum zmstate {
typedef struct {
int ifd; /* input fd, for use by caller's routines */
int ofd; /* output fd, for use by caller's routines */
- FILE *file; /* file being transfered */
+ FILE *file; /* file being transferred */
int zrinitflags; /* receiver capabilities, see below */
int zsinitflags; /* sender capabilities, see below */
char *attn; /* attention string, see below */