1.1 --- a/mainwindow.h	Tue Oct 24 15:36:38 2006 +0000
     1.2 +++ b/mainwindow.h	Mon Oct 30 12:39:37 2006 +0000
     1.3 @@ -115,8 +115,8 @@
     1.4      void editImportAdd();
     1.5      void editImportReplace();
     1.6      void editSaveBranch();
     1.7 -    void editRemoveBranchKeepChilds();
     1.8 -    void editRemoveChilds();
     1.9 +    void editDeleteKeepChilds();
    1.10 +    void editDeleteChilds();
    1.11      void editDeleteSelection();
    1.12      void editUpperBranch();
    1.13      void editLowerBranch();
    1.14 @@ -194,6 +194,8 @@
    1.15  
    1.16  	Q3PtrList <QAction> actionListBranches;
    1.17  
    1.18 +	QColor currentColor;
    1.19 +
    1.20  	QAction* actionFileSave;
    1.21  	QAction* actionFilePrint;
    1.22  	QAction* actionEditUndo;
    1.23 @@ -223,8 +225,8 @@
    1.24  	QAction *actionEditAddBranchBefore;
    1.25  	QAction *actionEditAddBranchAbove;
    1.26  	QAction *actionEditAddBranchBelow;
    1.27 -	QAction *actionEditRemoveBranchKeepChilds;
    1.28 -	QAction *actionEditRemoveChilds;
    1.29 +	QAction *actionEditDeleteKeepChilds;
    1.30 +	QAction *actionEditDeleteChilds;
    1.31  	QAction *actionEditImportAdd;
    1.32  	QAction *actionEditImportReplace;
    1.33  	QAction *actionEditSaveBranch;