projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed errors caused by auto merge that did not work correctly
[qtmeetings]
/
src
/
BusinessLogic
/
Engine.h
diff --git
a/src/BusinessLogic/Engine.h
b/src/BusinessLogic/Engine.h
index
dc538ec
..
50e5135
100644
(file)
--- a/
src/BusinessLogic/Engine.h
+++ b/
src/BusinessLogic/Engine.h
@@
-41,6
+41,8
@@
public:
signals:
signals:
+ void roomStatusChanged( Room::Status aStatus, QTime aUntil );
+
private slots:
//! Slot. Closes the application.
/*!
private slots:
//! Slot. Closes the application.
/*!
@@
-67,12
+69,6
@@
private slots:
* \param aAddInfo Possible addition info.
*/
void errorHandler( int aCode, const QString &aAddInfo = "" );
* \param aAddInfo Possible addition info.
*/
void errorHandler( int aCode, const QString &aAddInfo = "" );
- //! Slot. Fetches meetings from the server.
- /*!
- * Slot. Fetches meetings from the server. Parameters are hard coded: the meetings of the default
- * room from current and +/- 2 weeks are fetched.
- */
-// void fetchMeetings();
//! Slot. Saves fetched meetings to the current instance's local storage.
/*!
* Slot. Saves fetched meetings to the current instance's local storage. Meetings are soted in a
//! Slot. Saves fetched meetings to the current instance's local storage.
/*!
* Slot. Saves fetched meetings to the current instance's local storage. Meetings are soted in a