StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

revert(chatlog): Revert cleanup

Browse Source 
* Fix compilation issues caused by incorrect merges
This commit is contained in:
Mick Sayson 2021-01-31 14:41:10 -08:00 committed by Anthony Bilinski
parent 00ab89c3ce
commit dd7df35720
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chatlog/chatlog.cpp
View File

@ -913,6 +913,12 @@ void ChatLog::focusOutEvent(QFocusEvent* ev)
}
}
void ChatLog::wheelEvent(QWheelEvent *event)
{
QGraphicsView::wheelEvent(event);
checkVisibility(true);
}
void ChatLog::retranslateUi()
{
copyAction->setText(tr("Copy"));

5
src/model/friend.cpp
View File

@ -192,8 +192,6 @@ Status::Status Friend::getStatus() const
return isNegotiating ? Status::Status::Negotiating : friendStatus;
}
}
void Friend::setExtendedMessageSupport(bool supported)
{
supportedExtensions[ExtensionType::messages] = supported;
@ -222,4 +220,5 @@ void Friend::onNegotiationComplete() {
if (Status::isOnline(getStatus())) {
emit onlineOfflineChanged(friendPk, true);
}
}
}

1
src/model/friend.h
View File

@ -54,7 +54,6 @@ public:
void finishNegotiation();
void setStatus(Status::Status s);
Status::Status getStatus() const;
bool useHistory() const final;
void setExtendedMessageSupport(bool supported);
ExtensionSet getSupportedExtensions() const;

2
src/model/group.cpp
View File

@ -201,5 +201,3 @@ QString Group::getSelfName() const
{
return selfName;
}
}

1
src/model/group.h
View File

@ -60,7 +60,6 @@ public:
void setSelfName(const QString& name);
QString getSelfName() const;
bool useHistory() const final;
signals:
void titleChangedByUser(const QString& title);
void titleChanged(const QString& author, const QString& title);

1
src/widget/form/genericchatform.cpp
View File

@ -44,6 +44,7 @@
#include "src/widget/tool/flyoutoverlaywidget.h"
#include "src/widget/translator.h"
#include "src/widget/widget.h"
#include "src/widget/gui.h"
#include <QClipboard>
#include <QFileDialog>