diff -r 7ced3733ba60 -r 1c8ff1928b97 texteditor.cpp
--- a/texteditor.cpp	Mon Oct 30 12:39:37 2006 +0000
+++ b/texteditor.cpp	Thu Nov 23 13:53:08 2006 +0000
@@ -5,14 +5,16 @@
 #include <typeinfo>
 
 #include "noteobj.h"
+#include "settings.h"
 #include "version.h"
 
 extern int statusbarTime;
-extern QSettings settings;
+extern Settings settings;
 
 extern QAction *actionViewToggleNoteEditor;
 
 extern QString iconPath;
+extern QString vymName;
 
 using namespace std;
 
@@ -35,7 +37,7 @@
 	connect (e, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
     setCentralWidget( e );
     statusBar()->message( tr("Ready","Statusbar message"), statusbarTime);
-	setCaption(__VYM " - " +tr ("Note Editor","Window caption"));
+	setCaption(vymName +" - " +tr ("Note Editor","Window caption"));
 
 
 	connect(e, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
@@ -454,7 +456,7 @@
 	{
 		if (e->text().length()) 
 		{
-			QMessageBox mb( __VYM " - " +tr("Note Editor"),
+			QMessageBox mb( vymName + " - " +tr("Note Editor"),
 				"Loading will overwrite the existing note",
 				QMessageBox::Warning,
 				QMessageBox::Yes | QMessageBox::Default,
@@ -558,7 +560,7 @@
 		QFile file (fn);
 		if (file.exists())
 		{
-			QMessageBox mb( __VYM,
+			QMessageBox mb( vymName,
 				tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
 			QMessageBox::Warning,
 			QMessageBox::Yes | QMessageBox::Default,
@@ -633,7 +635,7 @@
 		QFile file (fn);
 		if (file.exists())
 		{
-			QMessageBox mb( __VYM,
+			QMessageBox mb( vymName,
 				tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
 			QMessageBox::Warning,
 			QMessageBox::Yes | QMessageBox::Default,