mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
revert(chatlog): Revert cleanup
* Fix compilation issues caused by incorrect merges
This commit is contained in:
parent
00ab89c3ce
commit
dd7df35720
|
@ -913,6 +913,12 @@ void ChatLog::focusOutEvent(QFocusEvent* ev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ChatLog::wheelEvent(QWheelEvent *event)
|
||||||
|
{
|
||||||
|
QGraphicsView::wheelEvent(event);
|
||||||
|
checkVisibility(true);
|
||||||
|
}
|
||||||
|
|
||||||
void ChatLog::retranslateUi()
|
void ChatLog::retranslateUi()
|
||||||
{
|
{
|
||||||
copyAction->setText(tr("Copy"));
|
copyAction->setText(tr("Copy"));
|
||||||
|
|
|
@ -192,8 +192,6 @@ Status::Status Friend::getStatus() const
|
||||||
return isNegotiating ? Status::Status::Negotiating : friendStatus;
|
return isNegotiating ? Status::Status::Negotiating : friendStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void Friend::setExtendedMessageSupport(bool supported)
|
void Friend::setExtendedMessageSupport(bool supported)
|
||||||
{
|
{
|
||||||
supportedExtensions[ExtensionType::messages] = supported;
|
supportedExtensions[ExtensionType::messages] = supported;
|
||||||
|
@ -222,4 +220,5 @@ void Friend::onNegotiationComplete() {
|
||||||
|
|
||||||
if (Status::isOnline(getStatus())) {
|
if (Status::isOnline(getStatus())) {
|
||||||
emit onlineOfflineChanged(friendPk, true);
|
emit onlineOfflineChanged(friendPk, true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -54,7 +54,6 @@ public:
|
||||||
void finishNegotiation();
|
void finishNegotiation();
|
||||||
void setStatus(Status::Status s);
|
void setStatus(Status::Status s);
|
||||||
Status::Status getStatus() const;
|
Status::Status getStatus() const;
|
||||||
bool useHistory() const final;
|
|
||||||
|
|
||||||
void setExtendedMessageSupport(bool supported);
|
void setExtendedMessageSupport(bool supported);
|
||||||
ExtensionSet getSupportedExtensions() const;
|
ExtensionSet getSupportedExtensions() const;
|
||||||
|
|
|
@ -201,5 +201,3 @@ QString Group::getSelfName() const
|
||||||
{
|
{
|
||||||
return selfName;
|
return selfName;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ public:
|
||||||
void setSelfName(const QString& name);
|
void setSelfName(const QString& name);
|
||||||
QString getSelfName() const;
|
QString getSelfName() const;
|
||||||
|
|
||||||
bool useHistory() const final;
|
|
||||||
signals:
|
signals:
|
||||||
void titleChangedByUser(const QString& title);
|
void titleChangedByUser(const QString& title);
|
||||||
void titleChanged(const QString& author, const QString& title);
|
void titleChanged(const QString& author, const QString& title);
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include "src/widget/tool/flyoutoverlaywidget.h"
|
#include "src/widget/tool/flyoutoverlaywidget.h"
|
||||||
#include "src/widget/translator.h"
|
#include "src/widget/translator.h"
|
||||||
#include "src/widget/widget.h"
|
#include "src/widget/widget.h"
|
||||||
|
#include "src/widget/gui.h"
|
||||||
|
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user