X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreirclisthelper.cpp;h=0545471381b88a44d27855bf394b8fc9bbc0229d;hp=dbcdcc4c07090922cc2127ba9e75ee5c38b7a2d1;hb=68478cb98a582e4a5b9b8cc188de51287d0da6b0;hpb=02455427bfd88584a81f94b1b234fe21ad3e09cd diff --git a/src/core/coreirclisthelper.cpp b/src/core/coreirclisthelper.cpp index dbcdcc4c..05454713 100644 --- a/src/core/coreirclisthelper.cpp +++ b/src/core/coreirclisthelper.cpp @@ -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 * @@ -20,9 +20,10 @@ #include "coreirclisthelper.h" -#include "networkconnection.h" -#include "userinputhandler.h" +#include "corenetwork.h" +#include "coreuserinputhandler.h" +INIT_SYNCABLE_OBJECT(CoreIrcListHelper) QVariantList CoreIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters) { if(_finishedChannelLists.contains(netId)) return _finishedChannelLists.take(netId); @@ -44,10 +45,10 @@ bool CoreIrcListHelper::addChannel(const NetworkId &netId, const QString &channe } bool CoreIrcListHelper::dispatchQuery(const NetworkId &netId, const QString &query) { - NetworkConnection *networkConnection = coreSession()->networkConnection(netId); - if(networkConnection) { + CoreNetwork *network = coreSession()->network(netId); + if(network) { _channelLists[netId] = QList(); - networkConnection->userInputHandler()->handleList(BufferInfo(), query); + network->userInputHandler()->handleList(BufferInfo(), query); _queryTimeout[startTimer(10000)] = netId; return true; } else {