summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-02-25 05:24:43 (UTC)
committer llornkcor <llornkcor>2002-02-25 05:24:43 (UTC)
commit160308bc29cf01582775f73e1aca13e82c65bffd (patch) (side-by-side diff)
tree67ebc478e5eef47e881f3f4ea330633a67df0827
parent1bebd27631a6c9d1ab967cbb32dd4e796b3b0402 (diff)
downloadopie-160308bc29cf01582775f73e1aca13e82c65bffd.zip
opie-160308bc29cf01582775f73e1aca13e82c65bffd.tar.gz
opie-160308bc29cf01582775f73e1aca13e82c65bffd.tar.bz2
fixed open setDoc bug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/Makefile.in6
-rw-r--r--core/apps/textedit/textedit.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index fa394d6..234965b 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -81,16 +81,14 @@ all: $(DESTDIR)$(TARGET)
$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
moc: $(SRCMOC)
-tmake: Makefile.in
-
-Makefile.in: textedit.pro
- tmake textedit.pro -o Makefile.in
+tmake:
+ tmake textedit.pro
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 603f032..bc975f3 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -829,13 +829,15 @@ void TextEdit::updateCaption( const QString &name )
}
}
void TextEdit::setDocument(const QString& fileref)
{
bFromDocView = TRUE;
- openFile(DocLnk(fileref));
+ openFile(fileref);
+// bFromDocView = TRUE;
+// openFile(DocLnk(fileref));
// showEditTools();
}
void TextEdit::closeEvent( QCloseEvent *e )
{
if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) {