Apply clang-format

1 files changed, 340 insertions, 277 deletions

diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index b3d29d679..30b5860b1 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -71,19 +71,18 @@
 #define LVI_MINIMUM_TEXT_WIDTH 300
 #define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
 
-
 extern RegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par)
-: QTreeWidget(par)
+    : QTreeWidget(par)
 {
 	setColumnCount(2);
 
 	QStringList labels;
-	labels << __tr2qs_ctx("Name","register") << __tr2qs_ctx("Flags","register");
+	labels << __tr2qs_ctx("Name", "register") << __tr2qs_ctx("Flags", "register");
 	setHeaderLabels(labels);
-	setColumnWidth(0,360);
-	setColumnWidth(1,20);
+	setColumnWidth(0, 360);
+	setColumnWidth(1, 20);
 
 	setAllColumnsShowFocus(true);
 
@@ -92,25 +91,27 @@ KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par)
 	setRootIsDecorated(true);
 	setSortingEnabled(true);
 
-	setToolTip(__tr2qs_ctx("This is the list of registered users. " \
-		"KVIrc can automatically recognize and associate properties to them.<br>" \
-		"Use the buttons on the right to add, edit and remove entries. " \
-		"The \"notify\" column allows you to quickly add users to the notify list. " \
-		"Notify list fine-tuning can be performed by editing the entry properties.","register"));
+	setToolTip(__tr2qs_ctx("This is the list of registered users. "
+	                       "KVIrc can automatically recognize and associate properties to them.<br>"
+	                       "Use the buttons on the right to add, edit and remove entries. "
+	                       "The \"notify\" column allows you to quickly add users to the notify list. "
+	                       "Notify list fine-tuning can be performed by editing the entry properties.",
+	    "register"));
 }
 
-void KviRegisteredUsersListView::mousePressEvent (QMouseEvent *e)
+void KviRegisteredUsersListView::mousePressEvent(QMouseEvent * e)
 {
-	if (e->button() == Qt::RightButton)
+	if(e->button() == Qt::RightButton)
 	{
-		QTreeWidgetItem *i= itemAt(e->pos());
-		if (i) emit rightButtonPressed(i,QCursor::pos());
+		QTreeWidgetItem * i = itemAt(e->pos());
+		if(i)
+			emit rightButtonPressed(i, QCursor::pos());
 	}
 	QTreeWidget::mousePressEvent(e);
 }
 
-RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u)
-: RegisteredUsersDialogItemBase(User,par), m_pUser(u)
+RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par, KviRegisteredUser * u)
+    : RegisteredUsersDialogItemBase(User, par), m_pUser(u)
 {
 	QString szTmp;
 	QString t = "<nobr><b>";
@@ -119,102 +120,111 @@ RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRe
 	szTmp = m_pUser->getProperty("notify");
 	if(szTmp.isEmpty())
 	{
-		t += __tr2qs_ctx("Notify disabled","register");
-	} else {
-		t += __tr2qs_ctx("Notify as:","register");
+		t += __tr2qs_ctx("Notify disabled", "register");
+	}
+	else
+	{
+		t += __tr2qs_ctx("Notify as:", "register");
 		t += " ";
 		t += szTmp;
-
 	}
 	t += "]</nobr>";
 	t += "<br><nobr><font size=\"-1\">";
 	szTmp = m_pUser->getProperty("comment");
 	if(szTmp.isEmpty())
 	{
-		t += __tr2qs_ctx("No comment set","register");
-	} else {
-		t += __tr2qs_ctx("Comment:","register");
+		t += __tr2qs_ctx("No comment set", "register");
+	}
+	else
+	{
+		t += __tr2qs_ctx("Comment:", "register");
 		t += " ";
 		t += m_pUser->getProperty("comment");
 	}
 	t += "</font></nobr>";
 	m_pText.setHtml(t);
 	m_pText.setTextWidth(-1);
-// 	setText(0,t);
+	// 	setText(0,t);
 }
 
 RegisteredUsersDialogItem::~RegisteredUsersDialogItem()
 {
 }
 
-QString RegisteredUsersDialogItem::key(int,bool) const
+QString RegisteredUsersDialogItem::key(int, bool) const
 {
 	return m_pUser->name();
 }
 
-void RegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
+void RegisteredUsersDialogItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
 
-	RegisteredUsersDialogItemBase *item=static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
+	RegisteredUsersDialogItemBase * item = static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
 
-	if(item->type()==RegisteredUsersDialogItemBase::Group)
+	if(item->type() == RegisteredUsersDialogItemBase::Group)
 	{
 		//groups
 		QStyledItemDelegate::paint(p, option, index);
-	} else {
+	}
+	else
+	{
 		QStyleOptionViewItemV4 opt = option;
 		initStyleOption(&opt, index);
 
-		if (opt.state & QStyle::State_Selected)
-			QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem,&opt, p);
+		if(opt.state & QStyle::State_Selected)
+			QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, p);
 
-		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
+		RegisteredUsersDialogItem * it = (RegisteredUsersDialogItem *)item;
 
-		if(index.column()==0)
+		if(index.column() == 0)
 		{
-			QPoint pt=opt.rect.topLeft();
-			pt.setX(pt.x()+LVI_BORDER);
-			pt.setY(pt.y()+LVI_BORDER);
+			QPoint pt = opt.rect.topLeft();
+			pt.setX(pt.x() + LVI_BORDER);
+			pt.setY(pt.y() + LVI_BORDER);
 
 			p->drawPixmap(pt, *(g_pIconManager->getBigIcon(KVI_BIGICON_REGUSERS)));
-			QRect cliprect=QRect(QPoint(0,0),QSize(opt.rect.width()-(LVI_ICON_SIZE+LVI_SPACING+LVI_BORDER),opt.rect.height()));
+			QRect cliprect = QRect(QPoint(0, 0), QSize(opt.rect.width() - (LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER), opt.rect.height()));
 			p->save();
 
-			p->translate(opt.rect.x()+LVI_ICON_SIZE+LVI_SPACING, opt.rect.y());
+			p->translate(opt.rect.x() + LVI_ICON_SIZE + LVI_SPACING, opt.rect.y());
 			it->m_pText.drawContents(p, cliprect);
 			p->restore();
-		} else {
+		}
+		else
+		{
 			if(it->user())
 			{
 				if(!it->user()->getProperty("notify").isEmpty())
-					p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KviIconManager::NotifyOnLine)));
+					p->drawPixmap(opt.rect.topLeft().x() + LVI_BORDER, opt.rect.topLeft().y() + LVI_BORDER, *(g_pIconManager->getSmallIcon(KviIconManager::NotifyOnLine)));
 				else
-					p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KviIconManager::NotifyOffLine)));
+					p->drawPixmap(opt.rect.topLeft().x() + LVI_BORDER, opt.rect.topLeft().y() + LVI_BORDER, *(g_pIconManager->getSmallIcon(KviIconManager::NotifyOffLine)));
 				if(it->user()->ignoreEnabled())
-					p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+2*LVI_BORDER+16,*(g_pIconManager->getSmallIcon(KviIconManager::Ignore)));
+					p->drawPixmap(opt.rect.topLeft().x() + LVI_BORDER, opt.rect.topLeft().y() + 2 * LVI_BORDER + 16, *(g_pIconManager->getSmallIcon(KviIconManager::Ignore)));
 			}
 		}
 	}
 }
 
-QSize RegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const
+QSize RegisteredUsersDialogItemDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
-	RegisteredUsersDialogItemBase *item=static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
+	RegisteredUsersDialogItemBase * item = static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
 
-	if(item->type()==RegisteredUsersDialogItemBase::Group)
+	if(item->type() == RegisteredUsersDialogItemBase::Group)
 	{
 		//groups
 		return QStyledItemDelegate::sizeHint(option, index);
-	} else {
+	}
+	else
+	{
 		//users
-// 		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
+		// 		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
 
-		return QSize(300, LVI_ICON_SIZE+2*LVI_BORDER);
+		return QSize(300, LVI_ICON_SIZE + 2 * LVI_BORDER);
 	}
 }
 
 RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
-: QWidget(par)
+    : QWidget(par)
 {
 	g_pRegisteredUsersDialog = this;
 
@@ -222,96 +232,90 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 	g_pLocalRegisteredUserDataBase->copyFrom(g_pRegisteredUserDataBase);
 
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::RegUsers)));
-	setWindowTitle(__tr2qs_ctx("Registered Users and Configuration - KVIrc","register"));
+	setWindowTitle(__tr2qs_ctx("Registered Users and Configuration - KVIrc", "register"));
 
 	QGridLayout * g = new QGridLayout(this);
 
-
 	m_pListView = new KviRegisteredUsersListView(this);
 	m_pListView->setItemDelegate(new RegisteredUsersDialogItemDelegate());
 
-	connect(m_pListView,SIGNAL(itemPressed(QTreeWidgetItem *,int)),this,SLOT(itemPressed(QTreeWidgetItem *,int)));
-	connect(m_pListView,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
+	connect(m_pListView, SIGNAL(itemPressed(QTreeWidgetItem *, int)), this, SLOT(itemPressed(QTreeWidgetItem *, int)));
+	connect(m_pListView, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
 
-	g->addWidget(m_pListView,0,0,2,2);
+	g->addWidget(m_pListView, 0, 0, 2, 2);
 
 	KviTalVBox * vbox = new KviTalVBox(this);
 	vbox->setSpacing(4);
-	g->addWidget(vbox,0,2);
+	g->addWidget(vbox, 0, 2);
 
-	m_pWizardAddButton = new QPushButton(__tr2qs_ctx("Add Wizard...","register"),vbox);
-	connect(m_pWizardAddButton,SIGNAL(clicked()),this,SLOT(addWizardClicked()));
-	m_pWizardAddButton->setToolTip(__tr2qs_ctx("Add a registered user by means of a user-friendly wizard.","register"));
+	m_pWizardAddButton = new QPushButton(__tr2qs_ctx("Add Wizard...", "register"), vbox);
+	connect(m_pWizardAddButton, SIGNAL(clicked()), this, SLOT(addWizardClicked()));
+	m_pWizardAddButton->setToolTip(__tr2qs_ctx("Add a registered user by means of a user-friendly wizard.", "register"));
 	//m_pWizardAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItemByWizard)));
 
-
-	m_pAddButton = new QPushButton(__tr2qs_ctx("&Add...","register"),vbox);
-	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));
-	m_pAddButton->setToolTip(__tr2qs_ctx("Open the edit dialog to create a new user entry.","register"));
+	m_pAddButton = new QPushButton(__tr2qs_ctx("&Add...", "register"), vbox);
+	connect(m_pAddButton, SIGNAL(clicked()), this, SLOT(addClicked()));
+	m_pAddButton->setToolTip(__tr2qs_ctx("Open the edit dialog to create a new user entry.", "register"));
 	//m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem)));
 
-	m_pAddGroupButton = new QPushButton(__tr2qs_ctx("&Add Group...","register"),vbox);
-	connect(m_pAddGroupButton,SIGNAL(clicked()),this,SLOT(addGroupClicked()));
-	m_pAddGroupButton->setToolTip(__tr2qs_ctx("Adds a new group","register"));
+	m_pAddGroupButton = new QPushButton(__tr2qs_ctx("&Add Group...", "register"), vbox);
+	connect(m_pAddGroupButton, SIGNAL(clicked()), this, SLOT(addGroupClicked()));
+	m_pAddGroupButton->setToolTip(__tr2qs_ctx("Adds a new group", "register"));
 	//m_pAddGroupButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem)));
 
-	m_pRemoveButton = new QPushButton(__tr2qs_ctx("Re&move","register"),vbox);
-	connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked()));
+	m_pRemoveButton = new QPushButton(__tr2qs_ctx("Re&move", "register"), vbox);
+	connect(m_pRemoveButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
 	m_pRemoveButton->setEnabled(false);
-	m_pRemoveButton->setToolTip(__tr2qs_ctx("Remove the currently selected entries.","register"));
+	m_pRemoveButton->setToolTip(__tr2qs_ctx("Remove the currently selected entries.", "register"));
 	//m_pRemoveButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem)));
 
-
-	m_pEditButton = new QPushButton(__tr2qs_ctx("&Edit...","register"),vbox);
-	connect(m_pEditButton,SIGNAL(clicked()),this,SLOT(editClicked()));
+	m_pEditButton = new QPushButton(__tr2qs_ctx("&Edit...", "register"), vbox);
+	connect(m_pEditButton, SIGNAL(clicked()), this, SLOT(editClicked()));
 	m_pEditButton->setEnabled(false);
-	m_pEditButton->setToolTip(__tr2qs_ctx("Edit the first selected entry.","register"));
+	m_pEditButton->setToolTip(__tr2qs_ctx("Edit the first selected entry.", "register"));
 	//m_pEditButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EditItem)));
 
 	QFrame * f = new QFrame(vbox);
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 
-	m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select All","register"),vbox);
-	connect(m_pSelectAllButton,SIGNAL(clicked()),this,SLOT(selectAllClicked()));
-	m_pSelectAllButton->setToolTip(__tr2qs_ctx("Select all the entries","register"));
+	m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select All", "register"), vbox);
+	connect(m_pSelectAllButton, SIGNAL(clicked()), this, SLOT(selectAllClicked()));
+	m_pSelectAllButton->setToolTip(__tr2qs_ctx("Select all the entries", "register"));
 	//m_pSelectAllButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Plus)));
 
-	m_pExportButton = new QPushButton(__tr2qs_ctx("Export to...","register"),vbox);
+	m_pExportButton = new QPushButton(__tr2qs_ctx("Export to...", "register"), vbox);
 	m_pExportButton->setEnabled(false);
-	connect(m_pExportButton,SIGNAL(clicked()),this,SLOT(exportClicked()));
-	m_pExportButton->setToolTip(__tr2qs_ctx("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button.","register"));
+	connect(m_pExportButton, SIGNAL(clicked()), this, SLOT(exportClicked()));
+	m_pExportButton->setToolTip(__tr2qs_ctx("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button.", "register"));
 	//m_pExportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Save)));
 
-
-	m_pImportButton = new QPushButton(__tr2qs_ctx("Import from...","register"),vbox);
-	connect(m_pImportButton,SIGNAL(clicked()),this,SLOT(importClicked()));
-	m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.","register"));
+	m_pImportButton = new QPushButton(__tr2qs_ctx("Import from...", "register"), vbox);
+	connect(m_pImportButton, SIGNAL(clicked()), this, SLOT(importClicked()));
+	m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.", "register"));
 	//m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)));
 
-
 	KviTalHBox * hbox = new KviTalHBox(this);
 	hbox->setSpacing(4);
-	g->addWidget(hbox,3,1,1,2);
+	g->addWidget(hbox, 3, 1, 1, 2);
 
 	QPushButton * b;
 
-
-	b = new QPushButton(__tr2qs_ctx("&OK","register"),hbox);
-	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
+	b = new QPushButton(__tr2qs_ctx("&OK", "register"), hbox);
+	connect(b, SIGNAL(clicked()), this, SLOT(okClicked()));
 	b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept)));
 	//b->setMinimumWidth(120);
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","register"),hbox);
-	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	b = new QPushButton(__tr2qs_ctx("Cancel", "register"), hbox);
+	connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked()));
 	b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)));
 	//b->setMinimumWidth(120);
 
 	g->addItem(new QSpacerItem(0, 15), 2, 0);
-	g->setColumnStretch(0,1);
-	g->setRowStretch(1,1);
+	g->setColumnStretch(0, 1);
+	g->setRowStretch(1, 1);
 
-	connect(m_pListView,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged()));
-	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *, QPoint)),this,SLOT(rightButtonPressed(QTreeWidgetItem *, QPoint)));
+	connect(m_pListView, SIGNAL(itemSelectionChanged()), this, SLOT(selectionChanged()));
+	connect(m_pListView, SIGNAL(rightButtonPressed(QTreeWidgetItem *, QPoint)), this, SLOT(rightButtonPressed(QTreeWidgetItem *, QPoint)));
 
 	new QShortcut(Qt::Key_Escape, this, SLOT(cancelClicked()));
 
@@ -320,24 +324,26 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 	if(!parent())
 	{
 		if(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).y() < 5)
-			KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).setY(5);
+			KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry)
+			    .setY(5);
 
 		//setGeometry(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry));
 		resize(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).width(),
-			KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height());
+		    KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height());
 
 		QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow);
-		move(rect.x() + ((rect.width() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).width())/2),rect.y() + ((rect.height() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height())/2));
-
+		move(rect.x() + ((rect.width() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).width()) / 2), rect.y() + ((rect.height() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height()) / 2));
 	}
 }
 
 RegisteredUsersDialog::~RegisteredUsersDialog()
 {
 #ifndef COMPILE_ON_MAC
-	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height());
+	if(!parent())
+		KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(), pos().y(), size().width(), size().height());
 #else
-	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry();
+	if(!parent())
+		KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry();
 #endif
 
 	g_pRegisteredUsersDialog = 0;
@@ -346,13 +352,14 @@ RegisteredUsersDialog::~RegisteredUsersDialog()
 	g_pLocalRegisteredUserDataBase = 0;
 }
 
-void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
+void RegisteredUsersDialog::itemPressed(QTreeWidgetItem * it, int c)
 {
-	if(!it)return;
-	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
-	if(b->type()==RegisteredUsersDialogItemBase::User)
+	if(!it)
+		return;
+	RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)it;
+	if(b->type() == RegisteredUsersDialogItemBase::User)
 	{
-		RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)it;
+		RegisteredUsersDialogItem * i = (RegisteredUsersDialogItem *)it;
 
 		QRect r = m_pListView->visualItemRect(i);
 		int daw = m_pListView->columnWidth(0);
@@ -367,12 +374,13 @@ void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 				// try to find the nicknames to be notified
 				QString szMask;
 
-				for(KviIrcMask * m = i->user()->maskList()->first();m;m = i->user()->maskList()->next())
+				for(KviIrcMask * m = i->user()->maskList()->first(); m; m = i->user()->maskList()->next())
 				{
 					QString tmp = m->nick();
 					if((tmp.indexOf('*') == -1) && (tmp.indexOf('?') == -1) && (!tmp.isEmpty()))
 					{
-						if(!szMask.isEmpty())szMask.append(' ');
+						if(!szMask.isEmpty())
+							szMask.append(' ');
 						szMask.append(tmp);
 					}
 				}
@@ -380,15 +388,17 @@ void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 				if(szMask.isEmpty())
 				{
 					szMask = i->user()->name();
-					szMask.replace(" ","");
-					szMask.replace("'","");
-					szMask.replace("&","");
-					szMask.replace(",","");
+					szMask.replace(" ", "");
+					szMask.replace("'", "");
+					szMask.replace("&", "");
+					szMask.replace(",", "");
 				}
 
-				i->user()->setProperty("notify",szMask);
-			} else {
-				i->user()->setProperty("notify",QString("")); // kill that
+				i->user()->setProperty("notify", szMask);
+			}
+			else
+			{
+				i->user()->setProperty("notify", QString("")); // kill that
 			}
 
 			m_pListView->repaint(r);
@@ -396,15 +406,18 @@ void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 	}
 }
 
-void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
+void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem * it, int)
 {
-	if(!it)return;
-	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
-	if(b->type()==RegisteredUsersDialogItemBase::User)
+	if(!it)
+		return;
+	RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)it;
+	if(b->type() == RegisteredUsersDialogItemBase::User)
 	{
 		editItem((RegisteredUsersDialogItem *)it);
-	} else	{
-		RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b;
+	}
+	else
+	{
+		RegisteredUsersGroupItem * i = (RegisteredUsersGroupItem *)b;
 		editGroup(i->group());
 	}
 }
@@ -412,45 +425,47 @@ void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
 void RegisteredUsersDialog::addGroupClicked()
 {
 	bool ok;
-	QString text = QInputDialog::getText( this,
-		"KVIrc", __tr2qs_ctx("Group name:","register"), QLineEdit::Normal,
-		QString(), &ok );
-	if ( ok && !text.isEmpty() ) {
+	QString text = QInputDialog::getText(this,
+	    "KVIrc", __tr2qs_ctx("Group name:", "register"), QLineEdit::Normal,
+	    QString(), &ok);
+	if(ok && !text.isEmpty())
+	{
 		g_pLocalRegisteredUserDataBase->addGroup(text);
 		fillList();
 	}
 }
 
-void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
+void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup * group)
 {
 	bool ok;
 
-	QString text = QInputDialog::getText( this,
-		"KVIrc", __tr2qs_ctx("Group name:","register"), QLineEdit::Normal,
-		group->name(), &ok );
-	if ( ok && !text.isEmpty() ) {
-		QString szOldGroup=group->name();
+	QString text = QInputDialog::getText(this,
+	    "KVIrc", __tr2qs_ctx("Group name:", "register"), QLineEdit::Normal,
+	    group->name(), &ok);
+	if(ok && !text.isEmpty())
+	{
+		QString szOldGroup = group->name();
 		g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(0);
 		g_pLocalRegisteredUserDataBase->groupDict()->remove(szOldGroup);
 		g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(1);
 		group->setName(text);
-		g_pLocalRegisteredUserDataBase->groupDict()->insert(text,group);
+		g_pLocalRegisteredUserDataBase->groupDict()->insert(text, group);
 
-		KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
+		KviPointerHashTable<QString, KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
 
-		for(KviRegisteredUser * u = d->first();u;u = d->next())
+		for(KviRegisteredUser * u = d->first(); u; u = d->next())
 		{
-			if(u->group()==szOldGroup)
+			if(u->group() == szOldGroup)
 				u->setGroup(text);
 		}
 
 		fillList();
 
 		// select the last edited item
-		for(int c=0;c<m_pListView->topLevelItemCount();c++)
+		for(int c = 0; c < m_pListView->topLevelItemCount(); c++)
 		{
 			QTreeWidgetItem * pGroup = m_pListView->topLevelItem(c);
-			if(KviQString::equalCI(pGroup->text(0),text))
+			if(KviQString::equalCI(pGroup->text(0), text))
 			{
 				pGroup->setSelected(true);
 				m_pListView->setCurrentItem(pGroup);
@@ -460,41 +475,40 @@ void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 	}
 }
 
-
-void RegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt)
+void RegisteredUsersDialog::rightButtonPressed(QTreeWidgetItem * pItem, QPoint pnt)
 {
 	if(pItem)
 	{
-		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)pItem;
-		if(b->type()==RegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)pItem;
+		if(b->type() == RegisteredUsersDialogItemBase::User)
 		{
-            QMenu *groups = new QMenu;
+			QMenu * groups = new QMenu;
 
-			KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
-			for(KviPointerHashTableEntry<QString,KviRegisteredUserGroup> * g = pGroups->firstEntry();g;g = pGroups->nextEntry())
+			KviPointerHashTable<QString, KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
+			for(KviPointerHashTableEntry<QString, KviRegisteredUserGroup> * g = pGroups->firstEntry(); g; g = pGroups->nextEntry())
 			{
-                groups->addAction(g->key())
-                        ->setData(g->data()->name());
+				groups->addAction(g->key())
+				    ->setData(g->data()->name());
 			}
 
-            connect(groups,SIGNAL(triggered(QAction *)),this,SLOT(moveToGroupMenuClicked(QAction *)));
+			connect(groups, SIGNAL(triggered(QAction *)), this, SLOT(moveToGroupMenuClicked(QAction *)));
 
-            QMenu *mainPopup = new QMenu;
-            mainPopup->addAction(__tr2qs_ctx("Move to Group","register"))->setMenu(groups);
+			QMenu * mainPopup = new QMenu;
+			mainPopup->addAction(__tr2qs_ctx("Move to Group", "register"))->setMenu(groups);
 			mainPopup->exec(pnt);
 		}
 	}
 }
 
-void RegisteredUsersDialog::moveToGroupMenuClicked(QAction *pAction)
+void RegisteredUsersDialog::moveToGroupMenuClicked(QAction * pAction)
 {
-    QString szGroup=pAction->data().toString();
+	QString szGroup = pAction->data().toString();
 
-    QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
-	for(int i=0; i<list.count(); i++)
+	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
+	for(int i = 0; i < list.count(); i++)
 	{
-		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i));
-		if(b->type()==RegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)(list.at(i));
+		if(b->type() == RegisteredUsersDialogItemBase::User)
 		{
 			((RegisteredUsersDialogItem *)list.at(i))->user()->setGroup(szGroup);
 		}
@@ -505,34 +519,38 @@ void RegisteredUsersDialog::moveToGroupMenuClicked(QAction *pAction)
 void RegisteredUsersDialog::fillList()
 {
 	m_pListView->clear();
-	KviPointerHashTable<QString,RegisteredUsersGroupItem> groupItems(5,false);
+	KviPointerHashTable<QString, RegisteredUsersGroupItem> groupItems(5, false);
 	groupItems.setAutoDelete(false);
 
-	KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
-	for(KviRegisteredUserGroup * g = pGroups->first();g;g = pGroups->next())
+	KviPointerHashTable<QString, KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
+	for(KviRegisteredUserGroup * g = pGroups->first(); g; g = pGroups->next())
 	{
-		RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,g);
-		groupItems.insert(g->name(),pCur);
+		RegisteredUsersGroupItem * pCur = new RegisteredUsersGroupItem(m_pListView, g);
+		groupItems.insert(g->name(), pCur);
 		pCur->setExpanded(true);
 	}
 
-	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
+	KviPointerHashTable<QString, KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
 	RegisteredUsersDialogItem * item;
 	Q_UNUSED(item);
-	for(KviRegisteredUser * u = d->first();u;u = d->next())
+	for(KviRegisteredUser * u = d->first(); u; u = d->next())
 	{
 		if(u->group().isEmpty())
-			u->setGroup(__tr2qs_ctx("Default","register"));
+			u->setGroup(__tr2qs_ctx("Default", "register"));
 		if(groupItems.find(u->group()))
 		{
-			item = new RegisteredUsersDialogItem(groupItems.find(u->group()),u);
-		} else if(groupItems.find(__tr2qs_ctx("Default","register"))) {
-			item = new RegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default","register")),u);
-		} else { //should never be called
-			KviRegisteredUserGroup* pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr2qs_ctx("Default","register"));
-			RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,pGroup);
-			groupItems.insert(__tr2qs_ctx("Default","register"),pCur);
-			item = new RegisteredUsersDialogItem(pCur,u);
+			item = new RegisteredUsersDialogItem(groupItems.find(u->group()), u);
+		}
+		else if(groupItems.find(__tr2qs_ctx("Default", "register")))
+		{
+			item = new RegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default", "register")), u);
+		}
+		else
+		{ //should never be called
+			KviRegisteredUserGroup * pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr2qs_ctx("Default", "register"));
+			RegisteredUsersGroupItem * pCur = new RegisteredUsersGroupItem(m_pListView, pGroup);
+			groupItems.insert(__tr2qs_ctx("Default", "register"), pCur);
+			item = new RegisteredUsersDialogItem(pCur, u);
 		}
 	}
 	if(m_pListView->topLevelItem(0))
@@ -542,7 +560,7 @@ void RegisteredUsersDialog::fillList()
 	}
 }
 
-void RegisteredUsersDialog::closeEvent(QCloseEvent *e)
+void RegisteredUsersDialog::closeEvent(QCloseEvent * e)
 {
 	m_pListView->clear();
 	e->accept();
@@ -566,11 +584,12 @@ void RegisteredUsersDialog::cancelClicked()
 
 void RegisteredUsersDialog::addClicked()
 {
-	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,0);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, 0);
 	int ret = dlg->exec();
 	delete dlg;
 
-	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
+	if(!g_pRegisteredUsersDialog)
+		return; // we have been deleted!
 
 	if(ret == QDialog::Accepted)
 	{
@@ -580,10 +599,11 @@ void RegisteredUsersDialog::addClicked()
 
 void RegisteredUsersDialog::addWizardClicked()
 {
-	RegistrationWizard * w = new RegistrationWizard("",g_pLocalRegisteredUserDataBase,this,true);
+	RegistrationWizard * w = new RegistrationWizard("", g_pLocalRegisteredUserDataBase, this, true);
 	int ret = w->exec();
 	delete w;
-	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
+	if(!g_pRegisteredUsersDialog)
+		return; // we have been deleted!
 	if(ret == QDialog::Accepted)
 	{
 		fillList();
@@ -593,49 +613,54 @@ void RegisteredUsersDialog::addWizardClicked()
 void RegisteredUsersDialog::removeClicked()
 {
 	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
-	for(int i=0; i<list.count(); i++)
+	for(int i = 0; i < list.count(); i++)
 	{
-		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i));
-		if(b->type()==RegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)(list.at(i));
+		if(b->type() == RegisteredUsersDialogItemBase::User)
 		{
 			g_pLocalRegisteredUserDataBase->removeUser(((RegisteredUsersDialogItem *)list.at(i))->user()->name());
-		} else {
+		}
+		else
+		{
 			g_pLocalRegisteredUserDataBase->removeGroup(((RegisteredUsersGroupItem *)list.at(i))->group()->name());
 		}
 	}
 	fillList();
-// 	RegisteredUsersDialogItem *it = (RegisteredUsersDialogItem *)m_pListView->firstChild();
-// 	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
-// 	if(b->type()==RegisteredUsersDialogItemBase::User)
-// 	{
-// 		KviPointerList<RegisteredUsersDialogItem> l;
-// 		l.setAutoDelete(false);
-// 		while(it)
-// 		{
-// 			if(it->isSelected())l.append(it);
-// 			it = (RegisteredUsersDialogItem *)it->nextSibling();
-// 		}
-//
-// 		for(RegisteredUsersDialogItem * i = l.first();i;i = l.next())
-// 		{
-// 			//g_pLocalRegisteredUserDataBase->removeUser(i->user()->name());
-// 			delete i;
-// 		}
-// 	} else {
-//
-// 	}
+	// 	RegisteredUsersDialogItem *it = (RegisteredUsersDialogItem *)m_pListView->firstChild();
+	// 	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+	// 	if(b->type()==RegisteredUsersDialogItemBase::User)
+	// 	{
+	// 		KviPointerList<RegisteredUsersDialogItem> l;
+	// 		l.setAutoDelete(false);
+	// 		while(it)
+	// 		{
+	// 			if(it->isSelected())l.append(it);
+	// 			it = (RegisteredUsersDialogItem *)it->nextSibling();
+	// 		}
+	//
+	// 		for(RegisteredUsersDialogItem * i = l.first();i;i = l.next())
+	// 		{
+	// 			//g_pLocalRegisteredUserDataBase->removeUser(i->user()->name());
+	// 			delete i;
+	// 		}
+	// 	} else {
+	//
+	// 	}
 }
 
 void RegisteredUsersDialog::editClicked()
 {
-	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(m_pListView->currentItem());
-	if(!b)return;
-	if(b->type()==RegisteredUsersDialogItemBase::User)
+	RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)(m_pListView->currentItem());
+	if(!b)
+		return;
+	if(b->type() == RegisteredUsersDialogItemBase::User)
 	{
-		RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)b;
+		RegisteredUsersDialogItem * i = (RegisteredUsersDialogItem *)b;
 		editItem(i);
-	} else {
-		RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b;
+	}
+	else
+	{
+		RegisteredUsersGroupItem * i = (RegisteredUsersGroupItem *)b;
 		editGroup(i->group());
 	}
 }
@@ -648,24 +673,25 @@ void RegisteredUsersDialog::editItem(RegisteredUsersDialogItem * i)
 
 	QString szName = u->name();
 
-	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,u);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, u);
 	int res = dlg->exec();
 	delete dlg;
 
-	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
+	if(!g_pRegisteredUsersDialog)
+		return; // we have been deleted!
 
 	if(res == QDialog::Accepted)
 	{
 		fillList();
 
 		// select the last edited item
-		for(int c=0;c<m_pListView->topLevelItemCount();c++)
+		for(int c = 0; c < m_pListView->topLevelItemCount(); c++)
 		{
 			QTreeWidgetItem * pGroup = m_pListView->topLevelItem(c);
-			for(int d=0;d<pGroup->childCount();d++)
+			for(int d = 0; d < pGroup->childCount(); d++)
 			{
-				RegisteredUsersDialogItem * pUser = (RegisteredUsersDialogItem*) pGroup->child(d);
-				if(KviQString::equalCI(pUser->user()->name(),szName))
+				RegisteredUsersDialogItem * pUser = (RegisteredUsersDialogItem *)pGroup->child(d);
+				if(KviQString::equalCI(pUser->user()->name(), szName))
 				{
 					pUser->setSelected(true);
 					m_pListView->setCurrentItem(pUser);
@@ -690,7 +716,6 @@ void RegisteredUsersDialog::selectionChanged()
 	m_pExportButton->setEnabled(bHaveSelected);
 }
 
-
 #define KVI_REGUSER_DB_FILE_MAGIC 0x5334DBDB
 #define KVI_REGUSER_DB_FILE_VERSION 1
 
@@ -708,7 +733,7 @@ void RegisteredUsersDialog::exportClicked()
 	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
 
 	//only "user" entries matters, discard groups from count
-	for(int i=0; i<list.count(); i++)
+	for(int i = 0; i < list.count(); i++)
 	{
 		if(((RegisteredUsersDialogItemBase *)list.at(i))->type() == RegisteredUsersDialogItemBase::User)
 			nEntries++;
@@ -716,20 +741,22 @@ void RegisteredUsersDialog::exportClicked()
 
 	if(nEntries < 1)
 	{
-		KviMessageBox::warning(__tr2qs_ctx("No entries selected.","register"));
+		KviMessageBox::warning(__tr2qs_ctx("No entries selected.", "register"));
 		return;
 	}
 
 	QString buffer;
 
-	if(!KviFileDialog::askForSaveFileName(buffer,__tr2qs_ctx("Enter a Filename - KVIrc","register"),0,0,true,true,true,this))return;
+	if(!KviFileDialog::askForSaveFileName(buffer, __tr2qs_ctx("Enter a Filename - KVIrc", "register"), 0, 0, true, true, true, this))
+		return;
 
-	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
+	if(!g_pRegisteredUsersDialog)
+		return; // we have been deleted!
 
 	KviFile f(buffer);
 	if(!f.open(QIODevice::WriteOnly | QIODevice::Truncate))
 	{
-		KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for writing.","register"),&buffer);
+		KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for writing.", "register"), &buffer);
 		return;
 	}
 
@@ -738,76 +765,99 @@ void RegisteredUsersDialog::exportClicked()
 	hf.version = KVI_REGUSER_DB_FILE_VERSION;
 	hf.nentries = nEntries;
 
-	if(f.write((const char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto write_error;
+	if(f.write((const char *)&hf, sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))
+		goto write_error;
 
-	for(int i=0; i<list.count(); i++)
+	for(int i = 0; i < list.count(); i++)
 	{
-		RegisteredUsersDialogItemBase *pBase = (RegisteredUsersDialogItemBase *)list.at(i);
-		if(pBase->type()!=RegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase * pBase = (RegisteredUsersDialogItemBase *)list.at(i);
+		if(pBase->type() != RegisteredUsersDialogItemBase::User)
 			continue;
 
 		KviRegisteredUser * u = ((RegisteredUsersDialogItem *)list.at(i))->user();
 		if(u)
 		{
-			if(!f.save(u->name()))goto write_error;
-			KviPointerHashTable<QString,QString> * pd = u->propertyDict();
+			if(!f.save(u->name()))
+				goto write_error;
+			KviPointerHashTable<QString, QString> * pd = u->propertyDict();
 			if(pd)
 			{
-				if(!f.save(pd->count()))goto write_error;
-				for(KviPointerHashTableEntry<QString,QString> * pCur = pd->firstEntry();pCur;pCur = pd->nextEntry())
+				if(!f.save(pd->count()))
+					goto write_error;
+				for(KviPointerHashTableEntry<QString, QString> * pCur = pd->firstEntry(); pCur; pCur = pd->nextEntry())
 				{
 					QString key = pCur->key();
-					if(!f.save(key))goto write_error;
-					if(!f.save(*(pCur->data())))goto write_error;
+					if(!f.save(key))
+						goto write_error;
+					if(!f.save(*(pCur->data())))
+						goto write_error;
 				}
-			} else {
-				if(!f.save(0))goto write_error;
+			}
+			else
+			{
+				if(!f.save(0))
+					goto write_error;
 			}
 
 			KviPointerList<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;
+					m->mask(fullMask, KviIrcMask::NickUserHost);
+					if(!f.save(fullMask))
+						goto write_error;
 				}
-			} else {
-				if(!f.save(0))goto write_error;
+			}
+			else
+			{
+				if(!f.save(0))
+					goto write_error;
 			}
 
 			QString avatar;
-			if(u->getProperty("avatar",avatar))
+			if(u->getProperty("avatar", avatar))
 			{
-				KviAvatar * av = g_pIconManager->getAvatar(QString(),avatar);
+				KviAvatar * av = g_pIconManager->getAvatar(QString(), avatar);
 				if(av)
 				{
 					if(!av->pixmap()->isNull())
 					{
-						if(!f.save(1))goto write_error;
+						if(!f.save(1))
+							goto write_error;
 						QImageWriter io;
 						io.setDevice(&f);
 						io.setFormat("PNG");
-						if(!io.write(av->pixmap()->toImage()))goto write_error;
-					} else {
-						if(!f.save(0))goto write_error;
+						if(!io.write(av->pixmap()->toImage()))
+							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;
+				else
+				{
+					if(!f.save(0))
+						goto write_error;
+				}
+			}
+			else
+			{
+				if(!f.save(0))
+					goto write_error;
 			}
 		}
 	}
 
 	goto succesfull_export;
 
-
 write_error:
-	KviMessageBox::warning(__tr2qs_ctx("Can't export the registered users database: write error.","register"));
+	KviMessageBox::warning(__tr2qs_ctx("Can't export the registered users database: write error.", "register"));
 	f.close();
 	return;
 
@@ -826,63 +876,74 @@ void RegisteredUsersDialog::importClicked()
 	//KviCString buffer;
 	QString buffer;
 
-	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs_ctx("Select a File - KVIrc","register"),QString(),QString(),false,true,this))return;
+	if(!KviFileDialog::askForOpenFileName(buffer, __tr2qs_ctx("Select a File - KVIrc", "register"), QString(), QString(), false, true, this))
+		return;
 
-	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
+	if(!g_pRegisteredUsersDialog)
+		return; // we have been deleted!
 
 	KviFile f(buffer);
 	if(!f.open(QIODevice::ReadOnly))
 	{
-		KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for reading.","register"),&buffer);
+		KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for reading.", "register"), &buffer);
 		return;
 	}
 
 	KviReguserDbFileHeader hf;
 	unsigned int idx;
 
-	if(f.read((char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto read_error;
+	if(f.read((char *)&hf, sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))
+		goto read_error;
 
 	if(hf.magic != KVI_REGUSER_DB_FILE_MAGIC)
 	{
-		KviMessageBox::warning(__tr2qs_ctx("The file %Q doesn't appear to be a valid registered users database.","register"),&buffer);
+		KviMessageBox::warning(__tr2qs_ctx("The file %Q doesn't appear to be a valid registered users database.", "register"), &buffer);
 		f.close();
 		return;
 	}
 
 	if(hf.version != KVI_REGUSER_DB_FILE_VERSION)
 	{
-		KviMessageBox::warning(__tr2qs_ctx("The file %Q contains an invalid registered users database version.","register"),&buffer);
+		KviMessageBox::warning(__tr2qs_ctx("The file %Q contains an invalid registered users database version.", "register"), &buffer);
 		f.close();
 		return;
 	}
 
-	for(idx = 0;idx < hf.nentries;idx++)
+	for(idx = 0; idx < hf.nentries; idx++)
 	{
 		QString szName;
-		if(!f.load(szName))goto read_error;
+		if(!f.load(szName))
+			goto read_error;
 		KviRegisteredUser * u = g_pLocalRegisteredUserDataBase->getUser(szName);
-		if(!u) goto read_error;
+		if(!u)
+			goto read_error;
 		unsigned int count = 0;
-		if(!f.load(count))goto read_error;
-		for(unsigned int up = 0;up < count;up++)
+		if(!f.load(count))
+			goto read_error;
+		for(unsigned int up = 0; up < count; up++)
 		{
-			QString szKey,szValue;
-			if(!f.load(szKey))goto read_error;
-			if(!f.load(szValue))goto read_error;
-			u->setProperty(szKey,szValue);
+			QString szKey, szValue;
+			if(!f.load(szKey))
+				goto read_error;
+			if(!f.load(szValue))
+				goto read_error;
+			u->setProperty(szKey, szValue);
 		}
-		if(!f.load(count))goto read_error;
-		for(unsigned int um = 0;um < count;um++)
+		if(!f.load(count))
+			goto read_error;
+		for(unsigned int um = 0; um < count; um++)
 		{
 			QString szMask;
-			if(!f.load(szMask))goto read_error;
+			if(!f.load(szMask))
+				goto read_error;
 			if(!szMask.isEmpty())
 			{
 				KviIrcMask * m = new KviIrcMask(szMask);
-				g_pLocalRegisteredUserDataBase->addMask(u,m);
+				g_pLocalRegisteredUserDataBase->addMask(u, m);
 			}
 		}
-		if(!f.load(count))goto read_error;
+		if(!f.load(count))
+			goto read_error;
 		if(count)
 		{
 			// there is an avatar
@@ -890,37 +951,39 @@ void RegisteredUsersDialog::importClicked()
 			QImageReader io;
 			io.setDevice(&f);
 			io.setFormat("PNG");
-			img=io.read();
-//			if(io.read())goto read_error;
+			img = io.read();
+			//			if(io.read())goto read_error;
 
-			if(img.isNull())qDebug("Oops! Read a null image?");
+			if(img.isNull())
+				qDebug("Oops! Read a null image?");
 
 			QString fName = u->name();
 			KviFileUtils::adjustFilePath(fName);
 
 			QString fPath;
-			int rnm = 0 ;
+			int rnm = 0;
 			do
 			{
-				g_pApp->getLocalKvircDirectory(fPath,KviApplication::Avatars,fName);
+				g_pApp->getLocalKvircDirectory(fPath, KviApplication::Avatars, fName);
 				fPath.append(QString("%1.png").arg(rnm));
 				rnm++;
 			} while(KviFileUtils::fileExists(fPath));
 
-			if(!img.save(fPath,"PNG"))
+			if(!img.save(fPath, "PNG"))
 			{
-				qDebug("Can't save image %s",fPath.toUtf8().data());
-			} else {
-				u->setProperty("avatar",fPath);
+				qDebug("Can't save image %s", fPath.toUtf8().data());
+			}
+			else
+			{
+				u->setProperty("avatar", fPath);
 			}
 		}
 	}
 
 	goto succesfull_import;
 
-
 read_error:
-	KviMessageBox::warning(__tr2qs_ctx("Can't import the registered users database: read error.","register"));
+	KviMessageBox::warning(__tr2qs_ctx("Can't import the registered users database: read error.", "register"));
 	f.close();
 	return;