Changeset 59 for punch-card-project/trunk/punch-card-editor/src/qpunchcard/format.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/format.h (modified) (2 diffs)

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

@@ -9 +9 @@
         class FileFormat;
         class FileFormatFactory;
+
+        class Deck;
 };
 
 #include "qpunchcard/card.h"
-#include "qpunchcard/deck.h"
+// #include "qpunchcard/deck.h" // nach unten verschoben, damit bloeder cc kompiliert
 
 namespace QPunchCard {
 
 class FileFormat {
+        QString name;
+        friend class FileFormatFactory;
 public:
         virtual ~FileFormat() {}
-        virtual bool write(QFile& /* target */, const Deck& /* source */) const = 0;
-        virtual bool read(QFile& /* source */, Deck& /* target */) const = 0;
+        virtual bool write(QFile& /* target */, const Deck* /* source */) const { qDebug("Default FileFormat write!"); return false; }
+        virtual bool read(QFile& /* source */, Deck* /* target */) const { qDebug("Default FileFormat read!"); return false; }
+        const QString& getName() const { return name; }
+        bool isNull() const { return name.isNull(); }
 };
 
@@ -26 +32 @@
 public:
         static QList<QString> availableFormats();
-        static const FileFormat* createFormat(const QString& name);
+        static FileFormat createFormat(const QString& name);
         static QString autoDetectFormat(const QFile& file);
 };
 
 /****************************************************************************
-  FileFormat (I/O) implementations
+  FileFormat (I/O) implementations (see jones.h for the most important one)
  ***************************************************************************/
-
-class JonesFileFormat : public FileFormat {
-public:
-        static int jones_column_to_integer(const Column& col);
-        static Column jones_integer_to_column(int integer);
-
-        bool write(QFile& target, const Deck& source) const;
-        bool read(QFile& source, Deck& target) const;
-};
 
 class PunchCardMarkupLanguageFormat : public FileFormat {
 public:
-        bool write(QFile& target, const Deck& source) const { return false; }
-        bool read(QFile& source, Deck& target) const { return false; }
+        bool write(QFile& target, const Deck* source) const { return false; }
+        bool read(QFile& source, Deck* target) const { return false; }
 };
 
 }; // namespace QPunchCard
 
+// hier eingebunden
+#include "qpunchcard/deck.h"
 
 #endif // FORMAT_H