1.1 --- a/mapeditor.h	Tue Jun 14 09:41:37 2005 +0000
     1.2 +++ b/mapeditor.h	Fri Jul 08 07:24:43 2005 +0000
     1.3 @@ -7,10 +7,14 @@
     1.4  #include <qfiledialog.h>
     1.5  #include <qevent.h>
     1.6  #include <qprocess.h>
     1.7 +#include <qbuffer.h>
     1.8  
     1.9  #include "mapcenterobj.h"
    1.10  #include "misc.h"
    1.11  
    1.12 +class QNetworkOperation;
    1.13 +class QUrlOperator;
    1.14 +
    1.15  class MapEditor : public QCanvasView , public xmlObj {
    1.16      Q_OBJECT
    1.17  
    1.18 @@ -31,13 +35,25 @@
    1.19  							// create subdirs in dir
    1.20      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
    1.21      void saveState();		// save actual state to backup
    1.22 +<<<<<<< mapeditor.h
    1.23      void saveState(LinkableMapObj *);
    1.24      void saveState(const QString &);
    1.25      void saveState(const SaveMode&, LinkableMapObj *, const QString &);
    1.26      void parseAtom(const QString &);	
    1.27  
    1.28 -private slots:
    1.29 +    void addFloatImage(const QPixmap &img);
    1.30 +=======
    1.31 +    void saveState(LinkableMapObj *);
    1.32 +    void saveState(const QString &);
    1.33 +    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
    1.34 +    void parseAtom(const QString &);	
    1.35 +>>>>>>> 1.10
    1.36 +
    1.37 +  private slots:
    1.38      void finishedLineEditNoSave();
    1.39 +    void fetchImage(const QString &img);
    1.40 +    void imageDataFetched(const QByteArray &, QNetworkOperation *);
    1.41 +    void imageDataFinished(QNetworkOperation *);
    1.42  
    1.43  public:
    1.44  	bool isDefault();		// false, if map was changed once
    1.45 @@ -153,6 +169,8 @@
    1.46      virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
    1.47      virtual void contentsMouseMoveEvent(QMouseEvent*);
    1.48  
    1.49 +    virtual void contentsDragEnterEvent(QDragEnterEvent *event);
    1.50 +    virtual void contentsDropEvent(QDropEvent *event);
    1.51  private:
    1.52      QCanvas* mapCanvas;
    1.53      MapCenterObj* mapCenter;
    1.54 @@ -212,6 +230,11 @@
    1.55  
    1.56  	QPoint exportOffset;		// set before export, used in save
    1.57      void resizeEvent( QResizeEvent * );
    1.58 +
    1.59 +  QUrlOperator *urlOperator;
    1.60 +  QDataStream *imageData;
    1.61 +  QBuffer *imageBuffer;
    1.62 +
    1.63  };
    1.64  #endif
    1.65