summaryrefslogtreecommitdiff
path: root/core/apps/textedit/textedit.cpp
Side-by-side diff
Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp100
1 files changed, 39 insertions, 61 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 61beac5..4bbc62b 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -852,13 +852,2 @@ bool TextEdit::saveAs() {
odebug << "saveAsFile " + currentFileName << oendl;
- // case of nothing to save...
-// if ( !doc && !currentFileName.isEmpty()) {
-// //|| !bFromDocView)
-// odebug << "no doc" << oendl;
-// return true;
-// }
-// if ( !editor->edited() ) {
-// delete doc;
-// doc = 0;
-// return true;
-// }
@@ -869,5 +858,5 @@ bool TextEdit::saveAs() {
|| currentFileName == tr("Unnamed")
- || currentFileName == tr("Text Editor")) {
+ || currentFileName == tr("Text Editor"))
+ {
odebug << "do silly TT filename thing" << oendl;
-// if ( doc && doc->name().isEmpty() ) {
QString pt = rt.simplifyWhiteSpace();
@@ -875,5 +864,4 @@ bool TextEdit::saveAs() {
QString docname = pt;
- if ( i > 0 )
- docname = pt.left( i );
- // remove "." at the beginning
+ if ( i > 0 ) docname = pt.left( i );
+
while( docname.startsWith( "." ) )
@@ -881,13 +869,11 @@ bool TextEdit::saveAs() {
docname.replace( QRegExp("/"), "_" );
- // cut the length. filenames longer than that
- //don't make sense and something goes wrong when they get too long.
- if ( docname.length() > 40 )
- docname = docname.left(40);
- if ( docname.isEmpty() )
- docname = tr("Unnamed");
+ // Cut the length. Filenames longer than 40 are not helpful
+ // and something goes wrong when they get too long.
+ if ( docname.length() > 40 ) docname = docname.left(40);
+
+ if ( docname.isEmpty() ) docname = tr("Unnamed");
+
if(doc) doc->setName(docname);
+
currentFileName=docname;
-// }
-// else
-// odebug << "hmmmmmm" << oendl;
}
@@ -908,8 +894,7 @@ bool TextEdit::saveAs() {
dire = QPEApplication::documentDir();
+
QString str;
if( !featureAutoSave) {
- str = OFileDialog::getSaveFileName( 2,
- dire,
- filee, map);
- } else
+ str = OFileDialog::getSaveFileName( 2, dire, filee, map);
+ } else
str = currentFileName;
@@ -923,31 +908,26 @@ bool TextEdit::saveAs() {
if(doc)
-// QString file = doc->file();
-// doc->removeFiles();
delete doc;
- DocLnk nf;
- nf.setType("text/plain");
- nf.setFile( fileNm);
- doc = new DocLnk(nf);
-// editor->setText(rt);
- odebug << "Saving file as "+currentFileName << oendl;
- doc->setName( fi.baseName() /*currentFileName*/);
- updateCaption( currentFileName);
-
- FileManager fm;
- if ( !fm.saveFile( *doc, rt ) ) {
- QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
- return false;
- }
-
- if( filePerms ) {
- filePermissions *filePerm;
- filePerm = new filePermissions(this,
- tr("Permissions"),true,
- 0,(const QString &)fileNm);
- QPEApplication::execDialog( filePerm );
-
- if( filePerm)
- delete filePerm;
- }
-// }
+
+ DocLnk nf;
+ nf.setType("text/plain");
+ nf.setFile( fileNm);
+ doc = new DocLnk(nf);
+ odebug << "Saving file as "+currentFileName << oendl;
+ doc->setName( fi.baseName() );
+ updateCaption( currentFileName);
+
+ FileManager fm;
+ if ( !fm.saveFile( *doc, rt ) ) {
+ QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
+ return false;
+ }
+
+ if( filePerms ) {
+ filePermissions *filePerm;
+ filePerm = new filePermissions(this, tr("Permissions"),true, 0,
+ (const QString &)fileNm);
+ QPEApplication::execDialog( filePerm );
+
+ delete filePerm;
+ }
editor->setEdited( false);
@@ -1199,6 +1179,4 @@ void TextEdit::doGoto() {
- if(gotoEdit) {
- delete gotoEdit;
- gotoEdit = 0;
- }
+ delete gotoEdit;
+ gotoEdit = 0;