Aaaand renaming NickModel again. Oh well.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index ac277a1..31f21d0 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -40,8 +40,8 @@ src/client/mappedselectionmodel.cpp
 src/client/mappedselectionmodel.h
 src/client/modelpropertymapper.cpp
 src/client/modelpropertymapper.h
-src/client/nicktreemodel.cpp
-src/client/nicktreemodel.h
+src/client/nickmodel.cpp
+src/client/nickmodel.h
 src/client/quasselui.h
 src/client/selectionmodelsynchronizer.cpp
 src/client/selectionmodelsynchronizer.h
@@ -67,14 +67,10 @@ src/common/message.cpp
 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/types.h
 src/common/util.cpp
 src/common/util.h
@@ -125,9 +121,7 @@ src/qtopia/qtopiauistyle.cpp
 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/coreconnectdlg.ui
 src/qtopia/ui/coreconnectprogressdlg.ui

diff --git a/src/client/client.pri b/src/client/client.pri
index 2aabd35..4f16a71 100644 (file)
--- a/src/client/client.pri
+++ b/src/client/client.pri
@@ -1,6 +1,6 @@
 DEPMOD = common
 QT_MOD = core network gui   # gui is needed just for QColor... FIXME!
 SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp mappedselectionmodel.cpp modelpropertymapper.cpp \
-        nicktreemodel.cpp selectionmodelsynchronizer.cpp treemodel.cpp
+        nickmodel.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
+        nickmodel.h selectionmodelsynchronizer.h treemodel.h

diff --git a/src/client/nicktreemodel.cpp b/src/client/nickmodel.cpp
similarity index 98%
rename from src/client/nicktreemodel.cpp
rename to src/client/nickmodel.cpp
index 89e1ca7..ad1884c 100644 (file)
--- a/src/client/nicktreemodel.cpp
+++ b/src/client/nickmodel.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "nicktreemodel.h"
+#include "nickmodel.h"
 
 #include "ircchannel.h"
 

diff --git a/src/client/nicktreemodel.h b/src/client/nickmodel.h
similarity index 95%
rename from src/client/nicktreemodel.h
rename to src/client/nickmodel.h
index 79dead3..313c678 100644 (file)
--- a/src/client/nicktreemodel.h
+++ b/src/client/nickmodel.h
@@ -18,14 +18,13 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _NICKTREEMODEL_H_
-#define _NICKTREEMODEL_H_
-
-#include "ircuser.h"
-//#include "treemodel.h"
+#ifndef _NICKMODEL_H_
+#define _NICKMODEL_H_
 
 #include <QAbstractItemModel>
 
+class IrcChannel;
+
 /*
 //! Represents a single IrcUser within a NickTreeModel.
 class NickTreeItem : public TreeItem {