From: Jan Lapinkataja <jan.lapinkataja@ixonos.com>
Date: Thu, 28 May 2009 12:29:09 +0000 (+0300)
Subject: Confilct solved
X-Git-Url: http://git.maemo.org/git/?p=qtmeetings;a=commitdiff_plain;h=e12a1507ed7ade95f1c8f4a8e55daa9814df9423

Confilct solved

Conflicts:
	src/BusinessLogic/UIManager.h
---

e12a1507ed7ade95f1c8f4a8e55daa9814df9423
diff --cc src/BusinessLogic/UIManager.h
index b2ef8e5,a672381..837fd58
--- a/src/BusinessLogic/UIManager.h
+++ b/src/BusinessLogic/UIManager.h
@@@ -35,28 -26,9 +35,23 @@@ public
  	UIManager( Engine *aEngine, WindowManager *aWindowManager );
  	virtual ~UIManager();
  	
 +	//! Connects Device Managers signals.
 +	/*!
 +	 * This method connects Device Managers signals directly to UI
 +	 * components or to it selft.
 +	 */
  	void connectDeviceManager( DeviceManager *aDeviceManager );
 +	//! Connects Communication Managers signals.
 +	/*!
 +	 * This method connects Communication Managers signals directly to UI
 +	 * components or to it selft.
 +	 */
  	void connectCommunicationManager( CommunicationManager *aCommunicationManager );
 +	//! Shows the main view.
 +	/*!
 +	 * Makes the main view visible trough WindowManager.
 +	 */
  	void showMainView();
- 	//! Shows the progress bar.
- 	/*!
- 	 * Shows the progress bar with given text.
- 	 */
- 	void showProgressBar( QString aText );
  
  signals: