Renaming/moving some files. Apparently, I can't use a QStringListModel since

it's in QtGui, so I will probably try my luck using EgS' TreeModel as a base.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index 114c8f2..e59c1c4 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -40,6 +40,8 @@ src/client/mappedselectionmodel.cpp
 src/client/mappedselectionmodel.h
 src/client/modelpropertymapper.cpp
 src/client/modelpropertymapper.h
 src/client/mappedselectionmodel.h
 src/client/modelpropertymapper.cpp
 src/client/modelpropertymapper.h

+src/client/nicktreemodel.cpp
+src/client/nicktreemodel.h

 src/client/quasselui.h
 src/client/selectionmodelsynchronizer.cpp
 src/client/selectionmodelsynchronizer.h
 src/client/quasselui.h
 src/client/selectionmodelsynchronizer.cpp
 src/client/selectionmodelsynchronizer.h


@@ -131,6 +133,7 @@ src/qtopia/ui/coreconnectdlg.ui
 src/qtopia/ui/coreconnectprogressdlg.ui
 src/qtopia/ui/editcoreacctdlg.ui
 src/qtopia/ui/mainwidget.ui
 src/qtopia/ui/coreconnectprogressdlg.ui
 src/qtopia/ui/editcoreacctdlg.ui
 src/qtopia/ui/mainwidget.ui

+src/qtopia/ui/nicklistwidget.ui

 src/qtui
 src/qtui/bufferwidget.cpp
 src/qtui/bufferwidget.h
 src/qtui
 src/qtui/bufferwidget.cpp
 src/qtui/bufferwidget.h

diff --git a/src/client/client.pri b/src/client/client.pri
index dbf434d..2aabd35 100644 (file)
--- a/src/client/client.pri
+++ b/src/client/client.pri
@@ -1,4 +1,6 @@
 DEPMOD = common
 QT_MOD = core network gui   # gui is needed just for QColor... FIXME!
 DEPMOD = common
 QT_MOD = core network gui   # gui is needed just for QColor... FIXME!

-SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp mappedselectionmodel.cpp selectionmodelsynchronizer.cpp modelpropertymapper.cpp
-HDRS += buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h treemodel.h mappedselectionmodel.h selectionmodelsynchronizer.h modelpropertymapper.h
+SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp mappedselectionmodel.cpp modelpropertymapper.cpp \
+        nicktreemodel.cpp selectionmodelsynchronizer.cpp treemodel.cpp
+HDRS += buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h mappedselectionmodel.h modelpropertymapper.h \
+        nicktreemodel.h selectionmodelsynchronizer.h treemodel.h

diff --git a/src/common/nickmodel.cpp b/src/client/nicktreemodel.cpp
similarity index 91%
rename from src/common/nickmodel.cpp
rename to src/client/nicktreemodel.cpp
index b27d9ad..25b6de8 100644 (file)
--- a/src/common/nickmodel.cpp
+++ b/src/client/nicktreemodel.cpp
@@ -18,16 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#include "nickmodel.h"
+#include "nicktreemodel.h"

 
 
 
 

-NickModel::NickModel(QObject *parent) : QAbstractListModel(parent) {
+NickTreeModel::NickTreeModel(QObject *parent) : TreeModel(QList<QVariant>(), parent) {

   //QStringList list; list << "test1" << "test2";
   //setStringList(list);
 
 }
 
   //QStringList list; list << "test1" << "test2";
   //setStringList(list);
 
 }
 

-NickModel::~NickModel() {
+NickTreeModel::~NickTreeModel() {

 
 
 }
 
 
 }

diff --git a/src/common/nickmodel.h b/src/client/nicktreemodel.h
similarity index 89%
rename from src/common/nickmodel.h
rename to src/client/nicktreemodel.h
index 7620c48..5c57674 100644 (file)
--- a/src/common/nickmodel.h
+++ b/src/client/nicktreemodel.h
@@ -18,17 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#ifndef _NICKMODEL_H_
-#define _NICKMODEL_H_
+#ifndef _NICKTREEMODEL_H_
+#define _NICKTREEMODEL_H_

 
 

-#include <QAbstractListModel>
+#include "treemodel.h"

 
 

-class NickModel : public QAbstractListModel {
+class NickTreeModel : public TreeModel {

   Q_OBJECT
 
   public:
   Q_OBJECT
 
   public:

-    NickModel(QObject *parent = 0);
-    ~NickModel();
+    NickTreeModel(QObject *parent = 0);
+    virtual ~NickTreeModel();

 
   private:
 
 
   private:
 

diff --git a/src/common/common.pri b/src/common/common.pri
index e311a44..cab2cd0 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 += 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
+SRCS += bufferinfo.cpp global.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp networkinfo.cpp ircuser.cpp ircchannel.cpp
+HDRS += bufferinfo.h global.h logger.h message.h settings.h signalproxy.h util.h networkinfo.h ircuser.h ircchannel.h types.h

diff --git a/src/qtopia/nicklistwidget.cpp b/src/qtopia/nicklistwidget.cpp
index 2a148b3..f14fc86 100644 (file)
--- a/src/qtopia/nicklistwidget.cpp
+++ b/src/qtopia/nicklistwidget.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "nicklistwidget.h"
  ***************************************************************************/
 
 #include "nicklistwidget.h"

-#include "nickmodel.h"
+#include "nicktreemodel.h"

 
 NickListWidget::NickListWidget(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
 
 NickListWidget::NickListWidget(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);


@@ -34,7 +34,7 @@ NickListWidget::~NickListWidget() {
 
 }
 
 
 }
 

-void NickListWidget::setNickModel(NickModel *model) {
+void NickListWidget::setNickModel(NickTreeModel *model) {

   ui.nickView->setModel(model);
 
 }
   ui.nickView->setModel(model);
 
 }

diff --git a/src/qtopia/nicklistwidget.h b/src/qtopia/nicklistwidget.h
index d15743d..6f35716 100644 (file)
--- a/src/qtopia/nicklistwidget.h
+++ b/src/qtopia/nicklistwidget.h
@@ -25,7 +25,7 @@
 
 #include "ui_nicklistwidget.h"
 
 
 #include "ui_nicklistwidget.h"
 

-class NickModel;
+class NickTreeModel;

 
 class NickListWidget : public QDialog {
   Q_OBJECT
 
 class NickListWidget : public QDialog {
   Q_OBJECT


@@ -35,7 +35,7 @@ class NickListWidget : public QDialog {
     ~NickListWidget();
 
   public slots:
     ~NickListWidget();
 
   public slots:

-    void setNickModel(NickModel *model);
+    void setNickModel(NickTreeModel *model);

 
   private:
     Ui::NickListWidget ui;
 
   private:
     Ui::NickListWidget ui;