aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-15 18:04:42 +0000
committerubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-15 18:04:42 +0000
commitb9d14d4165d9595e0e669af33a840d700ed4e8f0 (patch)
treea234ead3dd736e300e3e7e4cac51786c3e25b332
parentmainwindow reloadable, e.g. when translation changes (diff)
downloadgpg4usb-b9d14d4165d9595e0e669af33a840d700ed4e8f0.tar.gz
gpg4usb-b9d14d4165d9595e0e669af33a840d700ed4e8f0.zip
restart app after loading old qgq4usb config
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@742 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--gpgconstants.h2
-rw-r--r--main.cpp1
-rw-r--r--mainwindow.h2
-rw-r--r--wizard.cpp4
-rw-r--r--wizard.h1
5 files changed, 6 insertions, 4 deletions
diff --git a/gpgconstants.h b/gpgconstants.h
index 4b1df2f..e01083c 100644
--- a/gpgconstants.h
+++ b/gpgconstants.h
@@ -24,6 +24,8 @@
class QString;
+const int RESTART_CODE = 1000;
+
class GpgConstants
{
public:
diff --git a/main.cpp b/main.cpp
index d170967..c2380d3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,6 +21,7 @@
#include <QApplication>
#include "mainwindow.h"
+#include "gpgconstants.h"
int main(int argc, char *argv[])
{
diff --git a/mainwindow.h b/mainwindow.h
index 5c972e3..bd4ef5f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -56,8 +56,6 @@ class QApplication;
class QDockWidget;
QT_END_NAMESPACE
-const int RESTART_CODE = 1000;
-
/**
* @brief
*
diff --git a/wizard.cpp b/wizard.cpp
index cf1a47b..aa157e3 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -20,7 +20,7 @@
#include <QtGui>
- #include "wizard.h"
+#include "wizard.h"
Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
: QWizard(parent)
@@ -217,7 +217,7 @@ bool ImportPage::importKeysFromGpg4usb()
mKeyMgmt->importKeys(inBuffer);
}
- qApp->exit();
+ qApp->exit(RESTART_CODE);
return true;
}
diff --git a/wizard.h b/wizard.h
index e451a28..0404c48 100644
--- a/wizard.h
+++ b/wizard.h
@@ -26,6 +26,7 @@
#include <QWizard>
#include "keygendialog.h"
#include "keymgmt.h"
+#include "gpgconstants.h"
class QCheckBox;
class QLabel;