Finishing the switch to types.h and the resulting cleanup.

There are also some new files related to the nicklist, which don't do much yet though.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index 1b7ed65..114c8f2 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -65,12 +65,15 @@ src/common/message.cpp
 src/common/message.h
 src/common/networkinfo.cpp
 src/common/networkinfo.h
 src/common/message.h
 src/common/networkinfo.cpp
 src/common/networkinfo.h

+src/common/nickmodel.cpp
+src/common/nickmodel.h

 src/common/settings.cpp
 src/common/settings.h
 src/common/signalproxy.cpp
 src/common/signalproxy.h
 src/common/synchronizer.cpp
 src/common/synchronizer.h
 src/common/settings.cpp
 src/common/settings.h
 src/common/signalproxy.cpp
 src/common/signalproxy.h
 src/common/synchronizer.cpp
 src/common/synchronizer.h

+src/common/types.h

 src/common/util.cpp
 src/common/util.h
 src/core
 src/common/util.cpp
 src/common/util.h
 src/core


@@ -109,6 +112,8 @@ src/qtopia/coreconnectdlg.h
 src/qtopia/main.cpp
 src/qtopia/mainwidget.cpp
 src/qtopia/mainwidget.h
 src/qtopia/main.cpp
 src/qtopia/mainwidget.cpp
 src/qtopia/mainwidget.h

+src/qtopia/nicklistwidget.cpp
+src/qtopia/nicklistwidget.h

 src/qtopia/qtopia.pri
 src/qtopia/qtopiamainwin.cpp
 src/qtopia/qtopiamainwin.h
 src/qtopia/qtopia.pri
 src/qtopia/qtopiamainwin.cpp
 src/qtopia/qtopiamainwin.h


@@ -118,6 +123,7 @@ src/qtopia/qtopiauistyle.cpp
 src/qtopia/qtopiauistyle.h
 src/qtopia/topicbar.cpp
 src/qtopia/topicbar.h
 src/qtopia/qtopiauistyle.h
 src/qtopia/topicbar.cpp
 src/qtopia/topicbar.h

+src/qtopia/types.h

 src/qtopia/ui
 src/qtopia/ui/bufferview.ui
 src/qtopia/ui/bufferviewwidget.ui
 src/qtopia/ui
 src/qtopia/ui/bufferview.ui
 src/qtopia/ui/bufferviewwidget.ui

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ec01b28..899991f 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -20,14 +20,13 @@
 
 #include "client.h"
 
 
 #include "client.h"
 

-#include "networkinfo.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-
-#include "message.h"
-

 #include "bufferinfo.h"
 #include "buffertreemodel.h"
 #include "bufferinfo.h"
 #include "buffertreemodel.h"

+#include "global.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "message.h"
+#include "networkinfo.h"

 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"
 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index bee4cfa..d22b602 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -18,7 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#include "global.h"

 #include "treemodel.h"
 
 /*****************************************
 #include "treemodel.h"
 
 /*****************************************

diff --git a/src/common/common.pri b/src/common/common.pri
index dec566a..e311a44 100644 (file)
--- a/src/common/common.pri
+++ b/src/common/common.pri
@@ -1,4 +1,4 @@
 DEPMOD = 
 QT_MOD = network
 DEPMOD = 
 QT_MOD = network

-SRCS += global.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp networkinfo.cpp ircuser.cpp ircchannel.cpp bufferinfo.cpp
-HDRS += global.h logger.h message.h settings.h signalproxy.h util.h networkinfo.h ircuser.h ircchannel.h bufferinfo.h
+SRCS += bufferinfo.cpp global.cpp logger.cpp message.cpp nickmodel.cpp settings.cpp signalproxy.cpp util.cpp networkinfo.cpp ircuser.cpp ircchannel.cpp
+HDRS += bufferinfo.h global.h logger.h message.h nickmodel.h settings.h signalproxy.h util.h networkinfo.h ircuser.h ircchannel.h types.h

diff --git a/src/common/global.cpp b/src/common/global.cpp
index 954e52b..6081953 100644 (file)
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -18,12 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include <QObject>
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include <QObject>

-#include <QStringList>

 
 #include "global.h"
 #include "logger.h"
 
 #include "global.h"
 #include "logger.h"

-#include "message.h"
-#include "util.h"

 
 extern void messageHandler(QtMsgType type, const char *msg);
 
 
 extern void messageHandler(QtMsgType type, const char *msg);
 

diff --git a/src/common/global.h b/src/common/global.h
index 33d52f4..73ddd0b 100644 (file)
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -18,42 +18,21 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

+// This file needs probably to go away at some point. Not much left anymore.
+

 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
 /** The protocol version we use fo the communication between core and GUI */
 #define GUI_PROTOCOL 3
 
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
 /** The protocol version we use fo the communication between core and GUI */
 #define GUI_PROTOCOL 3
 

-#define BACKLOG_FORMAT 2
-#define BACKLOG_STRING "QuasselIRC Backlog File"
-

 #define DEFAULT_PORT 4242
 
 #define DEFAULT_PORT 4242
 

-#include <QHash>
-#include <QMutex>
-#include <QString>
-#include <QVariant>
-

 /* Some global stuff */
 
 /* Some global stuff */
 

-typedef uint UserId;
-typedef uint MsgId;
-typedef uint BufferId;
-typedef uint NetworkId;
-

 namespace Global {
   enum RunMode { Monolithic, ClientOnly, CoreOnly };
   extern RunMode runMode;
 }
 
 namespace Global {
   enum RunMode { Monolithic, ClientOnly, CoreOnly };
   extern RunMode runMode;
 }
 

-struct Exception {
-    Exception(QString msg = "Unknown Exception") : _msg(msg) {};
-    virtual ~Exception() {}; // make gcc happy
-    virtual inline QString msg() { return _msg; }
-
-  protected:
-    QString _msg;
-
-};
-

 #endif
 #endif

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 3ca8e34..f562dd4 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

+#include "global.h"

 #include "settings.h"
 #include <QString>
 #include <QTranslator>
 #include "settings.h"
 #include <QString>
 #include <QTranslator>

diff --git a/src/common/message.h b/src/common/message.h
index 4374283..c30c176 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -21,12 +21,11 @@
 #ifndef _MESSAGE_H_
 #define _MESSAGE_H_
 
 #ifndef _MESSAGE_H_
 #define _MESSAGE_H_
 

-#include <QCoreApplication>

 #include <QString>
 #include <QDateTime>
 
 #include "bufferinfo.h"
 #include <QString>
 #include <QDateTime>
 
 #include "bufferinfo.h"

-#include "global.h"
+#include "types.h"

 
 class Message {
   Q_DECLARE_TR_FUNCTIONS(Message);
 
 class Message {
   Q_DECLARE_TR_FUNCTIONS(Message);

diff --git a/src/common/nickmodel.cpp b/src/common/nickmodel.cpp
new file mode 100644 (file)
index 0000000..b27d9ad
--- /dev/null
+++ b/src/common/nickmodel.cpp
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "nickmodel.h"
+
+
+NickModel::NickModel(QObject *parent) : QAbstractListModel(parent) {
+  //QStringList list; list << "test1" << "test2";
+  //setStringList(list);
+
+}
+
+NickModel::~NickModel() {
+
+
+}

diff --git a/src/common/nickmodel.h b/src/common/nickmodel.h
new file mode 100644 (file)
index 0000000..7620c48
--- /dev/null
+++ b/src/common/nickmodel.h
@@ -0,0 +1,37 @@
+/***************************************************************************
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _NICKMODEL_H_
+#define _NICKMODEL_H_
+
+#include <QAbstractListModel>
+
+class NickModel : public QAbstractListModel {
+  Q_OBJECT
+
+  public:
+    NickModel(QObject *parent = 0);
+    ~NickModel();
+
+  private:
+
+};
+
+#endif

diff --git a/src/qtopia/types.h b/src/common/types.h
similarity index 100%
rename from src/qtopia/types.h
rename to src/common/types.h

diff --git a/src/core/core.h b/src/core/core.h
index 602f7bf..ae1c05c 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -27,6 +27,7 @@
 #include <QTcpSocket>
 
 #include "global.h"
 #include <QTcpSocket>
 
 #include "global.h"

+#include "types.h"

 
 class CoreSession;
 class Storage;
 
 class CoreSession;
 class Storage;

diff --git a/src/core/coresettings.h b/src/core/coresettings.h
index 8c19d73..e11b466 100644 (file)
--- a/src/core/coresettings.h
+++ b/src/core/coresettings.h
@@ -21,8 +21,8 @@
 #ifndef CORESETTINGS_H_
 #define CORESETTINGS_H_
 
 #ifndef CORESETTINGS_H_
 #define CORESETTINGS_H_
 

-#include "settings.h"

 #include "global.h"
 #include "global.h"

+#include "settings.h"

 
 class CoreSettings : public Settings {
   Q_OBJECT
 
 class CoreSettings : public Settings {
   Q_OBJECT

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index b439aef..75119bb 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -521,7 +521,7 @@ QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int
 
 QString SqliteStorage::backlogFile(bool createPath) {
   // kinda ugly, but I currently see no other way to do that
 
 QString SqliteStorage::backlogFile(bool createPath) {
   // kinda ugly, but I currently see no other way to do that

-#ifdef _WINDOWS
+#ifdef Q_OS_WIN32

   QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "\\quassel\\";
 #else
   QString quasselDir = QDir::homePath() + "/.quassel/";
   QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "\\quassel\\";
 #else
   QString quasselDir = QDir::homePath() + "/.quassel/";

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index 6a5ba02..4475962 100644 (file)
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -24,6 +24,7 @@
 
 ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
   setStyleSheet("background-color: rgba(255, 255, 255, 60%)");
 
 ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
   setStyleSheet("background-color: rgba(255, 255, 255, 60%)");

+  setTextInteractionFlags(Qt::TextBrowserInteraction);

 }
 
 void ChatWidget::setContents(QList<ChatLine *> lines) {
 }
 
 void ChatWidget::setContents(QList<ChatLine *> lines) {

diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp
index 09fa196..1061034 100644 (file)
--- a/src/qtopia/coreconnectdlg.cpp
+++ b/src/qtopia/coreconnectdlg.cpp
@@ -22,9 +22,9 @@
 #include <QSoftMenuBar>
 
 #include "coreconnectdlg.h"
 #include <QSoftMenuBar>
 
 #include "coreconnectdlg.h"

-#include "global.h"

 #include "client.h"
 #include "clientsettings.h"
 #include "client.h"
 #include "clientsettings.h"

+#include "global.h"

 
 CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) {
   ui.setupUi(this);
 
 CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) {
   ui.setupUi(this);

diff --git a/src/qtopia/coreconnectdlg.h b/src/qtopia/coreconnectdlg.h
index 8f03ee0..a21734b 100644 (file)
--- a/src/qtopia/coreconnectdlg.h
+++ b/src/qtopia/coreconnectdlg.h
@@ -24,7 +24,6 @@
 #include "ui_coreconnectdlg.h"
 #include "ui_coreconnectprogressdlg.h"
 #include "ui_editcoreacctdlg.h"
 #include "ui_coreconnectdlg.h"
 #include "ui_coreconnectprogressdlg.h"
 #include "ui_editcoreacctdlg.h"

-#include "global.h"

 
 class CoreConnectProgressDlg;
 
 
 class CoreConnectProgressDlg;
 

diff --git a/src/qtopia/nicklistwidget.cpp b/src/qtopia/nicklistwidget.cpp
new file mode 100644 (file)
index 0000000..2a148b3
--- /dev/null
+++ b/src/qtopia/nicklistwidget.cpp
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "nicklistwidget.h"
+#include "nickmodel.h"
+
+NickListWidget::NickListWidget(QWidget *parent) : QDialog(parent) {
+  ui.setupUi(this);
+
+
+
+}
+
+NickListWidget::~NickListWidget() {
+
+
+
+}
+
+void NickListWidget::setNickModel(NickModel *model) {
+  ui.nickView->setModel(model);
+
+}

diff --git a/src/qtopia/nicklistwidget.h b/src/qtopia/nicklistwidget.h
new file mode 100644 (file)
index 0000000..d15743d
--- /dev/null
+++ b/src/qtopia/nicklistwidget.h
@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _NICKLISTWIDGET_H_
+#define _NICKLISTWIDGET_H_
+
+#include <QDialog>
+
+#include "ui_nicklistwidget.h"
+
+class NickModel;
+
+class NickListWidget : public QDialog {
+  Q_OBJECT
+
+  public:
+    NickListWidget(QWidget *parent = 0);
+    ~NickListWidget();
+
+  public slots:
+    void setNickModel(NickModel *model);
+
+  private:
+    Ui::NickListWidget ui;
+
+};
+
+#endif

diff --git a/src/qtopia/qtopia.pri b/src/qtopia/qtopia.pri
index 38ca702..d0a90aa 100644 (file)
--- a/src/qtopia/qtopia.pri
+++ b/src/qtopia/qtopia.pri
@@ -1,6 +1,8 @@
 DEPMOD = uisupport common client
 QT_MOD = core gui network
 
 DEPMOD = uisupport common client
 QT_MOD = core gui network
 

-HDRS += bufferviewwidget.h chatline.h chatwidget.h coreconnectdlg.h mainwidget.h qtopiaui.h qtopiamainwin.h qtopiauistyle.h topicbar.h
-SRCS += bufferviewwidget.cpp chatline.cpp chatwidget.cpp coreconnectdlg.cpp main.cpp mainwidget.cpp qtopiaui.cpp qtopiamainwin.cpp qtopiauistyle.cpp topicbar.cpp
-FRMS += ui/bufferviewwidget.ui ui/coreconnectdlg.ui ui/coreconnectprogressdlg.ui ui/editcoreacctdlg.ui ui/mainwidget.ui
+HDRS += bufferviewwidget.h chatline.h chatwidget.h coreconnectdlg.h mainwidget.h nicklistwidget.h \
+        qtopiaui.h qtopiamainwin.h qtopiauistyle.h topicbar.h
+SRCS += bufferviewwidget.cpp chatline.cpp chatwidget.cpp coreconnectdlg.cpp main.cpp mainwidget.cpp nicklistwidget.cpp \
+        qtopiaui.cpp qtopiamainwin.cpp qtopiauistyle.cpp topicbar.cpp
+FRMS += ui/bufferviewwidget.ui ui/coreconnectdlg.ui ui/coreconnectprogressdlg.ui ui/editcoreacctdlg.ui ui/mainwidget.ui ui/nicklistwidget.ui

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index 5d61594..618b2e6 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -22,6 +22,7 @@
 
 #include "buffertreemodel.h"
 #include "bufferviewwidget.h"
 
 #include "buffertreemodel.h"
 #include "bufferviewwidget.h"

+#include "nicklistwidget.h"

 #include "chatline.h"
 #include "coreconnectdlg.h"
 #include "global.h"
 #include "chatline.h"
 #include "coreconnectdlg.h"
 #include "global.h"


@@ -68,6 +69,7 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   addToolBar(toolBar);
 
   bufferViewWidget = new BufferViewWidget(this);
   addToolBar(toolBar);
 
   bufferViewWidget = new BufferViewWidget(this);

+  nickListWidget = new NickListWidget(this);

 
   setupActions();
 
 
   setupActions();
 


@@ -94,7 +96,7 @@ QtopiaMainWin::~QtopiaMainWin() {
 
 void QtopiaMainWin::setupActions() {
   showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), "Show Buffers", this, SLOT(showBufferView()));  // FIXME provide real icon
 
 void QtopiaMainWin::setupActions() {
   showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), "Show Buffers", this, SLOT(showBufferView()));  // FIXME provide real icon

-
+  showNicksAction = toolBar->addAction(QIcon(":icon/list"), "Show Nicks", this, SLOT(showNickList()));

 
 }
 
 
 }
 


@@ -121,6 +123,7 @@ AbstractUiMsg *QtopiaMainWin::layoutMsg(const Message &msg) {
 
 void QtopiaMainWin::showBuffer(Buffer *b) {
   mainWidget->setBuffer(b);
 
 void QtopiaMainWin::showBuffer(Buffer *b) {
   mainWidget->setBuffer(b);

+  //nickListWidget->

 
 }
 
 
 }
 


@@ -129,4 +132,8 @@ void QtopiaMainWin::showBufferView() {
 
 }
 
 
 }
 

+void QtopiaMainWin::showNickList() {
+  nickListWidget->showMaximized();
+}
+

 
 

diff --git a/src/qtopia/qtopiamainwin.h b/src/qtopia/qtopiamainwin.h
index c1a26ba..6f93f62 100644 (file)
--- a/src/qtopia/qtopiamainwin.h
+++ b/src/qtopia/qtopiamainwin.h
@@ -24,10 +24,10 @@
 #include <QtGui>
 
 #include "client.h"
 #include <QtGui>
 
 #include "client.h"

-#include "global.h"

 
 class BufferViewWidget;
 class MainWidget;
 
 class BufferViewWidget;
 class MainWidget;

+class NickListWidget;

 
 class QtopiaMainWin : public QMainWindow {
   Q_OBJECT
 
 class QtopiaMainWin : public QMainWindow {
   Q_OBJECT


@@ -50,6 +50,7 @@ class QtopiaMainWin : public QMainWindow {
   private slots:
     void showBuffer(Buffer *);
     void showBufferView();
   private slots:
     void showBuffer(Buffer *);
     void showBufferView();

+    void showNickList();

 
   private:
     void init();
 
   private:
     void init();


@@ -57,8 +58,9 @@ class QtopiaMainWin : public QMainWindow {
 
     MainWidget *mainWidget;
     QToolBar *toolBar;
 
     MainWidget *mainWidget;
     QToolBar *toolBar;

-    QAction *showBuffersAction;
+    QAction *showBuffersAction, *showNicksAction;

     BufferViewWidget *bufferViewWidget;
     BufferViewWidget *bufferViewWidget;

+    NickListWidget *nickListWidget;

 
     friend class QtopiaUi;
 };
 
     friend class QtopiaUi;
 };

diff --git a/src/qtopia/ui/nicklistwidget.ui b/src/qtopia/ui/nicklistwidget.ui
new file mode 100644 (file)
index 0000000..05e18a6
--- /dev/null
+++ b/src/qtopia/ui/nicklistwidget.ui
@@ -0,0 +1,35 @@
+<ui version="4.0" >
+ <class>NickListWidget</class>
+ <widget class="QDialog" name="NickListWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>240</width>
+    <height>286</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Nicks in Channel</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="leftMargin" >
+    <number>1</number>
+   </property>
+   <property name="topMargin" >
+    <number>1</number>
+   </property>
+   <property name="rightMargin" >
+    <number>1</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>1</number>
+   </property>
+   <item>
+    <widget class="QListView" name="nickView" />
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/qtui/bufferwidget.h b/src/qtui/bufferwidget.h
index 79786db..beb0916 100644 (file)
--- a/src/qtui/bufferwidget.h
+++ b/src/qtui/bufferwidget.h
@@ -24,7 +24,7 @@
 #include "ui_bufferwidget.h"
 
 #include "chatview.h"
 #include "ui_bufferwidget.h"
 
 #include "chatview.h"

-#include "global.h"
+#include "types.h"

 
 class Buffer;
 class ChatView;
 
 class Buffer;
 class ChatView;

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 2f51fdd..16d4552 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -20,10 +20,10 @@
 
 #include <QtGui>
 #include "coreconnectdlg.h"
 
 #include <QtGui>
 #include "coreconnectdlg.h"

-#include "global.h"

 #include "client.h"
 #include "clientsettings.h"
 #include "configwizard.h"
 #include "client.h"
 #include "clientsettings.h"
 #include "configwizard.h"

+#include "global.h"

 
 CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) {
   ui.setupUi(this); //qDebug() << "new dlg";
 
 CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialog(parent) {
   ui.setupUi(this); //qDebug() << "new dlg";

diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h
index 3d8574f..55041b9 100644 (file)
--- a/src/qtui/coreconnectdlg.h
+++ b/src/qtui/coreconnectdlg.h
@@ -22,7 +22,6 @@
 #define _CORECONNECTDLG_H
 
 #include "ui_coreconnectdlg.h"
 #define _CORECONNECTDLG_H
 
 #include "ui_coreconnectdlg.h"

-#include "global.h"

 
 class CoreConnectDlg: public QDialog {
   Q_OBJECT
 
 class CoreConnectDlg: public QDialog {
   Q_OBJECT

diff --git a/src/qtui/identities.h b/src/qtui/identities.h
index 91cf06e..36f74e3 100644 (file)
--- a/src/qtui/identities.h
+++ b/src/qtui/identities.h
@@ -24,7 +24,6 @@
 #include <QtGui>
 #include <QtCore>
 
 #include <QtGui>
 #include <QtCore>
 

-#include "global.h"

 #include "ui_identitiesdlg.h"
 #include "ui_identitieseditdlg.h"
 #include "ui_nickeditdlg.h"
 #include "ui_identitiesdlg.h"
 #include "ui_identitieseditdlg.h"
 #include "ui_nickeditdlg.h"

diff --git a/src/qtui/serverlist.h b/src/qtui/serverlist.h
index f3058b8..fa9c910 100644 (file)
--- a/src/qtui/serverlist.h
+++ b/src/qtui/serverlist.h
@@ -25,7 +25,6 @@
 #include <QMap>
 #include <QList>
 #include <QVariant>
 #include <QMap>
 #include <QList>
 #include <QVariant>

-#include "global.h"

 
 #include "ui_serverlistdlg.h"
 #include "ui_networkeditdlg.h"
 
 #include "ui_serverlistdlg.h"
 #include "ui_networkeditdlg.h"