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
/
UserInterface
/
Views
/
RoomStatusIndicatorWidget.h
diff --git
a/src/UserInterface/Views/RoomStatusIndicatorWidget.h
b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
index
67d40dc
..
73957b6
100644
(file)
--- a/
src/UserInterface/Views/RoomStatusIndicatorWidget.h
+++ b/
src/UserInterface/Views/RoomStatusIndicatorWidget.h
@@
-60,6
+60,8
@@
public slots:
*/
\r
void statusChanged( const Room::Status aStatus, const QTime aUntil );
\r
\r
+ void currentRoomChanged( Room *aRoom );
\r
+
\r
void viewResized(const QSize &newSize, const QSize &oldSize) { }
\r
\r
private:
\r