summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp10
-rw-r--r--core/apps/textedit/textedit.cpp100
-rw-r--r--noncore/applets/notesapplet/notes.cpp2
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp2
4 files changed, 49 insertions, 65 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index f4ca0bf..5c40569 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -216,12 +216,18 @@ static void konsoleInit(const char** shell) {
odebug << "Fake Ctrl and Alt defined" << oendl;
QPEApplication::grabKeyboard(); // for CTRL and ALT
#endif
+ if (!shell) {
+ owarn << "No double pointer 'shell'" << oendl;
+ return;
+ }
+
*shell = getenv("SHELL");
- owarn << "SHell initially is " << *shell << "" << oendl;
+ if (*shell)
+ owarn << "Current shell: " << *shell << "" << oendl;
- if (shell == NULL || *shell == '\0') {
+ if (*shell == NULL || **shell == '\0') {
struct passwd *ent = 0;
uid_t me = getuid();
*shell = "/bin/sh";
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
@@ -849,48 +849,34 @@ bool TextEdit::saveAs() {
if(caption() == tr("Text Editor"))
return false;
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;
-// }
QString rt = editor->text();
odebug << currentFileName << oendl;
if( currentFileName.isEmpty()
|| 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();
int i = pt.find( ' ' );
QString docname = pt;
- if ( i > 0 )
- docname = pt.left( i );
- // remove "." at the beginning
+ if ( i > 0 ) docname = pt.left( i );
+
while( docname.startsWith( "." ) )
docname = docname.mid( 1 );
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;
}
QMap<QString, QStringList> map;
@@ -905,14 +891,13 @@ bool TextEdit::saveAs() {
QString filee = cuFi.fileName();
QString dire = cuFi.dirPath();
if(dire==".")
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;
if(!str.isEmpty()) {
QString fileNm=str;
@@ -920,37 +905,32 @@ bool TextEdit::saveAs() {
odebug << "saving filename "+fileNm << oendl;
QFileInfo fi(fileNm);
currentFileName=fi.fileName();
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);
edited1 = false;
edited = false;
if(caption().left(1)=="*")
@@ -1196,12 +1176,10 @@ void TextEdit::gotoLine() {
void TextEdit::doGoto() {
QString number = gotoEdit->text();
gotoEdit->hide();
- if(gotoEdit) {
- delete gotoEdit;
- gotoEdit = 0;
- }
+ delete gotoEdit;
+ gotoEdit = 0;
bool ok;
int lineNumber = number.toInt(&ok, 10);
if( editor->numLines() < lineNumber)
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index 13f297e..61a47d7 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -234,9 +234,9 @@ void NotesControl::showMenu() {
m->insertItem( tr( "Delete" ), this, SLOT( slotDeleteButton() ));
m->setFocus();
m->exec( QCursor::pos() );
- if(m) delete m;
+ delete m;
}
void NotesControl::focusOutEvent ( QFocusEvent * e) {
if( e->reason() == QFocusEvent::Popup)
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 828f5a1..cf19ba8 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -495,9 +495,9 @@ void AdvancedFm::showFileMenu() {
m->setFocus();
m->exec(QPoint(QCursor::pos().x(),QCursor::pos().y()));
- if(m) delete m;
+ delete m;
}
QString AdvancedFm::checkDiskSpace(const QString &path) {