@@ -29,7 +29,8 @@ /** * Constructs new PsiContactList. \param psi will not be PsiContactList's parent though. */ -PsiContactList::PsiContactList(PsiCon* psi) : ContactList(), psi_(psi) +PsiContactList::PsiContactList(PsiCon* psi) + : psi_(psi) { } src/psicontactlist.cpp @@ -23,7 +23,6 @@ #include <QList> -#include "contactlist.h" #include "profiles.h" using namespace XMPP; @@ -32,7 +31,7 @@ class PsiCon; class PsiAccount; namespace XMPP { class Jid; } -class PsiContactList : public ContactList +class PsiContactList : public QObject { Q_OBJECT public: src/psicontactlist.h @@ -19,7 +19,6 @@ include($$PWD/tools/optionstree/optionstree.pri) include($$PWD/libpsi/tools/globalshortcut/globalshortcut.pri) include($$PWD/tools/advwidget/advwidget.pri) include($$PWD/libpsi/tools/spellchecker/spellchecker.pri) -include($$PWD/tools/contactlist/contactlist.pri) include($$PWD/libpsi/dialogs/grepshortcutkeydialog.pri) include($$PWD/libpsi/tools/atomicxmlfile/atomicxmlfile.pri) include($$PWD/libpsi/tools/simplecli/simplecli.pri) src/src.pri src/tools/contactlist/contactlist.cpp src/tools/contactlist/contactlist.h src/tools/contactlist/contactlist.pri src/tools/contactlist/contactlist.pro src/tools/contactlist/contactlistalphacomparator.cpp src/tools/contactlist/contactlistalphacomparator.h src/tools/contactlist/contactlistcontact.cpp src/tools/contactlist/contactlistcontact.h src/tools/contactlist/contactlistgroup.cpp src/tools/contactlist/contactlistgroup.h src/tools/contactlist/contactlistgroupitem.cpp src/tools/contactlist/contactlistgroupitem.h src/tools/contactlist/contactlistitem.cpp src/tools/contactlist/contactlistitem.h src/tools/contactlist/contactlistitemcomparator.h src/tools/contactlist/contactlistmodel.cpp src/tools/contactlist/contactlistmodel.h src/tools/contactlist/contactlistrootitem.h src/tools/contactlist/contactlistview.cpp src/tools/contactlist/contactlistview.h src/tools/contactlist/example/close.png src/tools/contactlist/example/example.pro src/tools/contactlist/example/icons/away.png src/tools/contactlist/example/icons/offline.png src/tools/contactlist/example/icons/online.png src/tools/contactlist/example/main.cpp src/tools/contactlist/example/mycontact.h src/tools/contactlist/example/mycontactlist.h src/tools/contactlist/example/mygroup.h src/tools/contactlist/example/pictures/anne.jpg src/tools/contactlist/example/pictures/bill.jpg src/tools/contactlist/example/pictures/brian.jpg src/tools/contactlist/example/pictures/joanna.jpg src/tools/contactlist/example/pictures/lawrence.jpg src/tools/contactlist/example/pictures/mike.jpg src/tools/contactlist/example/pictures/milton.jpg src/tools/contactlist/example/pictures/peter.jpg src/tools/contactlist/example/pictures/samir.jpg src/tools/contactlist/example/pictures/unknown.png src/tools/contactlist/example/resources.qrc src/tools/contactlist/status.h 621182c561a4c11ecbfaee55f8770a35d74f2588 Michail Pishchagin mblsha@users.sourceforge.net http://github.com/mblsha/psi/commit/b29bafac6ebeb5bb09ddfdeb70f583ff6780c3b4 b29bafac6ebeb5bb09ddfdeb70f583ff6780c3b4 2009-11-04T11:27:13-08:00 2009-11-04T11:27:13-08:00 Removed obsolete ContactList demo. b438dd257c59ea9ad2bbb8177cb82bcb7de11049 Michail Pishchagin mblsha@users.sourceforge.net