Changeset 59 for punch-card-project/trunk/punch-card-editor/src/qpunchcard/deck.cc

Timestamp:

01/22/10 19:44:34 (2 years ago)

Author:

sven-win

Message:

Umfangreiche Weiterentwicklung (letzte Entwicklung am Netbook). Driver fuer M200 erstmals testweise implementiert; funktioniert(e mit Netbook).

-- Sven @ netboo

Files:

• punch-card-project/trunk/punch-card-editor/src/qpunchcard/deck.cc (modified) (2 diffs)

punch-card-project/trunk/punch-card-editor/src/qpunchcard/deck.cc

@@ -7 +7 @@
 }
 
-Deck::Deck(const FileFormat* format, QObject* parent) :
-                QObject(parent), undo_stack(this), format(format) {
+Deck::Deck(FileFormat format, const QString& filename, QObject* parent) :
+                QObject(parent), undo_stack(this), format(format), filename(filename) {
         init();
+        read();
 }
 
@@ -18 +19 @@
 
 bool Deck::save() {
-        return file ? save(*file) : false;
+        return hasFile() ? save(filename) : false;
 }
 
-bool Deck::save(QFile& file) {
-        return save(format.data(), file);
+bool Deck::save(const QString& filename) {
+        return hasFormat() ? save(format, filename) : false;
 }
 
-bool Deck::save(const FileFormat* format, QFile& file) {
-        return format ? format->write(file, *this) : false;
+bool Deck::save(FileFormat format, const QString& filename) {
+        QFile file(filename);
+        return save(format, file);
+}
+
+bool Deck::save(FileFormat format, QFile& file) {
+        if( format.write(file, this) ) {
+                // save filename and format
+                this->format = format;
+                this->filename = file.fileName();
+                return true;
+        } else {
+                qDebug() << "Deck saving failed. Format: " << format.getName();
+                return false;
+        }
 }
 
 bool Deck::read() {
-        return file ? read(*file) : false;
+        return hasFile() ? read(filename) : false;
 }
 
-bool Deck::read(QFile& file) {
-        return read(format.data(), file);
+bool Deck::read(const QString& filename) {
+        return hasFormat() ? save(format, filename) : false;
 }
 
-bool Deck::read(const FileFormat* format, QFile& file) {
-        return format ? format->read(file, *this) : false;
+bool Deck::read(FileFormat format, const QString &filename) {
+        QFile file(filename);
+        return read(format, file);
 }
 
-void Deck::setFormat(const FileFormat* new_format) {
-        format = QSharedPointer<const FileFormat>(new_format);
-}
-
-void Deck::setFile(QFile* file) {
-        this->file = QSharedPointer<QFile>(file);
+bool Deck::read(FileFormat format, QFile& file) {
+        if( format.read(file, this) ) {
+                this->format = format;
+                this->filename = file.fileName();
+                return true;
+        } else {
+                return false;
+        }
 }