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

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.h (modified) (2 diffs)

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

@@ -29 +29 @@
         Q_OBJECT
 
-        QSharedPointer<const FileFormat> format;
+        FileFormat format;
         QList< Card > cards;
-        QSharedPointer< QFile > file;
-        //QPointer<QUndoStack> undo_stack;
+        QString filename;
         QUndoStack undo_stack;
         friend class FileFormat;
@@ -48 +47 @@
         Deck(QObject* parent = 0);
         ~Deck() {};
-        /// Create from file/stream/etc., that is, calls format->read()
-        Deck(const FileFormat* format, QObject* parent = 0);
+        /// Create from file with format
+        Deck(FileFormat format, const QString& filename, QObject* parent = 0);
 
         // =========== Loading and Saving, File Format Handling ==================
         // (All Functions are just Shorthands for other direct public method calls)
         bool save();
-        bool save(QFile& file);
-        bool save(const FileFormat* format, QFile& file);
+        bool save(const QString& filename);
+        bool save(FileFormat format, const QString& filename);
+        bool save(FileFormat format, QFile& file);
         bool read();
-        bool read(QFile& file);
-        bool read(const FileFormat* format, QFile& file);
+        bool read(const QString& filename);
+        bool read(FileFormat format, const QString& filename);
+        bool read(FileFormat format, QFile& file);
+
 
         bool canRead() const { return hasFile() && hasFormat(); }
         bool canSave() const { return canRead(); }
-        bool hasFormat() const { return format; }
-        void setFormat(const FileFormat* format);
-        bool hasFile() const { return file; }
-        void setFile(QFile* file);
+        bool hasFormat() const { return !format.isNull(); }
+        FileFormat getFormat() const { return format; }
+        void setFormat(FileFormat format) { this->format = format; }
+        bool hasFile() const { return filename.isEmpty(); }
+        void setFileName(const QString& filename) { this->filename = filename; }
+        const QString& getFileName() const { return filename; }
 
         // =========== Undo Framework ==================