d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove some unused functions

Browse source
This commit is contained in:
Nicolas Werner 2022-01-25 11:09:54 +01:00
parent 4a80fdc951
commit 573624a490
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 2 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChatPage.cpp
View file

@ -777,6 +777,8 @@ ChatPage::inviteUser(QString userid, QString reason)
userid.toStdString(), userid.toStdString(),
[this, userid, room](const mtx::responses::Empty &, mtx::http::RequestErr err) { [this, userid, room](const mtx::responses::Empty &, mtx::http::RequestErr err) {
if (err) { if (err) {
nhlog::net()->error(
"Failed to invite {} to {}: {}", userid.toStdString(), room.toStdString(), *err);
emit showNotification( emit showNotification(
tr("Failed to invite %1 to %2: %3") tr("Failed to invite %1 to %2: %3")
.arg(userid, room, QString::fromStdString(err->matrix_error.error))); .arg(userid, room, QString::fromStdString(err->matrix_error.error)));

41
src/MainWindow.cpp
View file

@ -357,23 +357,6 @@ MainWindow::saveCurrentWindowSize()
settings->setValue(QStringLiteral("window/height"), current.height()); settings->setValue(QStringLiteral("window/height"), current.height());
} }
void
MainWindow::removeOverlayProgressBar()
{
QTimer *timer = new QTimer(this);
timer->setSingleShot(true);
connect(timer, &QTimer::timeout, this, [this, timer]() { timer->deleteLater(); });
// FIXME: Snackbar doesn't work if it's initialized in the constructor.
// QTimer::singleShot(0, this, [this]() {
// snackBar_ = new SnackBar(this);
// connect(chat_page_, &ChatPage::showNotification, snackBar_, &SnackBar::showMessage);
//});
timer->start(50);
}
void void
MainWindow::showChatPage() MainWindow::showChatPage()
{ {
@ -388,8 +371,6 @@ MainWindow::showChatPage()
userSettings_.data()->setDeviceId(device_id); userSettings_.data()->setDeviceId(device_id);
userSettings_.data()->setHomeserver(homeserver); userSettings_.data()->setHomeserver(homeserver);
showOverlayProgressBar();
chat_page_->bootstrap(userid, homeserver, token); chat_page_->bootstrap(userid, homeserver, token);
connect(cache::client(), &Cache::databaseReady, this, &MainWindow::secretsChanged); connect(cache::client(), &Cache::databaseReady, this, &MainWindow::secretsChanged);
connect(cache::client(), &Cache::secretChanged, this, &MainWindow::secretsChanged); connect(cache::client(), &Cache::secretChanged, this, &MainWindow::secretsChanged);
@ -446,10 +427,6 @@ MainWindow::hasActiveUser()
settings->contains(prefix + "auth/user_id"); settings->contains(prefix + "auth/user_id");
} }
void
MainWindow::showOverlayProgressBar()
{}
void void
MainWindow::openCreateRoomDialog( MainWindow::openCreateRoomDialog(
std::function<void(const mtx::requests::CreateRoom &request)> callback) std::function<void(const mtx::requests::CreateRoom &request)> callback)
@ -463,14 +440,6 @@ MainWindow::openCreateRoomDialog(
showDialog(dialog); showDialog(dialog);
} }
void
MainWindow::showTransparentOverlayModal(QWidget *, QFlags<Qt::AlignmentFlag>)
{}
void
MainWindow::showSolidOverlayModal(QWidget *, QFlags<Qt::AlignmentFlag>)
{}
bool bool
MainWindow::hasActiveDialogs() const MainWindow::hasActiveDialogs() const
{ {
@ -484,10 +453,6 @@ MainWindow::pageSupportsTray() const
//! !register_page_->isVisible(); //! !register_page_->isVisible();
} }
void
MainWindow::hideOverlay()
{}
inline void inline void
MainWindow::showDialog(QWidget *dialog) MainWindow::showDialog(QWidget *dialog)
{ {
@ -496,12 +461,6 @@ MainWindow::showDialog(QWidget *dialog)
dialog->show(); dialog->show();
} }
void
MainWindow::showWelcomePage()
{
removeOverlayProgressBar();
}
void void
MainWindow::showRegisterPage() MainWindow::showRegisterPage()
{} {}

12
src/MainWindow.h
View file

@ -56,12 +56,6 @@ public:
openCreateRoomDialog(std::function<void(const mtx::requests::CreateRoom &request)> callback); openCreateRoomDialog(std::function<void(const mtx::requests::CreateRoom &request)> callback);
void openJoinRoomDialog(std::function<void(const QString &room_id)> callback); void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
void hideOverlay();
void showSolidOverlayModal(QWidget *content, QFlags<Qt::AlignmentFlag> flags = Qt::AlignCenter);
void
showTransparentOverlayModal(QWidget *content,
QFlags<Qt::AlignmentFlag> flags = Qt::AlignTop | Qt::AlignHCenter);
MxcImageProvider *imageProvider() { return imgProvider; } MxcImageProvider *imageProvider() { return imgProvider; }
//! Show the chat page and start communicating with the given access token. //! Show the chat page and start communicating with the given access token.
@ -75,15 +69,9 @@ private slots:
//! Handle interaction with the tray icon. //! Handle interaction with the tray icon.
void iconActivated(QSystemTrayIcon::ActivationReason reason); void iconActivated(QSystemTrayIcon::ActivationReason reason);
//! Show the welcome page in the main window.
void showWelcomePage();
//! Show the register page in the main window. //! Show the register page in the main window.
void showRegisterPage(); void showRegisterPage();
void showOverlayProgressBar();
void removeOverlayProgressBar();
virtual void setWindowTitle(int notificationCount); virtual void setWindowTitle(int notificationCount);
signals: signals: