diff -r 28be7520cb21 -r be24af55da40 mainwindow.cpp
--- a/mainwindow.cpp	Fri Jun 29 09:43:53 2007 +0000
+++ b/mainwindow.cpp	Fri Jun 29 09:43:53 2007 +0000
@@ -2744,13 +2744,13 @@
 		{
 			bool ok;
 			QPoint p;
-			QString s=currentMapEditor()->getHeading(ok,p);
+			QString s=me->getHeading(ok,p);
 
 			if (ok)
 			{
 				me->setStateEditHeading (true);
 #if defined(Q_OS_MACX)
-				p=currentMapEditor()->mapTo (this,p);
+				p=me->mapToGlobal (p);
 				QDialog *d =new QDialog(NULL);
 				QLineEdit *le=new QLineEdit (d);
 				d->setWindowFlags (Qt::FramelessWindowHint);
@@ -2761,12 +2761,12 @@
 				connect (le, SIGNAL (returnPressed()), d, SLOT (accept()));
 				d->activateWindow();
 				d->exec();
-				currentMapEditor()->setHeading (le->text());
+				me->setHeading (le->text());
 				delete (le);
 				delete (d);
 				editHeadingFinished();
 #else
-				p=currentMapEditor()->mapTo (this,p);
+				p=me->mapTo (this,p);
 				lineedit->setGeometry(p.x(),p.y(),230,25);
 				lineedit->setText(s);
 				lineedit->setCursorPosition(1);
@@ -3210,7 +3210,7 @@
 void Main::networkConnect()
 {
 	MapEditor *me=currentMapEditor();
-	if (me) me->newServer();
+	if (me) me->connectToServer();
 }
 
 bool Main::settingsPDF()
@@ -3271,7 +3271,7 @@
 
 void Main::settingsAutosaveToggle()
 {
-	settings.setValue ("/mapeditor/autosave/used",actionSettingsAutosaveToggle->isOn() );
+	settings.setValue ("/mapeditor/autosave/use",actionSettingsAutosaveToggle->isOn() );
 }
 
 void Main::settingsAutosaveTime()
@@ -3647,7 +3647,7 @@
 void Main::testFunction2()
 {
 	if (!currentMapEditor()) return;
-	currentMapEditor()->testFunction2();
+	currentMapEditor()->connectToServer();
 }
 
 void Main::testCommand()