Move the client's AliasManager into Client

[quassel.git] / src / qtui / settingspages / aliasesmodel.h

diff --git a/src/qtui/settingspages/aliasesmodel.h b/src/qtui/settingspages/aliasesmodel.h
index f10c818..c6e8295 100644 (file)
--- a/src/qtui/settingspages/aliasesmodel.h
+++ b/src/qtui/settingspages/aliasesmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,7 +24,7 @@
 #include <QAbstractItemModel>
 #include <QPointer>
 
-#include "aliasmanager.h"
+#include "clientaliasmanager.h"
 
 class AliasesModel : public QAbstractItemModel {
   Q_OBJECT
@@ -47,21 +47,23 @@ public:
   inline int columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent) return 2; }
 
   inline bool configChanged() const { return _configChanged; }
+  inline bool isReady() const { return _modelReady; }
 
 public slots:
   void newAlias();
+  void loadDefaults();
   void removeAlias(int index);
   void revert();
   void commit();
 
 signals:
   void configChanged(bool);
-  void modelReady();
-  
+  void modelReady(bool);
+
 private:
-  AliasManager _aliasManager;
-  AliasManager _clonedAliasManager;
+  ClientAliasManager _clonedAliasManager;
   bool _configChanged;
+  bool _modelReady;
 
   const AliasManager &aliasManager() const;
   AliasManager &aliasManager();
@@ -69,6 +71,7 @@ private:
 
 private slots:
   void clientConnected();
+  void clientDisconnected();
   void initDone();
 };