fixed reguser exporting

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

3 files changed, 92 insertions, 56 deletions

diff --git a/src/kvilib/kvilib_vc05.vcproj b/src/kvilib/kvilib_vc05.vcproj
index 34c3fddfe..0f7442875 100644
--- a/src/kvilib/kvilib_vc05.vcproj
+++ b/src/kvilib/kvilib_vc05.vcproj
@@ -2682,7 +2682,10 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						Description="Performing Custom Build Step For $(InputName)"

+						Description="Moc&apos;ing kvi_tal_tooltip.h..."

+						CommandLine="$(QTDIR)\bin\moc.exe .\tal\kvi_tal_tooltip.h -o tmp\moc\moc_kvi_tal_tooltip.cpp&#x0D;&#x0A;"

+						AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\tal\kvi_tal_tooltip.h"

+						Outputs="tmp\moc\moc_kvi_tal_tooltip.cpp"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -2690,7 +2693,10 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						Description="Performing Custom Build Step $(InputName)"

+						Description="Moc&apos;ing kvi_tal_tooltip.h..."

+						CommandLine="$(QTDIR)\bin\moc.exe .\tal\kvi_tal_tooltip.h -o tmp\moc\moc_kvi_tal_tooltip.cpp&#x0D;&#x0A;"

+						AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\tal\kvi_tal_tooltip.h"

+						Outputs="tmp\moc\moc_kvi_tal_tooltip.cpp"

 					/>

 				</FileConfiguration>

 			</File>

@@ -3155,6 +3161,14 @@
 						PreprocessorDefinitions="__KVILIB__"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="__KVILIB__"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="system\moc_kvi_locale.cpp"

@@ -3217,6 +3231,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\tmp\moc\moc_kvi_tal_tooltip.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="__KVILIB__"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="__KVILIB__"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="system\moc_kvi_thread.cpp"

 				>

 				<FileConfiguration

diff --git a/src/kvilib/tal/kvi_tal_tooltip.cpp b/src/kvilib/tal/kvi_tal_tooltip.cpp
index 0cfb3f1ac..6b51b9ab3 100644
--- a/src/kvilib/tal/kvi_tal_tooltip.cpp
+++ b/src/kvilib/tal/kvi_tal_tooltip.cpp
@@ -120,4 +120,6 @@ void KviTalToolTip::maybeTip(const QPoint & p)
 	// does nothing here.. and in Qt 4.x will even fail to work
 }
 
-#include "kvi_tal_tooltip.moc"
+#ifndef COMPILE_ON_WINDOWS
+	#include "kvi_tal_tooltip.moc"
+#endif
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 679888334..12403e4cd 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -1288,12 +1288,13 @@ void KviRegisteredUsersDialog::exportClicked()
 {
 	unsigned int nEntries = 0;
 
-	KviTalListViewItem * it;
-
-	for(it = m_pListView->firstChild();it;it = it->nextSibling())
-	{
-		if(it->isSelected())nEntries++;
-	}
+	KviTalListViewItemIterator it( m_pListView, QListViewItemIterator::Selected );
+	KviTalListViewItemIterator cit( m_pListView, QListViewItemIterator::Selected );

+    while ( cit.current() ) {

+		if(((KviRegisteredUsersDialogItemBase *)(cit.current()))->type() == KviRegisteredUsersDialogItemBase::User)

+			nEntries++;

+        ++cit;

+    }
 
 	if(nEntries < 1)
 	{
@@ -1320,71 +1321,70 @@ void KviRegisteredUsersDialog::exportClicked()
 	hf.nentries = nEntries;
 
 	if(f.writeBlock((const char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto write_error;
-
-	for(it = m_pListView->firstChild();it;it = it->nextSibling())
-	{
-		if(it->isSelected())
+

+    while ( it.current() ) {
+		KviRegisteredUsersDialogItemBase *pBase = (KviRegisteredUsersDialogItemBase *)(it.current());
+		if(pBase->type()!=KviRegisteredUsersDialogItemBase::User) continue;
+		QString szName = it.current()->text(0);
+		KviRegisteredUser * u = ((KviRegisteredUsersDialogItem *)(it.current()))->user();
+		if(u)
 		{
-			QString szName = it->text(0);
-			KviRegisteredUser * u = ((KviRegisteredUsersDialogItem *)(it))->user();
-			if(u)
+			if(!f.save(szName))goto write_error;
+			KviDict<QString> * pd = u->propertyDict();
+			if(pd)
 			{
-				if(!f.save(szName))goto write_error;
-				KviDict<QString> * pd = u->propertyDict();
-				if(pd)
+				if(!f.save(pd->count()))goto write_error;
+				KviDictIterator<QString> it(*pd);
+				while(it.current())
 				{
-					if(!f.save(pd->count()))goto write_error;
-					KviDictIterator<QString> it(*pd);
-					while(it.current())
-					{
-						QString key = it.currentKey();
-						if(!f.save(key))goto write_error;
-						if(!f.save(*(it.current())))goto write_error;
-						++it;
-					}
-				} else {
-					if(!f.save(0))goto write_error;
+					QString key = it.currentKey();
+					if(!f.save(key))goto write_error;
+					if(!f.save(*(it.current())))goto write_error;
+					++it;
 				}
+			} else {
+				if(!f.save(0))goto write_error;
+			}
 
-				KviPtrList<KviIrcMask> * ml = u->maskList();
-				if(ml)
+			KviPtrList<KviIrcMask> * ml = u->maskList();
+			if(ml)
+			{
+				if(!f.save(ml->count()))goto write_error;
+				for(KviIrcMask * m = ml->first();m;m = ml->next())
 				{
-					if(!f.save(ml->count()))goto write_error;
-					for(KviIrcMask * m = ml->first();m;m = ml->next())
-					{
-						QString fullMask;
-						m->mask(fullMask,KviIrcMask::NickUserHost);
-						if(!f.save(fullMask))goto write_error;
-					}
-				} else {
-					if(!f.save(0))goto write_error;
+					QString fullMask;
+					m->mask(fullMask,KviIrcMask::NickUserHost);
+					if(!f.save(fullMask))goto write_error;
 				}
+			} else {
+				if(!f.save(0))goto write_error;
+			}
 
-				QString avatar;
-				if(u->getProperty("avatar",avatar))
+			QString avatar;
+			if(u->getProperty("avatar",avatar))
+			{
+				KviAvatar * av = g_pIconManager->getAvatar(QString::null,avatar);
+				if(av)
 				{
-					KviAvatar * av = g_pIconManager->getAvatar(QString::null,avatar);
-					if(av)
+					if(!av->pixmap()->isNull())
 					{
-						if(!av->pixmap()->isNull())
-						{
-							if(!f.save(1))goto write_error;
-							QImageIO io;
-							io.setImage(av->pixmap()->convertToImage());
-							io.setIODevice(&f);
-							io.setFormat("PNG");
-							if(!io.write())goto write_error;
-						} else {
-							if(!f.save(0))goto write_error;
-						}
+						if(!f.save(1))goto write_error;
+						QImageIO io;
+						io.setImage(av->pixmap()->convertToImage());
+						io.setIODevice(&f);
+						io.setFormat("PNG");
+						if(!io.write())goto write_error;
 					} else {
 						if(!f.save(0))goto write_error;
 					}
 				} else {
 					if(!f.save(0))goto write_error;
 				}
+			} else {
+				if(!f.save(0))goto write_error;
 			}
 		}
+		++it;
 	}
 
 	goto succesfull_export;