1.1 --- a/main.cpp	Thu May 07 08:48:53 2009 +0000
     1.2 +++ b/main.cpp	Wed May 13 08:26:27 2009 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  #include <iostream>
     1.5  using namespace std;
     1.6  
     1.7 +#include "flagrow.h"
     1.8  #include "flagrowobj.h"
     1.9  #include "mainwindow.h"
    1.10  #include "options.h"
    1.11 @@ -36,9 +37,8 @@
    1.12  QString flagsPath;				// Pointing to flags
    1.13  bool clipboardEmpty;			
    1.14  bool debug;						// global debugging flag
    1.15 -FlagRowObj *systemFlagsDefault;	// used to copy from in LinkableMapObj
    1.16 -FlagRowObj *standardFlagsDefault;
    1.17 -
    1.18 +FlagRow *systemFlagsMaster;	
    1.19 +FlagRow *standardFlagsMaster;	
    1.20  
    1.21  Settings settings ("InSilmaril","vym"); // Organization, Application name
    1.22  
    1.23 @@ -158,11 +158,12 @@
    1.24  	translator.load( QString("vym_")+QTextCodec::locale(), vymBaseDir.path() + "/lang");
    1.25      app.installTranslator( &translator );
    1.26  
    1.27 -	// Initializing the row of system flags
    1.28 -	// is done in first call to MapEditor(),
    1.29 -	// because we need at least one canvas first
    1.30 -	systemFlagsDefault=NULL;
    1.31 -	standardFlagsDefault=NULL;
    1.32 +	// Initializing the master rows of flags
    1.33 +	systemFlagsMaster=new FlagRow;
    1.34 +	systemFlagsMaster->setName ("systemFlagsMaster");
    1.35 +	standardFlagsMaster=new FlagRow;
    1.36 +	standardFlagsMaster->setName ("standardFlagsMaster");
    1.37 +
    1.38  
    1.39  	// Initialize window of TextEditor
    1.40  	textEditor = new TextEditor();