From 25493735fd0ebb2c0f87ed29462e10e23d3839a5 Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Fri, 20 Feb 2009 20:08:08 +0000
Subject: [PATCH] Remove unused actions

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@269 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/Kdb3Database.cpp    |  1 +
 src/forms/MainWindow.ui | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/Kdb3Database.cpp b/src/Kdb3Database.cpp
index bd6fc06..25c06ce 100644
--- a/src/Kdb3Database.cpp
+++ b/src/Kdb3Database.cpp
@@ -868,6 +868,7 @@ bool Kdb3Database::setKey(const QString& password,const QString& keyfile){
 	if(!keyfile.isEmpty())
 		return setFileKey(keyfile);
 	Q_ASSERT(false);
+	return false;
 }
 
 bool Kdb3Database::setPasswordKey(const QString& Password){
diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui
index a604aa1..d22fc48 100644
--- a/src/forms/MainWindow.ui
+++ b/src/forms/MainWindow.ui
@@ -535,16 +535,6 @@
     <string>2&amp;8x28</string>
    </property>
   </action>
-  <action name="FileNewKdbAction" >
-   <property name="text" >
-    <string>Standard KeePass Single User Database (*.kdb)</string>
-   </property>
-  </action>
-  <action name="FileNewKxdbAction" >
-   <property name="text" >
-    <string>Advanced KeePassX Database (*.kxdb)</string>
-   </property>
-  </action>
   <action name="FileNewAction" >
    <property name="text" >
     <string>&amp;New Database...</string>
@@ -604,11 +594,6 @@
     <string>Sort groups</string>
    </property>
   </action>
-  <action name="EditGroupSortDesc" >
-   <property name="text" >
-    <string>Sort in descending oder</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>