From 2c3ab1d1dadbe925b7375e6b1ac4501982ec2e99 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Wed, 16 Jul 2008 13:59:15 +0000
Subject: reverted #2080, /me donkey

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2081 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/reguser/dialog.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/modules/reguser/dialog.cpp')

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 5cc9c4a2c..1b883c455 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -36,8 +36,8 @@
 #include "kvi_options.h"
 #include "kvi_file.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
 #include "kvi_msgbox.h"
+#include "kvi_fileutils.h"
 #include "kvi_settings.h"
 #include "kvi_stringconversion.h"
 #include "kvi_options.h"
@@ -59,7 +59,6 @@
 #include <QEvent>
 #include <QCloseEvent>
 #include <QAbstractItemView>
-#include <QUrl>
 
 #define LVI_ICON_SIZE 32
 #define LVI_BORDER 4
@@ -815,23 +814,23 @@ void KviRegisteredUsersDialog::importClicked()
 
 			if(img.isNull())debug("Ops.. readed a null image ?");
 
-			QString fName = QUrl(u->name()).toEncoded();
+			KviStr fName = u->name();
+			kvi_encodeFileName(fName);
 
-			QString fPath;
+			KviStr fPath;
 			int rnm = 0 ;
 			do
 			{
-				g_pApp->getLocalKvircDirectory(fPath,KviApp::Avatars,fName);
-				fPath+= rnm;
-				fPath+= ".png";
+				g_pApp->getLocalKvircDirectory(fPath,KviApp::Avatars,fName.ptr());
+				fPath.append(KviStr::Format,"%d.png",rnm);
 				rnm++;
-			} while(KviFileUtils::fileExists(fPath));
+			} while(KviFileUtils::fileExists(fPath.ptr()));
 
-			if(!img.save(fPath,"PNG"))
+			if(!img.save(fPath.ptr(),"PNG"))
 			{
-				debug("Can't save image %s",fPath.toUtf8().data());
+				debug("Can't save image %s",fPath.ptr());
 			} else {
-				u->setProperty("avatar",fPath);
+				u->setProperty("avatar",fPath.ptr());
 			}
 		}
 	}
-- 
cgit v1.3.1-10-gc9f91