Fixed: binary not installed

Removed unused variables and fixed some other compiler warnings

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

src/Kdb3Database.cpp

@@ -367,9 +367,9 @@ bool Kdb3Database::createGroupTree(QList<quint32>& Levels){
 			Groups[i].Index=RootGroup.Childs.size();
 			RootGroup.Childs.append(&Groups[i]);
 			continue;}
-		int j=i-1;
+		int j;
 		//the first item with a lower level is the parent
-		for(j;j>=0;j--){
+		for(j=i-1;j>=0;j--){
 			if(Levels[j]<Levels[i]){
 				if(Levels[i]-Levels[j]!=1)return false;
 				break;
@@ -507,7 +507,6 @@ if(memcmp(ContentsHash, FinalKey, 32) != 0){
 	KeyError=true;
 	return false;}
 
-unsigned long tmp_id=0;
 unsigned long pos = DB_HEADER_SIZE;
 quint16 FieldType;
 quint32 FieldSize;
@@ -584,7 +583,6 @@ if(!createGroupTree(Levels)){
 	return false;
 }
 
-unsigned long CurGID, g, e, z, num;
 delete [] buffer;
 
 //Remove the metastreams from the entry list
@@ -760,8 +758,6 @@ void Kdb3Database::authByPwd(QString& Password){
 	QByteArray lat,utf;
 	utf=Password.toUtf8();
 	lat=Password.toLatin1();
-	char *Lat=lat.data();
-	char *Utf=utf.data();
 	return;
 }
 
@@ -850,7 +846,6 @@ QList<IEntryHandle*> Kdb3Database::entries(IGroupHandle* group){
 
 void Kdb3Database::deleteEntry(IEntryHandle* entry){
 	if(!entry)return;
-	StdGroup* Group=((EntryHandle*)entry)->Entry->Group;
 	int j;
 	for(j=0;j<Entries.size();j++){
 		if(&Entries[j]==((EntryHandle*)entry)->Entry)

src/crypto/arcfour.cpp

@@ -36,7 +36,6 @@ RawKey=QByteArray((const char*)key_data_ptr,key_data_len);
 }
 
 void CArcFour::prepareKey(){
- unsigned char swapByte;
  unsigned char index1;
  unsigned char index2;
  unsigned char* state;

src/crypto/blowfish.cpp

@@ -227,7 +227,7 @@ static const uint32_t ps[BLOWFISH_ROUNDS + 2] = {
 };
 
 Blowfish::Blowfish()
-{	static bool mustSelfTest = false;
+{
 }
 
 void Blowfish::burn_stack(int bytes)

src/dialogs/AddBookmarkDlg.cpp

@@ -69,4 +69,4 @@ void AddBookmarkDlg::OnButtonOk(){
 	else
 		KpxBookmarks::edit(Edit_Title->text(),Edit_Filename->text(),ItemID);
 	accept();
-}
+}

src/lib/EntryView.cpp

@@ -97,12 +97,11 @@ void KeepassEntryView::OnItemsChanged(){
 }
 
 bool sortSearchResultsLessThan(const IEntryHandle* a, const IEntryHandle* b){
-	int indexA=0;
-	int indexB=0;
-	for(indexA;indexA<pItems->size();indexA++){
+	int indexA, indexB;
+	for(indexA=0;indexA<pItems->size();indexA++){
 		if((*pItems)[indexA]->EntryHandle==a)break;
 	}
-	for(indexB;indexB<pItems->size();indexB++){
+	for(indexB=0;indexB<pItems->size();indexB++){
 		if((*pItems)[indexB]->EntryHandle==b)break;
 	}
 	return pEntryView->indexOfTopLevelItem((*pItems)[indexA])<pEntryView->indexOfTopLevelItem((*pItems)[indexB]);

src/lib/WaitAnimationWidget.cpp

@@ -55,7 +55,7 @@ void WaitAnimationWidget::stop(){
 
 void WaitAnimationWidget::setRefreshRate(int fps){
 	DiffAngle=1.0f/((60.0f/(float)speed)*(float)fps);
-	timer.setInterval((1.0f/(float)fps)*1000.0f);
+	timer.setInterval((int) ((1.0f/(float)fps)*1000.0f));
 }
 
 void WaitAnimationWidget::refreshAnimation(){

src/lib/bookmarks.cpp

@@ -60,7 +60,7 @@ int KpxBookmarks::add(const QString& Title,const QString& Path){
 	return Bookmarks.size()-1;
 }
 
-bool KpxBookmarks::save(){
+void KpxBookmarks::save(){
 	for (int i=0;i<count();i++){
 		config->settings.setValue( QString("Bookmarks/%1/Title").arg(i+1), Bookmarks[i].Title );
 		config->settings.setValue( QString("Bookmarks/%1/Path").arg(i+1), Bookmarks[i].Path );

src/lib/bookmarks.h

@@ -33,7 +33,7 @@ class KpxBookmarks {
 		static QString title(int Index);
 		static QString path(int Index);
 	private:
-		static bool save();
+		static void save();
 		class BookmarkEntry {
 			public:
 				QString Title;

src/main.cpp

@@ -473,8 +473,8 @@ QString makePathRelative(const QString& AbsDir,const QString& CurDir){
 	QStringList abs=AbsDir.split('/');
 	QStringList cur=CurDir.split('/');
 	QString rel="./";
-	int common=0;
-	for(common; common < abs.size() && common < cur.size(); common++){
+	int common;
+	for(common=0; common < abs.size() && common < cur.size(); common++){
 		if(abs[common]!=cur[common])break;
 	}
 	for(int i=0;i<cur.size()-common;i++)

src/mainwindow.cpp

@@ -1099,7 +1099,6 @@ void KeepassMainWindow::OnViewToolbarIconSize28(bool state){
 
 void KeepassMainWindow::OnSysTrayActivated(QSystemTrayIcon::ActivationReason reason){
 	if(reason!=QSystemTrayIcon::Context){
-		bool unlockActive = (unlockDlg!=NULL && unlockDlg->isActiveWindow());
 		if (isVisible()){
 			if (unlockDlg!=NULL)
 				unlockDlg->reject();

src/src.pro

@@ -31,7 +31,7 @@ unix : !macx : !isEqual(QMAKE_WIN32,1) {
         }
     }
     TARGET = ../bin/keepassx
-    TARGET.path = $${PREFIX}/bin
+    target.path = $${PREFIX}/bin
     data.path = $${PREFIX}/share
     pixmaps.files = ../share/pixmaps/*
     pixmaps.path = $${PREFIX}/share/pixmaps
@@ -59,7 +59,7 @@ unix : !macx : !isEqual(QMAKE_WIN32,1) {
 macx {
     isEmpty(PREFIX):PREFIX = /Applications
     TARGET = ../bin/KeePassX
-    TARGET.path = $${PREFIX}
+    target.path = $${PREFIX}
     data.path = Contents/Resources
     isEmpty(QT_FRAMEWORK_DIR) : QT_FRAMEWORK_DIR = /Library/Frameworks
     private_frameworks.files += $${QT_FRAMEWORK_DIR}/QtCore.framework
@@ -82,7 +82,7 @@ isEqual(QMAKE_WIN32,1) {
     CONFIG += windows
     isEmpty(PREFIX):PREFIX = "C:/Program files/KeePassX"
     TARGET = ../bin/KeePassX
-    TARGET.path = $${PREFIX}
+    target.path = $${PREFIX}
     data.path = $${PREFIX}/share
     RC_FILE = ../share/ico/keepassx.rc
     QMAKE_LINK_OBJECT_SCRIPT = $${OBJECTS_DIR}/$${QMAKE_LINK_OBJECT_SCRIPT}
@@ -90,7 +90,7 @@ isEqual(QMAKE_WIN32,1) {
 
 
 data.files += ../share/keepassx
-INSTALLS += TARGET data
+INSTALLS += target data
 
 contains(DEFINES,GLOBAL_AUTOTYPE) {
     FORMS += forms/AutoTypeDlg.ui