1.1 --- a/mapeditor.cpp Fri Jul 08 08:06:36 2005 +0000
1.2 +++ b/mapeditor.cpp Mon Jul 11 19:55:57 2005 +0000
1.3 @@ -2407,9 +2407,9 @@
1.4 if (bo->countXLinks()==0)
1.5 {
1.6 branchLinksContextMenu->clear();
1.7 - branchLinksContextMenu->insertItem ("No link available");
1.8 + branchLinksContextMenu->insertItem ("No xLink available");
1.9 branchLinksContextMenuDup->clear();
1.10 - branchLinksContextMenuDup->insertItem ("No link available");
1.11 + branchLinksContextMenuDup->insertItem ("No xLink available");
1.12
1.13 } else
1.14 {
1.15 @@ -3407,6 +3407,7 @@
1.16 event->accept(true);
1.17 return;
1.18 }
1.19 +
1.20 }
1.21
1.22 event->ignore();
1.23 @@ -3435,8 +3436,7 @@
1.24 }
1.25 }
1.26
1.27 -void
1.28 -MapEditor::addFloatImage(const QPixmap &img)
1.29 +void MapEditor::addFloatImage(const QPixmap &img)
1.30 {
1.31 if (selection &&
1.32 (typeid(*selection) == typeid(BranchObj)) ||