diff -r 7a71a914afdb -r 6d2b32f305f9 main.cpp --- a/main.cpp Thu May 07 08:48:53 2009 +0000 +++ b/main.cpp Wed May 13 08:26:27 2009 +0000 @@ -3,6 +3,7 @@ #include using namespace std; +#include "flagrow.h" #include "flagrowobj.h" #include "mainwindow.h" #include "options.h" @@ -36,9 +37,8 @@ QString flagsPath; // Pointing to flags bool clipboardEmpty; bool debug; // global debugging flag -FlagRowObj *systemFlagsDefault; // used to copy from in LinkableMapObj -FlagRowObj *standardFlagsDefault; - +FlagRow *systemFlagsMaster; +FlagRow *standardFlagsMaster; Settings settings ("InSilmaril","vym"); // Organization, Application name @@ -158,11 +158,12 @@ translator.load( QString("vym_")+QTextCodec::locale(), vymBaseDir.path() + "/lang"); app.installTranslator( &translator ); - // Initializing the row of system flags - // is done in first call to MapEditor(), - // because we need at least one canvas first - systemFlagsDefault=NULL; - standardFlagsDefault=NULL; + // Initializing the master rows of flags + systemFlagsMaster=new FlagRow; + systemFlagsMaster->setName ("systemFlagsMaster"); + standardFlagsMaster=new FlagRow; + standardFlagsMaster->setName ("standardFlagsMaster"); + // Initialize window of TextEditor textEditor = new TextEditor();