diff -r 4083860dd82e -r 7aa2e46c00f1 mapeditor.h
--- a/mapeditor.h	Tue Jun 14 09:41:37 2005 +0000
+++ b/mapeditor.h	Fri Jul 08 07:24:43 2005 +0000
@@ -7,10 +7,14 @@
 #include <qfiledialog.h>
 #include <qevent.h>
 #include <qprocess.h>
+#include <qbuffer.h>
 
 #include "mapcenterobj.h"
 #include "misc.h"
 
+class QNetworkOperation;
+class QUrlOperator;
+
 class MapEditor : public QCanvasView , public xmlObj {
     Q_OBJECT
 
@@ -31,13 +35,25 @@
 							// create subdirs in dir
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     void saveState();		// save actual state to backup
+<<<<<<< mapeditor.h
     void saveState(LinkableMapObj *);
     void saveState(const QString &);
     void saveState(const SaveMode&, LinkableMapObj *, const QString &);
     void parseAtom(const QString &);	
 
-private slots:
+    void addFloatImage(const QPixmap &img);
+=======
+    void saveState(LinkableMapObj *);
+    void saveState(const QString &);
+    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
+    void parseAtom(const QString &);	
+>>>>>>> 1.10
+
+  private slots:
     void finishedLineEditNoSave();
+    void fetchImage(const QString &img);
+    void imageDataFetched(const QByteArray &, QNetworkOperation *);
+    void imageDataFinished(QNetworkOperation *);
 
 public:
 	bool isDefault();		// false, if map was changed once
@@ -153,6 +169,8 @@
     virtual void contentsMouseDoubleClickEvent(QMouseEvent*);
     virtual void contentsMouseMoveEvent(QMouseEvent*);
 
+    virtual void contentsDragEnterEvent(QDragEnterEvent *event);
+    virtual void contentsDropEvent(QDropEvent *event);
 private:
     QCanvas* mapCanvas;
     MapCenterObj* mapCenter;
@@ -212,6 +230,11 @@
 
 	QPoint exportOffset;		// set before export, used in save
     void resizeEvent( QResizeEvent * );
+
+  QUrlOperator *urlOperator;
+  QDataStream *imageData;
+  QBuffer *imageBuffer;
+
 };
 #endif