projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check touch device type on TouchEvents
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
4444426
..
47d3244
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,6
+20,8
@@
#pragma once
#pragma once
+#include <QUuid>
+
#ifdef HAVE_KDE4
# include <KMainWindow>
#elif defined HAVE_KF5
#ifdef HAVE_KDE4
# include <KMainWindow>
#elif defined HAVE_KF5
@@
-36,8
+38,8
@@
class ActionCollection;
class BufferHotListFilter;
class BufferView;
class BufferViewConfig;
class BufferHotListFilter;
class BufferView;
class BufferViewConfig;
+class ChatMonitorView;
class ClientBufferViewConfig;
class ClientBufferViewConfig;
-class ClientTransfer;
class CoreAccount;
class CoreConnectionStatusWidget;
class BufferViewDock;
class CoreAccount;
class CoreConnectionStatusWidget;
class BufferViewDock;
@@
-46,7
+48,6
@@
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTray;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTray;
-class ChatMonitorView;
class TopicWidget;
class QMenu;
class TopicWidget;
class QMenu;
@@
-123,7
+124,8
@@
private slots:
void showNotificationsDlg();
void showIgnoreList(QString newRule = QString());
void showShortcutsDlg();
void showNotificationsDlg();
void showIgnoreList(QString newRule = QString());
void showShortcutsDlg();
- void showNewTransferDlg(const ClientTransfer *transfer);
+ void showPasswordChangeDlg();
+ void showNewTransferDlg(const QUuid &transferId);
void onFullScreenToggled();
void handleCoreConnectionError(const QString &errorMsg);
void onFullScreenToggled();
void handleCoreConnectionError(const QString &errorMsg);
@@
-164,12
+166,9
@@
private slots:
void changeActiveBufferView(bool backwards);
void changeActiveBufferView(int bufferViewId);
void changeActiveBufferView(bool backwards);
void changeActiveBufferView(int bufferViewId);
- void showChangePasswordDialog();
-
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
- void changePassword(QString newPassword);
private:
#ifdef HAVE_KDE
private:
#ifdef HAVE_KDE