summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-02-06 03:49:06 (UTC)
committer llornkcor <llornkcor>2005-02-06 03:49:06 (UTC)
commitb09f9ce74d40f47bc336b4647c6c091a4f3bd5b6 (patch) (side-by-side diff)
tree212816ea85f372b28c22c85b3dbf1e6d4dcfa887
parentd0af8c31f8c74d8aa90477ad672dd876b661eba1 (diff)
downloadopie-b09f9ce74d40f47bc336b4647c6c091a4f3bd5b6.zip
opie-b09f9ce74d40f47bc336b4647c6c091a4f3bd5b6.tar.gz
opie-b09f9ce74d40f47bc336b4647c6c091a4f3bd5b6.tar.bz2
fix #1472 - no prompt on esc exit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp49
1 files changed, 26 insertions, 23 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index c7273c5..26b907b 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -418,3 +418,11 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
TextEdit::~TextEdit() {
- owarn << "textedit d'tor" << oendl;
+ if( edited1 && !promptExit) {
+ switch( savePrompt() ) {
+ case 1: {
+ saveAs();
+ }
+ break;
+ };
+ }
+
delete editor;
@@ -423,26 +431,21 @@ TextEdit::~TextEdit() {
void TextEdit::closeEvent(QCloseEvent *) {
- if( edited1 && promptExit)
- {
- switch( savePrompt() )
- {
- case 1:
- {
- saveAs();
- qApp->quit();
- }
- break;
-
- case 2:
- {
- qApp->quit();
- }
- break;
-
- case -1:
- break;
- };
- }
+ if( promptExit) {
+ switch( savePrompt() ) {
+ case 1: {
+ saveAs();
+ qApp->quit();
+ }
+ break;
+
+ case 2: {
+ qApp->quit();
+ }
+ break;
+
+ case -1:
+ break;
+ };
+ }
else
qApp->quit();
-
}