aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/core/KviMemory.cpp2
-rw-r--r--src/kvilib/ext/KviProxy.cpp4
-rw-r--r--src/kvilib/ext/KviRegisteredUserDataBase.cpp6
-rw-r--r--src/kvilib/irc/KviIrcUserEntry.cpp2
-rw-r--r--src/kvirc/kernel/KviNotifyList.cpp4
-rw-r--r--src/kvirc/kernel/KviOptions.cpp8
-rw-r--r--src/kvirc/kvs/KviKvsModuleInterface.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsPopupMenu.cpp6
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_dollar.cpp4
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp3
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView.cpp4
-rw-r--r--src/kvirc/ui/KviSelectors.cpp9
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp3
-rw-r--r--src/modules/dcc/DccBroker.cpp4
-rw-r--r--src/modules/dcc/DccUtils.cpp2
-rw-r--r--src/modules/options/OptionsWidget_identity.cpp3
-rw-r--r--src/modules/perlcore/KVIrc.xs18
-rw-r--r--src/modules/popupeditor/PopupEditorWindow.cpp39
22 files changed, 64 insertions, 67 deletions
diff --git a/src/kvilib/core/KviMemory.cpp b/src/kvilib/core/KviMemory.cpp
index d44105998..bfdc840c5 100644
--- a/src/kvilib/core/KviMemory.cpp
+++ b/src/kvilib/core/KviMemory.cpp
@@ -361,7 +361,7 @@ namespace KviMemory
return dst_ptr; //asm(" movl 8(%ebp),%eax"); <-- gcc will put that (AFTER THE OPTIMISATION PASS!)
}
- #endif COMPILE_ix86_ASM
+ #endif //COMPILE_ix86_ASM
// The next 4 functions could be optimized with the & and shift technique
// used in the assembly implementations but the compilers usually
diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp
index f3e77b55e..a090e0185 100644
--- a/src/kvilib/ext/KviProxy.cpp
+++ b/src/kvilib/ext/KviProxy.cpp
@@ -79,6 +79,6 @@ void KviProxy::getSupportedProtocolNames(QStringList & buf)
void KviProxy::normalizeUserAndPass()
{
- m_szUser.trimmed();
- m_szPass.trimmed();
+ m_szUser = m_szUser.trimmed();
+ m_szPass = m_szPass.trimmed();
}
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index 727e5b2b8..591c56fb7 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -151,7 +151,7 @@ KviRegisteredUserDataBase::~KviRegisteredUserDataBase()
KviRegisteredUser * KviRegisteredUserDataBase::addUser(const QString & name)
{
- if(name.isEmpty()) return false;
+ if(name.isEmpty()) return 0;
if(m_pUserDict->find(name))return 0;
KviRegisteredUser * u = new KviRegisteredUser(name);
m_pUserDict->replace(u->name(),u); //u->name() because we're NOT copying keys!
@@ -161,7 +161,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addUser(const QString & name)
KviRegisteredUserGroup * KviRegisteredUserDataBase::addGroup(const QString & name)
{
- if(name.isEmpty()) return false;
+ if(name.isEmpty()) return 0;
if(m_pGroupDict->find(name))return 0;
KviRegisteredUserGroup * pGroup = new KviRegisteredUserGroup(name);
m_pGroupDict->replace(pGroup->name(),pGroup); //u->name() because we're NOT copying keys!
@@ -413,7 +413,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const QString &
KviRegisteredUserMask * KviRegisteredUserDataBase::findMatchingMask(const QString & nick,const QString &user,const QString & host)
{
// first lookup the nickname in the maskDict
- if(nick.isEmpty()) return false;
+ if(nick.isEmpty()) return 0;
KviRegisteredUserMaskList * l = m_pMaskDict->find(nick);
if(l)
{
diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index bb54474b5..1ca4cecae 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -82,7 +82,7 @@ void KviIrcUserEntry::setRealName(const QString & szReal)
*/
if(m_szRealName.length() >= 5)
{
- if((m_szRealName[0].unicode() == KviControlCodes::Color))
+ if(m_szRealName[0].unicode() == KviControlCodes::Color)
{
unsigned char cFore, cBack;
int iPos = KviControlCodes::getUnicodeColorBytes(m_szRealName, 1, &cFore, &cBack);
diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp
index 5f1c8d297..ab782252b 100644
--- a/src/kvirc/kernel/KviNotifyList.cpp
+++ b/src/kvirc/kernel/KviNotifyList.cpp
@@ -392,7 +392,7 @@ void KviIsOnNotifyListManager::buildRegUserDict()
QString notify;
if(u->getProperty("notify",notify))
{
- notify.trimmed();
+ notify = notify.trimmed();
while(!notify.isEmpty())
{
int idx = notify.indexOf(' ');
@@ -1108,7 +1108,7 @@ void KviWatchNotifyListManager::buildRegUserDict()
QString notify;
if(u->getProperty("notify",notify))
{
- notify.trimmed();
+ notify = notify.trimmed();
QStringList sl = notify.split(' ',QString::SkipEmptyParts);
for(QStringList::Iterator it = sl.begin();it != sl.end();++it)
{
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 4fa24dbf6..3ef2efbf8 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -1216,7 +1216,7 @@ namespace KviTheme
#undef READ_OPTIONS
#undef READ_ALL_OPTIONS
- KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).trimmed();
+ KVI_OPTION_STRING(KviOption_stringIconThemeSubdir) = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).trimmed();
// the pixmap options need special processing
@@ -1226,8 +1226,7 @@ namespace KviTheme
{
if(cfg.hasKey(g_pixmapOptionsTable[i].name))
{
- QString szVal = cfg.readEntry(g_pixmapOptionsTable[i].name,"");
- szVal.trimmed();
+ QString szVal = cfg.readEntry(g_pixmapOptionsTable[i].name,"").trimmed();
QString szBuffer;
if(!szVal.isEmpty())
{
@@ -1388,8 +1387,7 @@ bool KviApplication::setOptionValue(const QString &optName,const QString &value)
if(KviQString::equalCIN(optName,KVI_PIXMAP_OPTIONS_PREFIX,KVI_PIXMAP_OPTIONS_PREFIX_LEN))
{
// We lookup the image path (so we allow also relative paths for this option type)
- QString szVal = value;
- szVal.trimmed();
+ QString szVal = value.trimmed();
QString szBuffer;
if(!szVal.isEmpty())
{
diff --git a/src/kvirc/kvs/KviKvsModuleInterface.cpp b/src/kvirc/kvs/KviKvsModuleInterface.cpp
index 3cb9e0cd5..3d3a3c226 100644
--- a/src/kvirc/kvs/KviKvsModuleInterface.cpp
+++ b/src/kvirc/kvs/KviKvsModuleInterface.cpp
@@ -39,7 +39,7 @@ bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QS
const QChar * pEnd = d->endingLocation();
if(!(pBegin && pEnd))return false;
szParamBuffer.setUnicode(pBegin,pEnd - pBegin);
- szParamBuffer.trimmed();
+ szParamBuffer = szParamBuffer.trimmed();
return true;
}
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index 29598450c..9fed00ab1 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -1164,8 +1164,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
for(s = m_pPrologues->first();s;s = m_pPrologues->next())
{
buffer.append("prologue\n");
- tmp = s->code();
- tmp.trimmed();
+ tmp = s->code().trimmed();
KviCommandFormatter::blockFromBuffer(tmp);
buffer.append(tmp);
buffer.append('\n');
@@ -1217,8 +1216,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
for(s = m_pEpilogues->first();s;s = m_pEpilogues->next())
{
buffer.append("epilogue\n");
- tmp = s->code();
- tmp.trimmed();
+ tmp = s->code().trimmed();
KviCommandFormatter::blockFromBuffer(tmp);
buffer.append(tmp);
buffer.append('\n');
diff --git a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
index 19618dbe0..32b735d28 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
@@ -74,10 +74,10 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
KviKvsTreeNodeInstruction * i = parseInstructionBlock();
if(!i)
{
- if(error())return false;
+ if(error())return 0;
// trigger an error anyway: this is abused syntax :D
error(KVSP_curCharPointer,__tr2qs_ctx("Empty instruction block for command evaluation","kvs"));
- return false;
+ return 0;
}
return new KviKvsTreeNodeCommandEvaluation(pDollarBegin,i);
diff --git a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
index 1c269a6e9..e56861086 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
@@ -2031,8 +2031,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp()
if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar;
QString tmp(pBegin,KVSP_curCharPointer - pBegin);
- tmp.trimmed();
-
+ tmp = tmp.trimmed();
const QString szHelpName("help");
KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szHelpName);
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
index bcfe4c337..b934e5061 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
@@ -117,7 +117,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject
{
kvs_int_t iVal;
if(!evaluateIndex(c,iVal))
- return false;
+ return 0;
KviKvsRWEvaluationResult * result;
if(o)
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
index d802434fb..e897a19d7 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
@@ -83,7 +83,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayReferenceAssert::evaluateReadWrite
else r = m_pSource->evaluateReadWrite(c);
if(!r)
- return false;
+ return 0;
return r;
}
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
index 2f9bad7c5..96bd92657 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
@@ -70,7 +70,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeExtendedScopeVariable::evaluateReadWrit
if(!c->extendedScopeVariables())
{
c->error(this,__tr2qs_ctx("There are no extended scope variables in this scope","kvs"));
- return false;
+ return 0;
}
return new KviKvsHashElement(0,c->extendedScopeVariables()->get(m_szIdentifier),c->extendedScopeVariables(),m_szIdentifier);
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
index 92308056f..9612e53d1 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
@@ -79,7 +79,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashReferenceAssert::evaluateReadWriteI
KviKvsRWEvaluationResult * r;
if(o)r = m_pSource->evaluateReadWriteInObjectScope(o,c);
else r = m_pSource->evaluateReadWrite(c);
- if(!r)return false;
+ if(!r)return 0;
return r;
}
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index d890d5372..93bde2004 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -2674,7 +2674,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
if(linkCmd)
{
linkCmd->setUtf16(l->pBlocks[iLastEscapeBlock].pChunk->szPayload,kvi_wstrlen(l->pBlocks[iLastEscapeBlock].pChunk->szPayload));
- linkCmd->trimmed();
+ *linkCmd = linkCmd->trimmed();
if((*linkCmd)=="nc") (*linkCmd)="n";
}
if(linkText)
@@ -2743,7 +2743,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
QString tmp;
tmp.setUtf16(l->pBlocks[i].pChunk->szPayload,kvi_wstrlen(l->pBlocks[i].pChunk->szPayload));
linkCmd->append(tmp);
- linkCmd->trimmed();
+ *linkCmd = linkCmd->trimmed();
}
if(linkText)
{
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index 5b628da28..e60ac2539 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -527,8 +527,7 @@ void KviStringListSelector::itemSelectionChanged()
void KviStringListSelector::textChanged(const QString &str)
{
- str.trimmed();
- m_pAddButton->setEnabled((str.length() > 0) && isEnabled());
+ m_pAddButton->setEnabled((str.trimmed().length() > 0) && isEnabled());
}
void KviStringListSelector::setEnabled(bool bEnabled)
@@ -537,7 +536,7 @@ void KviStringListSelector::setEnabled(bool bEnabled)
m_pLineEdit->setEnabled(bEnabled);
m_pLabel->setEnabled(bEnabled);
QString txt = m_pLineEdit->text();
- txt.trimmed();
+ txt = txt.trimmed();
m_pAddButton->setEnabled(bEnabled && (txt.length() > 0));
bool bSomeSelected;
@@ -555,7 +554,7 @@ void KviStringListSelector::commit()
for(unsigned int u=0;u<uCount;u++)
{
QString str = m_pListWidget->item(u)->text();
- str.trimmed();
+ str = str.trimmed();
if(str.length() > 0)m_pOption->append(str);
}
}
@@ -563,7 +562,7 @@ void KviStringListSelector::commit()
void KviStringListSelector::addClicked()
{
QString str = m_pLineEdit->text();
- str.trimmed();
+ str = str.trimmed();
if(str.length() > 0)m_pListWidget->insertItem(m_pListWidget->count(),str);
m_pLineEdit->setText("");
}
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 7c64315aa..8afc2fb33 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -407,8 +407,7 @@ void SingleActionEditor::setActionData(ActionData * d)
QString t = m_pCategoryCombo->itemText(i);
int idx = t.lastIndexOf('(');
QString r = t.right(t.length() - (idx + 1));
- QString r2 = r.left(r.length() - 1);
- r2.trimmed();
+ QString r2 = r.left(r.length() - 1).trimmed();
if(r2 == d->m_szCategory)
{
m_pCategoryCombo->setCurrentIndex(i);
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index 806720768..8151d730a 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -174,7 +174,7 @@ void DccBroker::rsendAskForFileName(DccDescriptor * dcc)
{
d = new DccDescriptor(*dcc);
d->szLocalFileName = *(it);
- d->szLocalFileName.trimmed();
+ d->szLocalFileName = d->szLocalFileName.trimmed();
++it;
if(d->szLocalFileName.isEmpty())
cancelDcc(d);
@@ -889,7 +889,7 @@ void DccBroker::sendFileManage(DccDescriptor * dcc)
{
d = new DccDescriptor(*dcc);
d->szLocalFileName = *(it);
- d->szLocalFileName.trimmed();
+ d->szLocalFileName = d->szLocalFileName.trimmed();
++it;
if(d->szLocalFileName.isEmpty())
cancelDcc(d);
diff --git a/src/modules/dcc/DccUtils.cpp b/src/modules/dcc/DccUtils.cpp
index 6d794a9de..38e56fbb2 100644
--- a/src/modules/dcc/DccUtils.cpp
+++ b/src/modules/dcc/DccUtils.cpp
@@ -111,7 +111,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsoleWindow *
if(KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault))
{
- KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed();
+ KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface) = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed();
if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
{
if(KviNetUtils::isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index e405b365d..cd4498f85 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -532,8 +532,7 @@ void OptionsWidget_identityAvatar::chooseAvatar()
AvatarSelectionDialog dlg(this,szCurrent);
if(dlg.exec() != QDialog::Accepted)return;
- szCurrent = dlg.avatarName();
- szCurrent.trimmed();
+ szCurrent = dlg.avatarName().trimmed();
if(KviQString::equalCIN(szCurrent,"http://",7))
{
diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs
index 86a30d448..a574bf7ff 100644
--- a/src/modules/perlcore/KVIrc.xs
+++ b/src/modules/perlcore/KVIrc.xs
@@ -87,8 +87,10 @@ char * getLocal(varname)
{
pVar->asString(tmp);
hack = tmp;
- RETVAL = hack.ptr();
- } else RETVAL = "";
+ } else {
+ hack = "";
+ }
+ RETVAL = hack.ptr();
}
OUTPUT:
RETVAL
@@ -120,8 +122,10 @@ char * getGlobal(varname)
{
pVar->asString(tmp);
hack = tmp;
- RETVAL = hack.ptr();
- } else RETVAL = "";
+ } else {
+ hack = "";
+ }
+ RETVAL = hack.ptr();
}
OUTPUT:
RETVAL
@@ -145,6 +149,7 @@ void setGlobal(varname,value)
char * eval(code)
char * code
CODE:
+ KviCString hack;
if(g_pCurrentKvsContext && code)
{
KviKvsVariant ret;
@@ -156,10 +161,11 @@ char * eval(code)
} else {
g_szLastReturnValue = "";
}
- RETVAL = g_szLastReturnValue.ptr();
+ hack = g_szLastReturnValue.ptr();
} else {
- RETVAL = "";
+ hack = "";
}
+ RETVAL = hack.ptr();
OUTPUT:
RETVAL
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index c4328f714..a74b2bc92 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -731,46 +731,46 @@ void SinglePopupEditor::saveLastSelectedItem()
void SinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,PopupTreeWidgetItem *it)
{
- it->m_szId.trimmed();
+ it->m_szId = it->m_szId.trimmed();
switch(it->m_type)
{
case PopupTreeWidgetItem::Prologue:
- it->m_szCode.trimmed();
+ it->m_szCode = it->m_szCode.trimmed();
p->addPrologue(it->m_szId,it->m_szCode);
break;
case PopupTreeWidgetItem::Epilogue:
- it->m_szCode.trimmed();
+ it->m_szCode = it->m_szCode.trimmed();
p->addEpilogue(it->m_szId,it->m_szCode);
break;
case PopupTreeWidgetItem::Separator:
- it->m_szCondition.trimmed();
+ it->m_szCondition = it->m_szCondition.trimmed();
p->addSeparator(it->m_szId,it->m_szCondition);
break;
case PopupTreeWidgetItem::Label:
- it->m_szText.trimmed();
- it->m_szCondition.trimmed();
- it->m_szIcon.trimmed();
+ it->m_szText = it->m_szText.trimmed();
+ it->m_szCondition = it->m_szCondition.trimmed();
+ it->m_szIcon = it->m_szIcon.trimmed();
p->addLabel(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition);
break;
case PopupTreeWidgetItem::Item:
- it->m_szText.trimmed();
- it->m_szIcon.trimmed();
- it->m_szCondition.trimmed();
- it->m_szCode.trimmed();
+ it->m_szText = it->m_szText.trimmed();
+ it->m_szIcon = it->m_szIcon.trimmed();
+ it->m_szCondition = it->m_szCondition.trimmed();
+ it->m_szCode = it->m_szCode.trimmed();
p->addItem(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition);
break;
case PopupTreeWidgetItem::ExtMenu:
- it->m_szText.trimmed();
- it->m_szIcon.trimmed();
- it->m_szCondition.trimmed();
- it->m_szCode.trimmed();// <-- this is the ext name in fact
+ it->m_szText = it->m_szText.trimmed();
+ it->m_szIcon = it->m_szIcon.trimmed();
+ it->m_szCondition = it->m_szCondition.trimmed();
+ it->m_szCode = it->m_szCode.trimmed();// <-- this is the ext name in fact
p->addExtPopup(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition);
break;
case PopupTreeWidgetItem::Menu:
{
- it->m_szText.trimmed();
- it->m_szIcon.trimmed();
- it->m_szCondition.trimmed();
+ it->m_szText = it->m_szText.trimmed();
+ it->m_szIcon = it->m_szIcon.trimmed();
+ it->m_szCondition = it->m_szCondition.trimmed();
KviKvsPopupMenu * menu = p->addPopup(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition);
int count= it->childCount();
for(int i=0; i<count; i++)
@@ -788,8 +788,7 @@ KviKvsPopupMenu * SinglePopupEditor::getMenu()
{
saveLastSelectedItem();
- QString tmp = m_pNameEditor->text();
- tmp.trimmed();
+ QString tmp = m_pNameEditor->text().trimmed();
KviKvsPopupMenu * p = new KviKvsPopupMenu(tmp);
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:10:41 +0000