fix all warnings under clang

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5952 17fca916-40b9-46aa-a4ea-0a15b648b75c

6 files changed, 36 insertions, 33 deletions

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);