[rkward-cvs] rkward/rkward rkward.cpp,1.114,1.115

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1999/rkward

Modified Files:
	rkward.cpp 
Log Message:
Finish converting RKComponentMap to use KXMLGUI. Some small fixes, many cleanups.

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** rkward.cpp	23 Oct 2005 22:07:23 -0000	1.114
--- rkward.cpp	24 Oct 2005 18:11:57 -0000	1.115
***************
*** 55,62 ****
  #include "core/rkmodificationtracker.h"
  #include "rkwatch.h"
- #include "misc/rkmenu.h"
- #include "misc/rkmenulist.h"
  #include "plugin/rkcomponentmap.h"
- //#include "rkoutputwindow.h"
  #include "settings/rksettings.h"
  #include "settings/rksettingsmoduleplugins.h"
--- 55,59 ----
***************
*** 169,189 ****
  	KMessageBox::information (this, dummy, i18n("What to expect of RKWard"), "state_of_rkward");
  	
- 	// create handle for menu bar and register standard menus
- 	menu_list = new RKMenuList (menuBar ());
- 	QMenuItem* item = menuBar ()->findItem (menuBar ()->idAt (0));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "file");
- 	item = menuBar ()->findItem (menuBar ()->idAt (1));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "edit");
- 	item = menuBar ()->findItem (menuBar ()->idAt (2));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "workspace");
- 	item = menuBar ()->findItem (menuBar ()->idAt (3));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "output");
- 	item = menuBar ()->findItem (menuBar ()->idAt (4));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "run");
- 	item = menuBar ()->findItem (menuBar ()->idAt (5));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "settings");
- 	item = menuBar ()->findItem (menuBar ()->idAt (6));
- 	if (item && item->popup ()) menu_list->registerMenu (item->popup (), "help");
- 
  	initPlugins ();
  	
--- 166,169 ----
***************
*** 242,247 ****
  	slotStatusMsg(i18n("Setting up plugins..."));
  	
- 	RKGlobals::componentMap ()->clear ();
  	factory ()->removeClient (RKGlobals::componentMap ());
  
  	QStringList list = RKSettingsModulePlugins::pluginMaps ();
--- 222,227 ----
  	slotStatusMsg(i18n("Setting up plugins..."));
  	
  	factory ()->removeClient (RKGlobals::componentMap ());
+ 	RKGlobals::componentMap ()->clear ();
  
  	QStringList list = RKSettingsModulePlugins::pluginMaps ();