Some code cleanup

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@278 b624d157-de02-0410-bad0-e51aec6abb33

src/dialogs/DatabaseSettingsDlg.cpp

@@ -42,8 +42,7 @@ CDbSettingsDlg::CDbSettingsDlg(QWidget* parent,IDatabase* db,  bool modal, Qt::W
 	connect( ButtonBench, SIGNAL( clicked() ), this, SLOT( OnBenchmark() ) );
 }
 
-CDbSettingsDlg::~CDbSettingsDlg()
+CDbSettingsDlg::~CDbSettingsDlg(){
-{
 }
 
 void CDbSettingsDlg::paintEvent(QPaintEvent *event){

src/dialogs/EditEntryDlg.cpp

@@ -238,19 +238,17 @@ void CEditEntryDlg::OnButtonCancel()
 
 void CEditEntryDlg::ChangeEchoMode()
 {
-if(Edit_Password->echoMode()==QLineEdit::Normal){
+	if(Edit_Password->echoMode()==QLineEdit::Normal){
-Edit_Password->setEchoMode(QLineEdit::Password);
+		Edit_Password->setEchoMode(QLineEdit::Password);
-Edit_Password_w->setEchoMode(QLineEdit::Password);
+		Edit_Password_w->setEchoMode(QLineEdit::Password);
-ButtonEchoMode->setIcon(getIcon("pwd_hide"));
+		ButtonEchoMode->setIcon(getIcon("pwd_hide"));
-}
+	}
-else
+	else
-{
+	{
-Edit_Password->setEchoMode(QLineEdit::Normal);
+		Edit_Password->setEchoMode(QLineEdit::Normal);
-Edit_Password_w->setEchoMode(QLineEdit::Normal);
+		Edit_Password_w->setEchoMode(QLineEdit::Normal);
-ButtonEchoMode->setIcon(getIcon("pwd_show"));
+		ButtonEchoMode->setIcon(getIcon("pwd_show"));
-}
+	}
-
-
 }
 
 void CEditEntryDlg::OnTitleTextChanged(const QString& txt)
@@ -260,42 +258,35 @@ void CEditEntryDlg::OnTitleTextChanged(const QString& txt)
 
 void CEditEntryDlg::OnPasswordTextChanged()
 {
-Edit_Password_w->setText(QString());
+	Edit_Password_w->setText(QString());
-int bits=(Edit_Password->text().length()*8);
+	int bits=(Edit_Password->text().length()*8);
-Label_Bits->setText(QString::number(bits)+" Bit");
+	Label_Bits->setText(QString::number(bits)+" Bit");
-if(bits>128)bits=128;
+	if(bits>128)bits=128;
-Progress_Quali->setValue(100*bits/128);
+	Progress_Quali->setValue(100*bits/128);
 }
 
 void CEditEntryDlg::OnPasswordwTextChanged()
 {
-
+	if(QString::compare(Edit_Password_w->text(),Edit_Password->text().mid(0,(Edit_Password_w->text().length())))!=0){
-if(QString::compare(Edit_Password_w->text(),Edit_Password->text().mid(0,(Edit_Password_w->text().length())))!=0){
 		QPalette palette;
 		palette.setColor(Edit_Password_w->backgroundRole(),QColor(255,125,125));
 		Edit_Password_w->setPalette(palette);
-}else
+	}
-{
+	else {
 		Edit_Password_w->setPalette(QApplication::palette());
-}
+	}
-
-
-
 }
 
 void CEditEntryDlg::OnPasswordwLostFocus()
 {
-if(QString::compare(Edit_Password_w->text(),Edit_Password->text())!=0){
+	if (QString::compare(Edit_Password_w->text(),Edit_Password->text())!=0){
 		QPalette palette;
 		palette.setColor(Edit_Password_w->backgroundRole(),QColor(255,125,125));
 		Edit_Password_w->setPalette(palette);
-}
+	}
-else
+	else {
-{
 		Edit_Password_w->setPalette(QApplication::palette ());
-}
+	}
-
-
 }
 
 void CEditEntryDlg::OnNewAttachment()
@@ -303,7 +294,7 @@ void CEditEntryDlg::OnNewAttachment()
 	QString filename=QFileDialog::getOpenFileName(this,tr("Add Attachment..."),QDir::homePath());
 	if(filename=="")return;
 	QFile file(filename);
-	if(file.open(QIODevice::ReadOnly)==false){
+	if(!file.open(QIODevice::ReadOnly)){
 		file.close();
 		QMessageBox::warning(NULL,tr("Error"),tr("Could not open file."),tr("OK"));
 		return;
@@ -353,12 +344,13 @@ void CEditEntryDlg::saveAttachment(IEntryHandle* pEntry, QWidget* ParentWidget)
 		return;
 	}
 	file.close();
-
 }
 
 void CEditEntryDlg::OnDeleteAttachment()
 {
-	int r=QMessageBox::warning(this,tr("Delete Attachment?"),tr("You are about to delete the attachment of this entry.\nAre you sure?"),tr("Yes"),tr("No, Cancel"),NULL,1,1);
+	int r=QMessageBox::warning(this,tr("Delete Attachment?"),
+			tr("You are about to delete the attachment of this entry.\nAre you sure?"),
+			tr("Yes"),tr("No, Cancel"),NULL,1,1);
 	if(r==0){
 		ModFlag=true;
 		entry->setBinary(QByteArray());

src/dialogs/EditGroupDlg.cpp

@@ -52,8 +52,7 @@ CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* pa
 	connect( Button_Icon, SIGNAL( clicked() ), this, SLOT( OnIconDlg() ));
 }
 
-CEditGroupDialog::~CEditGroupDialog()
+CEditGroupDialog::~CEditGroupDialog(){
-{
 }
 
 void CEditGroupDialog::showEvent(QShowEvent *event){

src/dialogs/SearchDlg.cpp

@@ -90,6 +90,3 @@ void SearchDialog::paintEvent(QPaintEvent *event){
 	painter.setClipRegion(event->region());
 	painter.drawPixmap(QPoint(0,0),BannerPixmap);
 }
-
-
-

src/lib/EntryView.cpp

@@ -251,7 +251,7 @@ void KeepassEntryView::editEntry(EntryViewItem* item){
 
 void KeepassEntryView::OnNewEntry(){
 	IEntryHandle* NewEntry = NULL;
-	if (!CurrentGroup){// We must be viewing search results. Add the new entry to the first group.		
+	if (!CurrentGroup){ // We must be viewing search results. Add the new entry to the first group.
 		if (db->groups().size() > 0)
 			NewEntry=db->newEntry(db->sortedGroups()[0]);
 		else{

src/lib/UrlLabel.cpp

@@ -22,25 +22,27 @@
 #include "UrlLabel.h"
 
 LinkLabel::LinkLabel(QWidget *parent,const QString& text, int x, int y,Qt::WFlags f) : QLabel(parent,f){
-QFont font(parentWidget()->font()); font.setUnderline(true);
+	QFont font(parentWidget()->font());
-setFont(font);
+	font.setUnderline(true);
-QPalette palette;
+	setFont(font);
-palette.setColor(foregroundRole(),QColor(20,20,255));
+	QPalette palette;
-setPalette(palette);
+	palette.setColor(foregroundRole(),QColor(20,20,255));
-setCursor(Qt::PointingHandCursor);
+	setPalette(palette);
-setText(text);
+	setCursor(Qt::PointingHandCursor);
-setPos(x,y);
+	setText(text);
+	setPos(x,y);
 }
 
 LinkLabel::~LinkLabel(){
-
 }
 
 QString LinkLabel::url(){
-if(URL!=QString())return URL;
+	if(URL!=QString())
-if(text().contains("@"))
+		return URL;
+	else if(text().contains("@"))
 		return QString("mailto:")+text();
-else return text();
+	else
+		return text();
 }
 
 void LinkLabel::mouseReleaseEvent(QMouseEvent* event){
@@ -51,11 +53,11 @@ void LinkLabel::mouseReleaseEvent(QMouseEvent* event){
 }
 
 void LinkLabel::setPos(int x,int y){
-QFontMetrics fm(font());
+	QFontMetrics fm(font());
-setGeometry(x,y,fm.width(text()),fm.height());
+	setGeometry(x,y,fm.width(text()),fm.height());
 }
 
 void LinkLabel::setText(const QString& text){
-QLabel::setText(text);
+	QLabel::setText(text);
-setPos(geometry().x(),geometry().y());
+	setPos(geometry().x(), geometry().y());
 }