more QT4 port

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

4 files changed, 8 insertions, 8 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index db45e0bf6..c1322fee7 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -166,7 +166,7 @@ void KviDccBroker::rsendAskForFileName(KviDccDescriptor * dcc)
 				{
 					d = new KviDccDescriptor(*dcc);
 					d->szLocalFileName = *(it);
-					d->szLocalFileName.stripWhiteSpace();
+					d->szLocalFileName.trimmed();
 					++it;
 					if(d->szLocalFileName.isEmpty())
 						cancelDcc(d);
@@ -786,7 +786,7 @@ void KviDccBroker::sendFileManage(KviDccDescriptor * dcc)
 				{
 					d = new KviDccDescriptor(*dcc);
 					d->szLocalFileName = *(it);
-					d->szLocalFileName.stripWhiteSpace();
+					d->szLocalFileName.trimmed();
 					++it;
 					if(d->szLocalFileName.isEmpty())
 						cancelDcc(d);
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 223a7989a..e0b4c53f0 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1303,10 +1303,10 @@
 				{
 					KviStr fam = txt;
 					fam.cutFromFirst(',',true);
-					fam.stripWhiteSpace();
+					fam.trimmed();
 					KviStr psz = txt;
 					psz.cutToFirst(',',true);
-					psz.stripWhiteSpace();
+					psz.trimmed();
 					bool bOk;
 					unsigned int uSize = psz.toUInt(&bOk);
 					if(!bOk)uSize = 12;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 7909a53cd..70f3358a4 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -106,7 +106,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		} else {
 			// -c or -n , grab a local nick from somewhere
 			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1);
-			d->szLocalNick.stripWhiteSpace();
+			d->szLocalNick.trimmed();
 			if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
 			d->szLocalUser  = __tr2qs_ctx("unknown","dcc"); // we can live without it
 			d->szLocalHost  = d->szLocalUser;  // we can live without it
@@ -1228,7 +1228,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 		else {
 			// -c or -n , grab a local nick from somewhere
 			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1);
-			d->szLocalNick.stripWhiteSpace();
+			d->szLocalNick.trimmed();
 			if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
 			d->szLocalUser  = __tr("unknown"); // we can live without it
 			d->szLocalHost  = d->szLocalUser;  // we can live without it
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index acec18073..9f8e10735 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -40,7 +40,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 
 	if(KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault))
 	{
-		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace();
+		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed();
 		if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
 		{
 			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
@@ -108,7 +108,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 
 	if(KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault))
 	{
-		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace();
+		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed();
 		if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
 		{
 			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))