Finishing the renaming of the BufferTreeView, since SVN doesn't allow

renaming if the file is localy changed. (buffertreemodel.[cpp|h]
to networkmodel.[cpp|h] and resulting includes).

diff --git a/src/client/client.pri b/src/client/client.pri
index 4f16a71..740f74e 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 \
+SRCS += buffer.cpp networkmodel.cpp client.cpp clientsettings.cpp mappedselectionmodel.cpp modelpropertymapper.cpp \
         nickmodel.cpp selectionmodelsynchronizer.cpp treemodel.cpp
-HDRS += buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h mappedselectionmodel.h modelpropertymapper.h \
+HDRS += buffer.h networkmodel.h client.h clientsettings.h quasselui.h mappedselectionmodel.h modelpropertymapper.h \
         nickmodel.h selectionmodelsynchronizer.h treemodel.h

diff --git a/src/client/buffertreemodel.cpp b/src/client/networkmodel.cpp
similarity index 99%
rename from src/client/buffertreemodel.cpp
rename to src/client/networkmodel.cpp
index 865c4a4..9901615 100644 (file)
--- a/src/client/buffertreemodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -20,7 +20,7 @@
 
 #include <QColor>  // FIXME Dependency on QtGui!
 
-#include "buffertreemodel.h"
+#include "networkmodel.h"
 
 #include "mappedselectionmodel.h"
 #include <QAbstractItemView>

diff --git a/src/client/buffertreemodel.h b/src/client/networkmodel.h
similarity index 100%
rename from src/client/buffertreemodel.h
rename to src/client/networkmodel.h

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index baa1dc6..6388058 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -20,7 +20,7 @@
 
 #include "qtopiamainwin.h"
 
-#include "buffertreemodel.h"
+#include "networkmodel.h"
 #include "bufferviewwidget.h"
 #include "nicklistwidget.h"
 #include "chatline.h"
@@ -62,7 +62,7 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   mainWidget = new MainWidget(this);
   setCentralWidget(mainWidget);
 
-  BufferTreeModel *model = Client::bufferModel();
+  NetworkModel *model = Client::networkModel();
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   toolBar = new QToolBar(this);
@@ -135,7 +135,7 @@ void QtopiaMainWin::connectedToCore() {
   // FIXME just for testing: select first available buffer
   if(Client::allBufferInfos().count() > 1) {
     Buffer *b = Client::buffer(Client::allBufferInfos()[1]);
-    Client::bufferModel()->selectBuffer(b);
+    Client::networkModel()->selectBuffer(b);
   }
 #endif
 }

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index e362da5..37c37ac 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include "buffer.h"
 #include "bufferview.h"
-#include "buffertreemodel.h"
+#include "networkmodel.h"
 
 /*****************************************
 * The TreeView showing the Buffers
@@ -64,12 +64,12 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  Buffer::Type bufferType = (Buffer::Type)index.data(BufferTreeModel::BufferTypeRole).toInt();
+  Buffer::Type bufferType = (Buffer::Type)index.data(NetworkModel::BufferTypeRole).toInt();
 
   if(bufferType != Buffer::ChannelType)
     return;
   
-  Client::fakeInput(index.data(BufferTreeModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::fakeInput(index.data(NetworkModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 9f0d4a1..a5c3d15 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -20,6 +20,8 @@
 
 #include "bufferviewfilter.h"
 
+#include "networkmodel.h"
+
 /*****************************************
 * The Filter for the Tree View
 *****************************************/

diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 2a91733..2586ff2 100644 (file)
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -26,7 +26,6 @@
 #include <QSortFilterProxyModel>
 #include <QSet>
 #include "buffer.h"
-#include "buffertreemodel.h"
 
 /*****************************************
  * Buffer View Filter