X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=9b42250461e4a336947ccc7f74e4f1926d314604;hb=cc9f5099567634673f181aa49ae0b5d19bf93f7c;hp=6f741f55c042d51edd7133be2dc6a0adae6ad50b;hpb=dc11e24b95e5b5e3595cc0e98eb2a572006912c7;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 6f741f55..9b422504 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -22,9 +22,7 @@
 
 #include <QUuid>
 
-#ifdef HAVE_KDE4
-#  include <KMainWindow>
-#elif defined HAVE_KF5
+#ifdef HAVE_KF5
 #  include <KXmlGui/KMainWindow>
 #else
 #  include <QMainWindow>
@@ -68,7 +66,6 @@ class MainWin
 
 public:
     MainWin(QWidget *parent = 0);
-    virtual ~MainWin();
 
     void init();
 
@@ -100,8 +97,7 @@ public slots:
 
     void showMigrationWarning(bool show);
 
-    //! Quit application
-    void quit();
+    void onExitRequested(const QString &reason);
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -121,7 +117,17 @@ private slots:
     void currentBufferChanged(BufferId);
     void messagesInserted(const QModelIndex &parent, int start, int end);
     void showAboutDlg();
-    void showChannelList(NetworkId netId = NetworkId());
+
+    /**
+     * Show the channel list dialog for the network, optionally searching by channel name
+     *
+     * @param networkId        Network ID for associated network
+     * @param channelFilters   Partial channel name to search for, or empty to show all
+     * @param listImmediately  If true, immediately list channels, otherwise just show dialog
+     */
+    void showChannelList(NetworkId netId = {}, const QString &channelFilters = {},
+                         bool listImmediately = false);
+
     void showNetworkConfig(NetworkId netId = NetworkId());
     void showCoreConnectionDlg();
     void showCoreConfigWizard(const QVariantList &, const QVariantList &);
@@ -135,6 +141,8 @@ private slots:
     void showNewTransferDlg(const QUuid &transferId);
     void onFullScreenToggled();
 
+    void doAutoConnect();
+
     void handleCoreConnectionError(const QString &errorMsg);
     void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage);
     void handleNoSslInClient(bool *accepted);