More fixes for "automatically lock database"

Removed some unneeded includes
Improved code formatting

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

src/lib/EntryView.cpp

@@ -563,8 +563,9 @@ void KeepassEntryView::mouseMoveEvent(QMouseEvent *event){
 	mimeData->setData("text/plain;charset=UTF-8",DragItems.first()->text(0).toUtf8());
 	mimeData->setData("application/x-keepassx-entry",QByteArray((char*)&pDragItems,sizeof(void*)));
 	drag->setMimeData(mimeData);
+	EventOccurredBlock = true;
 	drag->exec(Qt::MoveAction);
-
+	EventOccurredBlock = false;
 }
 
 void KeepassEntryView::removeDragItems(){

src/lib/EntryView.h

@@ -69,7 +69,7 @@ class KeepassEntryView:public QTreeWidget{
 		virtual void resizeEvent(QResizeEvent* event);
 		virtual void mousePressEvent(QMouseEvent *event);
 		virtual void mouseMoveEvent(QMouseEvent *event);
-	public slots:
+	private slots:
 		void OnColumnResized(int index,int OldSize, int NewSize);
 		void OnHeaderSectionClicked(int index);
 		void OnGroupChanged(IGroupHandle* group);

src/lib/GroupView.cpp

@@ -467,7 +467,9 @@ void KeepassGroupView::mouseMoveEvent(QMouseEvent *event){
 	mimeData->setData("application/x-keepassx-group",QByteArray());
 	drag->setMimeData(mimeData);
 
+	EventOccurredBlock = true;
 	drag->exec(Qt::MoveAction);
+	EventOccurredBlock = false;
 }
 
 void KeepassGroupView::OnItemExpanded(QTreeWidgetItem* item){

src/lib/GroupView.h

@@ -58,7 +58,7 @@ class KeepassGroupView:public QTreeWidget{
 		GroupViewDragType DragType;
 		QList<QTreeWidgetItem*>* EntryDragItems;
 	
-	public slots:
+	private slots:
 		void OnCurrentGroupChanged(QTreeWidgetItem*);
 		void OnDeleteGroup();
 		void OnNewGroup();

src/lib/UrlLabel.h

@@ -22,24 +22,25 @@
 #define _LINKLABEL_H_
 
 class LinkLabel : public QLabel{
-Q_OBJECT
-public:
-LinkLabel(QWidget *parent,const QString& text=QString::null, int x=0, int y=0,Qt::WFlags f=0);
-~LinkLabel();
-void setPos(int x,int y);
-QString url();
+	Q_OBJECT
+	
+	public:
+		LinkLabel(QWidget *parent,const QString& text=QString::null, int x=0, int y=0,Qt::WFlags f=0);
+		~LinkLabel();
+		void setPos(int x,int y);
+		QString url();
 
-public slots:
-virtual void setText(const QString&);
+	public slots:
+		virtual void setText(const QString&);
 
-signals:
- void clicked();
+	signals:
+		void clicked();
 
-protected:
-virtual void mouseReleaseEvent(QMouseEvent* event);
+	protected:
+		virtual void mouseReleaseEvent(QMouseEvent* event);
 
-private:
-QString URL;
+	private:
+		QString URL;
 
 };
 

src/lib/WaitAnimationWidget.h

@@ -28,7 +28,7 @@ class WaitAnimationWidget:public QWidget{
 		void setRefreshRate(int fps);
 		void start();
 		void stop();
-	public slots:
+	private slots:
 		void refreshAnimation();
 	private:
 		virtual void paintEvent(QPaintEvent* event);