aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Noldor2009-08-04 15:30:38 +0000
committerGravatar Noldor2009-08-04 15:30:38 +0000
commit0b808795f2a6a6692f8ca285c244f9f7697cf405 (patch)
treed5a41abd3dd2a390082bb826c5562759bc3a9b7c /src
parentChanged multiline-editor toggle command from alt+backspace to alt+return: fix... (diff)
downloadKVIrc-0b808795f2a6a6692f8ca285c244f9f7697cf405.tar.gz
KVIrc-0b808795f2a6a6692f8ca285c244f9f7697cf405.tar.bz2
KVIrc-0b808795f2a6a6692f8ca285c244f9f7697cf405.zip
Fixed code completer and str module doc
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3400 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/modules/editor/scripteditor.cpp18
-rw-r--r--src/modules/objects/class_http.cpp2
-rw-r--r--src/modules/str/libkvistr.cpp2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index dd45d2c06..daa159326 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -365,25 +365,24 @@ QString KviScriptEditorWidget::textUnderCursor() const
QTextCursor tc = textCursor();
if(tc.atBlockStart())
return QString();
-
tc.clearSelection();
- tc.movePosition(QTextCursor::StartOfWord);
+ tc.movePosition(QTextCursor::StartOfWord,QTextCursor::KeepAnchor);
if(tc.atBlockStart())
{
+ szWord.append(tc.selectedText());
tc.movePosition(QTextCursor::EndOfWord,QTextCursor::KeepAnchor);
- if(tc.atBlockEnd())
- return tc.selectedText();
-
+ szWord.append(tc.selectedText());
+ if(tc.atBlockEnd()){
+ return szWord;
+ }
tc.movePosition(QTextCursor::NextCharacter,QTextCursor::KeepAnchor);
- szWord = tc.selectedText();
+ szWord.append(tc.selectedText());
if(szWord.right(1)!=".")
szWord.chop(1);
-
return szWord;
}
- tc.movePosition(QTextCursor::PreviousCharacter);
- tc.movePosition(QTextCursor::EndOfWord,QTextCursor::KeepAnchor);
+ tc.movePosition(QTextCursor::PreviousCharacter,QTextCursor::KeepAnchor);
szWord=tc.selectedText();
if(szWord.left(1)==".")
{
@@ -393,7 +392,6 @@ QString KviScriptEditorWidget::textUnderCursor() const
tc.movePosition(QTextCursor::EndOfWord,QTextCursor::KeepAnchor,1);
szWord.prepend(tc.selectedText());
} else szWord.remove(0,1);
-
return szWord;
}
/*
diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp
index 9ef13f7f6..fd32351e7 100644
--- a/src/modules/objects/class_http.cpp
+++ b/src/modules/objects/class_http.cpp
@@ -77,9 +77,11 @@ const char * const ssl_errors_tbl[] = {
This class provides a standard HTTP functionality.[br]
@functions:
!fn: <id:integer>$get(<remote_path:string>,<local_file: string>)
+
!fn: <id:integer>$post(<remote_path:string>,<post_data:string>,<local_file: string>)
!fn: $abort()
!fn: <id:integer>$setHost(<host:string>,<remote_port:unsigned_integer>)
+
!fn: <id:integer>$currentId()
!fn: $setProxy(<host:string>,[<user:string>,<password:string>])
!fn: $setUser(<user:string>,<password:string>)
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 5050a1999..5c6a22dba 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -431,7 +431,7 @@ static bool str_kvs_fnc_contains(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("container",KVS_PT_STRING,0,szString)
KVSM_PARAMETER("tofind",KVS_PT_STRING,0,szSubString)
KVSM_PARAMETERS_END(c)
- bIs = szString.indexOf(szSubString,Qt::CaseInsensitive) != -1;
+ bIs = szString.indexOf(szSubString,Qt::CaseSensitive) != -1;
c->returnValue()->setBoolean(bIs);
return true;
}