X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtgui%2Fmainwin.h;h=f5224492b163a6f24b3b4d6cafa9cd0df0114afa;hp=eed60f78364388632a67dc43bdbcbc1095ff3473;hb=06a03c2c69ee934aaeec83512bae2fffee83a340;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4

diff --git a/src/qtgui/mainwin.h b/src/qtgui/mainwin.h
index eed60f78..f5224492 100644
--- a/src/qtgui/mainwin.h
+++ b/src/qtgui/mainwin.h
@@ -21,38 +21,17 @@
 #ifndef _MAINWIN_H_
 #define _MAINWIN_H_
 
-#include <QtGui>
 #include "ui_mainwin.h"
 
-//#include "global.h"
-#include "message.h"
-#include "chatwidget.h"
+#include "qtgui.h"
 #include "bufferviewfilter.h"
-#include "bufferview.h"
 
 class ServerListDlg;
 class CoreConnectDlg;
 class Buffer;
 class SettingsDlg;
-class MainWin;
-
-class QtGui : public AbstractUi {
-  Q_OBJECT
-
-  public:
-    QtGui();
-    ~QtGui();
-    void init();
-    AbstractUiMsg *layoutMsg(const Message &);
-
-  protected slots:
-    void connectedToCore();
-    void disconnectedFromCore();
-
-  private:
-    MainWin *mainWin;
-};
-
+class QtGui;
+class Message;
 
 //!\brief The main window of Quassel's QtGui.
 class MainWin : public QMainWindow {
@@ -78,6 +57,8 @@ class MainWin : public QMainWindow {
 
     void showServerList();
     void showSettingsDlg();
+    void showCoreConnectionDlg(bool autoConnect = false);
+    void coreConnectionDlgFinished(int result);
 
     void showBuffer(BufferId);
     void showBuffer(Buffer *);
@@ -85,7 +66,7 @@ class MainWin : public QMainWindow {
     void importBacklog();
 
   signals:
-    void connectToCore(const VarMap &connInfo);
+    void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
     void requestBacklog(BufferId, QVariant, QVariant);
     void importOldBacklog();
@@ -107,6 +88,7 @@ class MainWin : public QMainWindow {
     SettingsDlg *settingsDlg;
 
     uint currentBuffer;
+    QString currentProfile;
 
     QList<QDockWidget *> netViews;