thooge
/
keepassx1
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove old homedir if it's empty

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@286 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 17 years ago
parent d6f675a18b
commit 5c9fb7db4a
2 changed files with 15 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 19
      src/lib/AutoTypeTreeWidget.h
  2. 5
      src/main.cpp

19
src/lib/AutoTypeTreeWidget.h
Unescape View File

@ -18,12 +18,15 @@
class AutoTypeTreeWidget : public QTreeWidget { class AutoTypeTreeWidget : public QTreeWidget {
Q_OBJECT Q_OBJECT
public:
AutoTypeTreeWidget(QWidget* parent):QTreeWidget(parent){} public:
signals: AutoTypeTreeWidget(QWidget* parent):QTreeWidget(parent){};
void returnPressed(QTreeWidgetItem*);
private: signals:
void mouseMoveEvent(QMouseEvent*); void returnPressed(QTreeWidgetItem*);
void keyPressEvent(QKeyEvent*);
private:
void mouseMoveEvent(QMouseEvent*);
void keyPressEvent(QKeyEvent*);
}; };

5
src/main.cpp
Unescape View File

@ -118,8 +118,11 @@ int main(int argc, char **argv)
#ifdef Q_WS_X11 #ifdef Q_WS_X11
{ {
QString OldHomeDir = QDir::homePath()+"/.keepassx"; QString OldHomeDir = QDir::homePath()+"/.keepassx";
if (args.configLocation().isEmpty() && QFile::exists(OldHomeDir+"/config") && !QFile::exists(HomeDir+"/config")) if (args.configLocation().isEmpty() && QFile::exists(OldHomeDir+"/config") && !QFile::exists(HomeDir+"/config")) {
QFile::rename(OldHomeDir+"/config", HomeDir+"/config.ini"); QFile::rename(OldHomeDir+"/config", HomeDir+"/config.ini");
if (QDir(OldHomeDir).entryList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden|QDir::System).count()==0)
QDir().rmdir(OldHomeDir);
}
} }
#else #else
if (args.configLocation().isEmpty() && QFile::exists(HomeDir+"/config") && !QFile::exists(HomeDir+"/config.ini")) if (args.configLocation().isEmpty() && QFile::exists(HomeDir+"/config") && !QFile::exists(HomeDir+"/config.ini"))