diff --git a/src/Kdb3Database.cpp b/src/Kdb3Database.cpp index 0e7bb4b..a9a06a7 100644 --- a/src/Kdb3Database.cpp +++ b/src/Kdb3Database.cpp @@ -367,9 +367,9 @@ bool Kdb3Database::createGroupTree(QList& 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] Kdb3Database::entries(IGroupHandle* group){ void Kdb3Database::deleteEntry(IEntryHandle* entry){ if(!entry)return; - StdGroup* Group=((EntryHandle*)entry)->Entry->Group; int j; for(j=0;jEntry) diff --git a/src/crypto/arcfour.cpp b/src/crypto/arcfour.cpp index 0df7980..d47c764 100644 --- a/src/crypto/arcfour.cpp +++ b/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; diff --git a/src/crypto/blowfish.cpp b/src/crypto/blowfish.cpp index 8050dd5..ed7b63e 100644 --- a/src/crypto/blowfish.cpp +++ b/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) diff --git a/src/dialogs/AddBookmarkDlg.cpp b/src/dialogs/AddBookmarkDlg.cpp index 3323e2d..82276db 100644 --- a/src/dialogs/AddBookmarkDlg.cpp +++ b/src/dialogs/AddBookmarkDlg.cpp @@ -69,4 +69,4 @@ void AddBookmarkDlg::OnButtonOk(){ else KpxBookmarks::edit(Edit_Title->text(),Edit_Filename->text(),ItemID); accept(); -} \ No newline at end of file +} diff --git a/src/lib/EntryView.cpp b/src/lib/EntryView.cpp index 2c5fde8..7fbcf32 100644 --- a/src/lib/EntryView.cpp +++ b/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;indexAsize();indexA++){ + int indexA, indexB; + for(indexA=0;indexAsize();indexA++){ if((*pItems)[indexA]->EntryHandle==a)break; } - for(indexB;indexBsize();indexB++){ + for(indexB=0;indexBsize();indexB++){ if((*pItems)[indexB]->EntryHandle==b)break; } return pEntryView->indexOfTopLevelItem((*pItems)[indexA])indexOfTopLevelItem((*pItems)[indexB]); diff --git a/src/lib/WaitAnimationWidget.cpp b/src/lib/WaitAnimationWidget.cpp index 73681a3..564ac36 100644 --- a/src/lib/WaitAnimationWidget.cpp +++ b/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(){ diff --git a/src/lib/bookmarks.cpp b/src/lib/bookmarks.cpp index 7eef472..f2fe5ae 100644 --- a/src/lib/bookmarks.cpp +++ b/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;isettings.setValue( QString("Bookmarks/%1/Title").arg(i+1), Bookmarks[i].Title ); config->settings.setValue( QString("Bookmarks/%1/Path").arg(i+1), Bookmarks[i].Path ); diff --git a/src/lib/bookmarks.h b/src/lib/bookmarks.h index 468373c..7bcacc2 100644 --- a/src/lib/bookmarks.h +++ b/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; diff --git a/src/main.cpp b/src/main.cpp index db219fd..77da3a8 100644 --- a/src/main.cpp +++ b/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;iisActiveWindow()); if (isVisible()){ if (unlockDlg!=NULL) unlockDlg->reject(); diff --git a/src/src.pro b/src/src.pro index 3b1096e..9310da8 100644 --- a/src/src.pro +++ b/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