aboutsummaryrefslogtreecommitdiffstats
path: root/src/kvilib
diff options
context:
space:
mode:
authorGravatar staticfox2016-04-23 20:30:59 -0400
committerGravatar staticfox2016-04-23 20:30:59 -0400
commitabebcbc903cd5bcd567f94e602b1dbc3ae226fae (patch)
tree2fc27017ee5030a4f008e022162dbebf90c23b8f /src/kvilib
parentFix extraction of sources-date from git (diff)
downloadKVIrc-abebcbc903cd5bcd567f94e602b1dbc3ae226fae.tar.gz
KVIrc-abebcbc903cd5bcd567f94e602b1dbc3ae226fae.tar.bz2
KVIrc-abebcbc903cd5bcd567f94e602b1dbc3ae226fae.zip
general: Typo fixes
Diffstat (limited to 'src/kvilib')
-rw-r--r--src/kvilib/ext/KviRegisteredUserDataBase.cpp4
-rw-r--r--src/kvilib/ext/KviRegisteredUserDataBase.h2
-rw-r--r--src/kvilib/ext/KviSharedFilesManager.cpp2
-rw-r--r--src/kvilib/irc/KviAvatarCache.h2
-rw-r--r--src/kvilib/irc/KviIrcMask.cpp4
-rw-r--r--src/kvilib/irc/KviIrcUserEntry.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index 289694073..993b8c4b9 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -94,7 +94,7 @@
On the other hand, if you dislike the users with the nickname Eddie that come from .org
and you're implementing an auto-kick system, the correct mask to register is [i]Eddie!*@*.org[/i].
[br][br]
- KVIrc tries to be smart, and always find the most correct match for an user:
+ KVIrc tries to be smart, and always find the most correct match for a user:
If you have two masks registered: [b]Pragma!*xor@*.myisp.it[/b] and [b]*!*@*.myisp.it[/b],
KVIrc will match [b]Pragma!~xor@233-dyn.myisp.it[/b] with the first one even if the second
one also matches; the first one however, is a best match.
@@ -106,7 +106,7 @@
KVIrc recognizes some of these properties and associates semantic actions to it; other properties
are left for scripting extension. Property names are case insensitive.[br]
One of the recognized properties is the [i][doc:notify_list]notify[/doc][/i] property.[br][br]
- When an user is found to have this property set to a special value
+ When a user is found to have this property set to a special value
KVIrc will attempt to track the user presence on IRC.
Another one is the [doc:avatar]avatar[/doc] property. Its value should be the
name of the [i]default[/i] [doc:avatar]avatar image file[/doc] for the specified user.[br]
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.h b/src/kvilib/ext/KviRegisteredUserDataBase.h
index 75354764f..8fc884e68 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.h
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.h
@@ -70,7 +70,7 @@ public:
bool removeGroup(const QString &name);
KviRegisteredUser * findUserByName(const QString &name){ return m_pUserDict->find(name); };
// mask must be allocated on the heap and the ownership is transferred!
- // returns non zero if there is already an user with this mask (returns the pointer to it!)
+ // returns non zero if there is already a user with this mask (returns the pointer to it!)
KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * mask);
bool removeMaskByPointer(KviIrcMask * mask);
bool removeMask(const KviIrcMask &mask);
diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp
index cd910f2d7..cd4eda9cf 100644
--- a/src/kvilib/ext/KviSharedFilesManager.cpp
+++ b/src/kvilib/ext/KviSharedFilesManager.cpp
@@ -67,7 +67,7 @@
[big]Security issues[/big]
This is a nice but unsecure method of sharing files.[br]
The user mask is a good protection but you have to use it properly![br]
- Setting the user mask to Nick!*@* can be easily exploited (just by making an user disconnect
+ Setting the user mask to Nick!*@* can be easily exploited (just by making a user disconnect
in one of the well known ways and then by using his nickname).[br]
On the other side, the remote end must know exactly the visible name of the offer to request
and no one but you will tell him that name.[br]
diff --git a/src/kvilib/irc/KviAvatarCache.h b/src/kvilib/irc/KviAvatarCache.h
index bf641b5de..886d58292 100644
--- a/src/kvilib/irc/KviAvatarCache.h
+++ b/src/kvilib/irc/KviAvatarCache.h
@@ -105,7 +105,7 @@ public:
void remove(const KviIrcMask & mask, const QString & szNetwork);
/**
- * \brief Search an user in the cache and returns the id of the avatar
+ * \brief Search a user in the cache and returns the id of the avatar
* \param mask The mask of the user
* \param szNetwork The network where the user is on
* \return const QString &
diff --git a/src/kvilib/irc/KviIrcMask.cpp b/src/kvilib/irc/KviIrcMask.cpp
index abf95b40a..b7406b2d8 100644
--- a/src/kvilib/irc/KviIrcMask.cpp
+++ b/src/kvilib/irc/KviIrcMask.cpp
@@ -39,7 +39,7 @@
irc masks, nickname, username, hostname, wildcard
@body:
[big]Simple masks[/big][br]
- An IRC mask is a string in a special format that identifies an user on IRC.[br]
+ An IRC mask is a string in a special format that identifies a user on IRC.[br]
The standard basic format is:[br]
[b]<nick>!<username>@<host>[/b][br]
The <nick> part contains the nickname with that the user is widely known across the network.[br]
@@ -79,7 +79,7 @@
[br]
[big]Wildcard masks[/big][br]
In some contexts the irc-masks can contain [b]*[/b] and [b]?[/b] wildcards.[br]
- The wild masks are used to [i]match[/i] an user within a set of them.[br]
+ The wild masks are used to [i]match[/i] a user within a set of them.[br]
[b]*[/b] matches any sequence (eventually empty) of characters and [b]?[/b] matches a single character.[br]
Wildcards are allowed only in the <nick>, <user> and <host> part: so the
[i]wildest[/i] mask possible is:[br]
diff --git a/src/kvilib/irc/KviIrcUserEntry.h b/src/kvilib/irc/KviIrcUserEntry.h
index 890ec56f7..2437d5c6c 100644
--- a/src/kvilib/irc/KviIrcUserEntry.h
+++ b/src/kvilib/irc/KviIrcUserEntry.h
@@ -61,7 +61,7 @@ public:
* \brief Defines the user mode in a channel
*/
enum UserMode {
- UserOp = 1, /**< the user is an userop of the channel */
+ UserOp = 1, /**< the user is a userop of the channel */
Voice = 2, /**< the user is a voice of the channel */
HalfOp = 4, /**< the user is a halfop of the channel */
Op = 8, /**< the user is an operator of the channel */