Moved BufferView and BufferViewFilter to uisupport, since I intend

using it in QuasselTopia as well. Does not make sense to reinvent
the wheel...

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index a8958f7..cfc3fb2 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -7,70 +7,11 @@ build/contrib/libqxt-config.pri
 build/contrib/libqxt-version.pri
 build/contrib/libqxt.pro
 build/modules
 build/contrib/libqxt-version.pri
 build/contrib/libqxt.pro
 build/modules

-build/modules/client

 build/modules/client.pro
 build/modules/client.pro

-build/modules/client/moc_buffer.cpp
-build/modules/client/moc_buffertreemodel.cpp
-build/modules/client/moc_client.cpp
-build/modules/client/moc_clientsettings.cpp
-build/modules/client/moc_mappedselectionmodel.cpp
-build/modules/client/moc_modelpropertymapper.cpp
-build/modules/client/moc_quasselui.cpp
-build/modules/client/moc_selectionmodelsynchronizer.cpp
-build/modules/client/moc_treemodel.cpp
-build/modules/common

 build/modules/common.pro
 build/modules/common.pro

-build/modules/common/moc_ircchannel.cpp
-build/modules/common/moc_ircuser.cpp
-build/modules/common/moc_logger.cpp
-build/modules/common/moc_networkinfo.cpp
-build/modules/common/moc_settings.cpp
-build/modules/common/moc_signalproxy.cpp
-build/modules/common/moc_synchronizer.cpp
-build/modules/core

 build/modules/core.pro
 build/modules/core.pro

-build/modules/core/moc_basichandler.cpp
-build/modules/core/moc_core.cpp
-build/modules/core/moc_coresession.cpp
-build/modules/core/moc_ctcphandler.cpp
-build/modules/core/moc_ircserverhandler.cpp
-build/modules/core/moc_server.cpp
-build/modules/core/moc_sqlitestorage.cpp
-build/modules/core/moc_storage.cpp
-build/modules/core/moc_userinputhandler.cpp

 build/modules/module.pri
 build/modules/module.pri

-build/modules/qtui

 build/modules/qtui.pro
 build/modules/qtui.pro

-build/modules/qtui/moc_bufferview.cpp
-build/modules/qtui/moc_bufferviewfilter.cpp
-build/modules/qtui/moc_bufferwidget.cpp
-build/modules/qtui/moc_channelwidgetinput.cpp
-build/modules/qtui/moc_chatline.cpp
-build/modules/qtui/moc_chatwidget.cpp
-build/modules/qtui/moc_coreconnectdlg.cpp
-build/modules/qtui/moc_guisettings.cpp
-build/modules/qtui/moc_identities.cpp
-build/modules/qtui/moc_mainwin.cpp
-build/modules/qtui/moc_qtui.cpp
-build/modules/qtui/moc_serverlist.cpp
-build/modules/qtui/moc_settingsdlg.cpp
-build/modules/qtui/moc_tabcompleter.cpp
-build/modules/qtui/moc_topicwidget.cpp
-build/modules/qtui/ui_buffermgmtpage.h
-build/modules/qtui/ui_bufferviewwidget.h
-build/modules/qtui/ui_bufferwidget.h
-build/modules/qtui/ui_connectionpage.h
-build/modules/qtui/ui_coreconnectdlg.h
-build/modules/qtui/ui_identitiesdlg.h
-build/modules/qtui/ui_identitieseditdlg.h
-build/modules/qtui/ui_mainwin.h
-build/modules/qtui/ui_networkeditdlg.h
-build/modules/qtui/ui_nickeditdlg.h
-build/modules/qtui/ui_servereditdlg.h
-build/modules/qtui/ui_serverlistdlg.h
-build/modules/qtui/ui_settingsdlg.h
-build/modules/qtui/ui_topicwidget.h
-build/modules/qtui/ui_usermgmtpage.h

 build/modules/uisupport.pro
 build/quassel.pro
 build/targets
 build/modules/uisupport.pro
 build/quassel.pro
 build/targets


@@ -132,290 +73,6 @@ src/common/synchronizer.cpp
 src/common/synchronizer.h
 src/common/util.cpp
 src/common/util.h
 src/common/synchronizer.h
 src/common/util.cpp
 src/common/util.h

-src/contrib
-src/contrib/libqxt-2007-10-24
-src/contrib/libqxt-2007-10-24/config.pri
-src/contrib/libqxt-2007-10-24/config.tests
-src/contrib/libqxt-2007-10-24/config.tests/curses
-src/contrib/libqxt-2007-10-24/config.tests/curses/curses.pro
-src/contrib/libqxt-2007-10-24/config.tests/curses/main.cpp
-src/contrib/libqxt-2007-10-24/config.tests/fcgi
-src/contrib/libqxt-2007-10-24/config.tests/fcgi/fcgi.pro
-src/contrib/libqxt-2007-10-24/config.tests/fcgi/main.cpp
-src/contrib/libqxt-2007-10-24/config.tests/ffmpeg
-src/contrib/libqxt-2007-10-24/config.tests/ffmpeg/ffmpeg.pro
-src/contrib/libqxt-2007-10-24/config.tests/ffmpeg/main.cpp
-src/contrib/libqxt-2007-10-24/config.tests/openssl
-src/contrib/libqxt-2007-10-24/config.tests/openssl/main.cpp
-src/contrib/libqxt-2007-10-24/config.tests/openssl/openssl.pro
-src/contrib/libqxt-2007-10-24/config.tests/qt4
-src/contrib/libqxt-2007-10-24/config.tests/qt4/main.cpp
-src/contrib/libqxt-2007-10-24/config.tests/qt4/qt4.pro
-src/contrib/libqxt-2007-10-24/config.tests/sdl
-src/contrib/libqxt-2007-10-24/config.tests/sdl/main.cpp
-src/contrib/libqxt-2007-10-24/config.tests/sdl/sdl.pro
-src/contrib/libqxt-2007-10-24/examples
-src/contrib/libqxt-2007-10-24/examples/rpcpeer
-src/contrib/libqxt-2007-10-24/examples/rpcpeer/main.cpp
-src/contrib/libqxt-2007-10-24/examples/rpcpeer/rpcpeer.pro
-src/contrib/libqxt-2007-10-24/libqxt.pro
-src/contrib/libqxt-2007-10-24/src
-src/contrib/libqxt-2007-10-24/src/core
-src/contrib/libqxt-2007-10-24/src/core/core.pro
-src/contrib/libqxt-2007-10-24/src/core/qxtboundcfunction.h
-src/contrib/libqxt-2007-10-24/src/core/qxtboundfunction.h
-src/contrib/libqxt-2007-10-24/src/core/qxtboundfunctionbase.h
-src/contrib/libqxt-2007-10-24/src/core/qxtcsvmodel.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtcsvmodel.h
-src/contrib/libqxt-2007-10-24/src/core/qxterror.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxterror.h
-src/contrib/libqxt-2007-10-24/src/core/qxtfifo.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtfifo.h
-src/contrib/libqxt-2007-10-24/src/core/qxtfilelock.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtfilelock.h
-src/contrib/libqxt-2007-10-24/src/core/qxtfilelock_p.h
-src/contrib/libqxt-2007-10-24/src/core/qxtfilelock_unix.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtfilelock_win.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtglobal.h
-src/contrib/libqxt-2007-10-24/src/core/qxthypermacros.h
-src/contrib/libqxt-2007-10-24/src/core/qxtjob.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtjob.h
-src/contrib/libqxt-2007-10-24/src/core/qxtjob_p.h
-src/contrib/libqxt-2007-10-24/src/core/qxtmetaobject.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtmetaobject.h
-src/contrib/libqxt-2007-10-24/src/core/qxtmetatype.h
-src/contrib/libqxt-2007-10-24/src/core/qxtnamespace.h
-src/contrib/libqxt-2007-10-24/src/core/qxtnull.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtnull.h
-src/contrib/libqxt-2007-10-24/src/core/qxtnullable.h
-src/contrib/libqxt-2007-10-24/src/core/qxtpairList.h
-src/contrib/libqxt-2007-10-24/src/core/qxtpimpl.h
-src/contrib/libqxt-2007-10-24/src/core/qxtpipe.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtpipe.h
-src/contrib/libqxt-2007-10-24/src/core/qxtsemaphore.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtsemaphore.h
-src/contrib/libqxt-2007-10-24/src/core/qxtsignalwaiter.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtsignalwaiter.h
-src/contrib/libqxt-2007-10-24/src/core/qxtslotjob.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtslotjob.h
-src/contrib/libqxt-2007-10-24/src/core/qxtslotjob_p.h
-src/contrib/libqxt-2007-10-24/src/core/qxtstdio.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtstdio.h
-src/contrib/libqxt-2007-10-24/src/core/qxtstdstreambufdevice.cpp
-src/contrib/libqxt-2007-10-24/src/core/qxtstdstreambufdevice.h
-src/contrib/libqxt-2007-10-24/src/core/qxttuple.h
-src/contrib/libqxt-2007-10-24/src/core/qxttuplelist.h
-src/contrib/libqxt-2007-10-24/src/core/qxttypelist.h
-src/contrib/libqxt-2007-10-24/src/crypto
-src/contrib/libqxt-2007-10-24/src/crypto/crypto.pro
-src/contrib/libqxt-2007-10-24/src/crypto/qxtblowfish.cpp
-src/contrib/libqxt-2007-10-24/src/crypto/qxtblowfish.h
-src/contrib/libqxt-2007-10-24/src/crypto/qxthash.cpp
-src/contrib/libqxt-2007-10-24/src/crypto/qxthash.h
-src/contrib/libqxt-2007-10-24/src/crypto/qxthash_p.h
-src/contrib/libqxt-2007-10-24/src/crypto/thirdparty
-src/contrib/libqxt-2007-10-24/src/crypto/thirdparty/md4.cpp
-src/contrib/libqxt-2007-10-24/src/crypto/thirdparty/md4.h
-src/contrib/libqxt-2007-10-24/src/crypto/thirdparty/md5.cpp
-src/contrib/libqxt-2007-10-24/src/crypto/thirdparty/md5.h
-src/contrib/libqxt-2007-10-24/src/designer
-src/contrib/libqxt-2007-10-24/src/designer/designer.pro
-src/contrib/libqxt-2007-10-24/src/designer/qxtcheckcomboboxplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtcheckcomboboxplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtdesignerplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtdesignerplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtdesignerplugins.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtdesignerplugins.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtgroupboxplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtgroupboxplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtlabelplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtlabelplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtlistwidgetplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtlistwidgetplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtprogresslabelplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtprogresslabelplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtpushbuttonplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtpushbuttonplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtspansliderplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtspansliderplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtstarsplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtstarsplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxtstringspinboxplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxtstringspinboxplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxttablewidgetplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxttablewidgetplugin.h
-src/contrib/libqxt-2007-10-24/src/designer/qxttreewidgetplugin.cpp
-src/contrib/libqxt-2007-10-24/src/designer/qxttreewidgetplugin.h
-src/contrib/libqxt-2007-10-24/src/gui
-src/contrib/libqxt-2007-10-24/src/gui/gui.pro
-src/contrib/libqxt-2007-10-24/src/gui/qxtapplication.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtapplication.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtapplication_mac.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtapplication_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtapplication_win.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtapplication_x11.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtcheckcombobox.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtcheckcombobox.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtcheckcombobox_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtconfigdialog.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtconfigdialog.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtconfigdialog_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtconfirmationmessage.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtconfirmationmessage.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtdesktopwidget.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtdesktopwidget.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtdesktopwidget_win.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtdesktopwidget_x11.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtdockwidget.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtdockwidget.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtgroupbox.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtgroupbox.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtgui.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtheaderview.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtheaderview.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtitemdelegate.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtitemdelegate.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtitemdelegate_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtlabel.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtlabel.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtlistwidget.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtlistwidget.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtlistwidget_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtlistwidgetitem.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtlistwidgetitem.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtnativeeventfilter.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtprogresslabel.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtprogresslabel.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtproxystyle.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtproxystyle.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtpushbutton.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtpushbutton.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtspanslider.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtspanslider.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtspanslider_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtstars.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtstars.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtstringspinbox.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtstringspinbox.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtstringvalidator.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxtstringvalidator.h
-src/contrib/libqxt-2007-10-24/src/gui/qxtstringvalidator_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttablewidget.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxttablewidget.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttablewidget_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttablewidgetitem.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxttablewidgetitem.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttabwidget.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxttabwidget.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttooltip.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxttooltip.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttooltip_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttreewidget.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxttreewidget.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttreewidget_p.h
-src/contrib/libqxt-2007-10-24/src/gui/qxttreewidgetitem.cpp
-src/contrib/libqxt-2007-10-24/src/gui/qxttreewidgetitem.h
-src/contrib/libqxt-2007-10-24/src/network
-src/contrib/libqxt-2007-10-24/src/network/network.pro
-src/contrib/libqxt-2007-10-24/src/network/qxtnamedpipe.cpp
-src/contrib/libqxt-2007-10-24/src/network/qxtnamedpipe.h
-src/contrib/libqxt-2007-10-24/src/network/qxtnamedpipe_unix.cpp
-src/contrib/libqxt-2007-10-24/src/network/qxtnamedpipe_win.cpp
-src/contrib/libqxt-2007-10-24/src/network/qxtnamedpipe_win.h
-src/contrib/libqxt-2007-10-24/src/network/qxtnamedpipe_win_p.h
-src/contrib/libqxt-2007-10-24/src/network/qxtrpcpeer.cpp
-src/contrib/libqxt-2007-10-24/src/network/qxtrpcpeer.h
-src/contrib/libqxt-2007-10-24/src/sql
-src/contrib/libqxt-2007-10-24/src/sql/qxtsqlpackage.cpp
-src/contrib/libqxt-2007-10-24/src/sql/qxtsqlpackage.h
-src/contrib/libqxt-2007-10-24/src/sql/qxtsqlpackagemodel.cpp
-src/contrib/libqxt-2007-10-24/src/sql/qxtsqlpackagemodel.h
-src/contrib/libqxt-2007-10-24/src/sql/sql.pro
-src/contrib/libqxt-2007-10-24/src/web
-src/contrib/libqxt-2007-10-24/src/web/qxtabstractwebconnector.h
-src/contrib/libqxt-2007-10-24/src/web/qxtfcgiconnector.cpp
-src/contrib/libqxt-2007-10-24/src/web/qxtfcgiconnector.h
-src/contrib/libqxt-2007-10-24/src/web/qxtfcgiconnector_p.h
-src/contrib/libqxt-2007-10-24/src/web/qxthtmltemplate.cpp
-src/contrib/libqxt-2007-10-24/src/web/qxthtmltemplate.h
-src/contrib/libqxt-2007-10-24/src/web/qxtscgiconnector.cpp
-src/contrib/libqxt-2007-10-24/src/web/qxtscgiconnector.h
-src/contrib/libqxt-2007-10-24/src/web/qxtwebcontroller.cpp
-src/contrib/libqxt-2007-10-24/src/web/qxtwebcontroller.h
-src/contrib/libqxt-2007-10-24/src/web/qxtwebcore.cpp
-src/contrib/libqxt-2007-10-24/src/web/qxtwebcore.h
-src/contrib/libqxt-2007-10-24/src/web/qxtwebcore_p.h
-src/contrib/libqxt-2007-10-24/src/web/web.pro
-src/contrib/libqxt-2007-10-24/tests
-src/contrib/libqxt-2007-10-24/tests/QxtCurses
-src/contrib/libqxt-2007-10-24/tests/QxtCurses/QxtCursesTest.pro
-src/contrib/libqxt-2007-10-24/tests/QxtCurses/cursestest.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtCurses/cursestest.h
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/qxtfilelock.pro
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/HelperClass.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/HelperClass.h
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/locktestclient.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/locktestclient.h
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/main.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/src.pro
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/threadtestcontroller.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtFileLock/src/threadtestcontroller.h
-src/contrib/libqxt-2007-10-24/tests/QxtGui
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/app.pro
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/main.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/mainwindow.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/mainwindow.h
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/mainwindow.ui
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/tab.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/tab.h
-src/contrib/libqxt-2007-10-24/tests/QxtGui/app/tab.ui
-src/contrib/libqxt-2007-10-24/tests/QxtGui/unit
-src/contrib/libqxt-2007-10-24/tests/QxtGui/unit/main.cpp
-src/contrib/libqxt-2007-10-24/tests/QxtGui/unit/unit.pro
-src/contrib/libqxt-2007-10-24/tests/bind
-src/contrib/libqxt-2007-10-24/tests/bind/bind.pro
-src/contrib/libqxt-2007-10-24/tests/bind/main.cpp
-src/contrib/libqxt-2007-10-24/tests/fifo
-src/contrib/libqxt-2007-10-24/tests/fifo/fifo.pro
-src/contrib/libqxt-2007-10-24/tests/fifo/main.cpp
-src/contrib/libqxt-2007-10-24/tests/filelock
-src/contrib/libqxt-2007-10-24/tests/filelock/filelock.pro
-src/contrib/libqxt-2007-10-24/tests/filelock/main.cpp
-src/contrib/libqxt-2007-10-24/tests/job
-src/contrib/libqxt-2007-10-24/tests/job/main.cpp
-src/contrib/libqxt-2007-10-24/tests/job/test.pro
-src/contrib/libqxt-2007-10-24/tests/namedpipe
-src/contrib/libqxt-2007-10-24/tests/namedpipe/main.cpp
-src/contrib/libqxt-2007-10-24/tests/namedpipe/namedpipe.pro
-src/contrib/libqxt-2007-10-24/tests/pipe
-src/contrib/libqxt-2007-10-24/tests/pipe/main.cpp
-src/contrib/libqxt-2007-10-24/tests/pipe/pipe.pro
-src/contrib/libqxt-2007-10-24/tests/rpc
-src/contrib/libqxt-2007-10-24/tests/rpc/main.cpp
-src/contrib/libqxt-2007-10-24/tests/rpc/rpc.pro
-src/contrib/libqxt-2007-10-24/tests/slotjob
-src/contrib/libqxt-2007-10-24/tests/slotjob/main.cpp
-src/contrib/libqxt-2007-10-24/tests/slotjob/slotjob.pro
-src/contrib/libqxt-2007-10-24/tests/web
-src/contrib/libqxt-2007-10-24/tests/web/async
-src/contrib/libqxt-2007-10-24/tests/web/async/main.cpp
-src/contrib/libqxt-2007-10-24/tests/web/async/web.pro
-src/contrib/libqxt-2007-10-24/tests/web/htmltemplate
-src/contrib/libqxt-2007-10-24/tests/web/htmltemplate/htmltemplate.pro
-src/contrib/libqxt-2007-10-24/tests/web/htmltemplate/main.cpp
-src/contrib/libqxt-2007-10-24/tests/web/invoketest
-src/contrib/libqxt-2007-10-24/tests/web/invoketest/main.cpp
-src/contrib/libqxt-2007-10-24/tests/web/invoketest/web.pro
-src/contrib/libqxt-2007-10-24/tests/web/upload
-src/contrib/libqxt-2007-10-24/tests/web/upload/main.cpp
-src/contrib/libqxt-2007-10-24/tests/web/upload/web.pro
-src/contrib/libqxt-2007-10-24/tools
-src/contrib/libqxt-2007-10-24/tools/doqsy
-src/contrib/libqxt-2007-10-24/tools/doqsy/doqsy.pro
-src/contrib/libqxt-2007-10-24/tools/doqsy/main.cpp

 src/core
 src/core/basichandler.cpp
 src/core/basichandler.h
 src/core
 src/core/basichandler.cpp
 src/core/basichandler.h


@@ -424,6 +81,8 @@ src/core/core.h
 src/core/core.pri
 src/core/coresession.cpp
 src/core/coresession.h
 src/core/core.pri
 src/core/coresession.cpp
 src/core/coresession.h

+src/core/coresettings.cpp
+src/core/coresettings.h

 src/core/ctcphandler.cpp
 src/core/ctcphandler.h
 src/core/ircserverhandler.cpp
 src/core/ctcphandler.cpp
 src/core/ctcphandler.h
 src/core/ircserverhandler.cpp


@@ -449,12 +108,8 @@ src/qtopia/main.cpp
 src/qtopia/mainwidget.cpp
 src/qtopia/mainwidget.h
 src/qtopia/qtopia.pri
 src/qtopia/mainwidget.cpp
 src/qtopia/mainwidget.h
 src/qtopia/qtopia.pri

-src/qtopia/qtopiagui.cpp
-src/qtopia/qtopiagui.h

 src/qtopia/qtopiamainwin.cpp
 src/qtopia/qtopiamainwin.h
 src/qtopia/qtopiamainwin.cpp
 src/qtopia/qtopiamainwin.h

-src/qtopia/qtopiastyle.cpp
-src/qtopia/qtopiastyle.h

 src/qtopia/qtopiaui.cpp
 src/qtopia/qtopiaui.h
 src/qtopia/qtopiauistyle.cpp
 src/qtopia/qtopiaui.cpp
 src/qtopia/qtopiaui.h
 src/qtopia/qtopiauistyle.cpp


@@ -462,15 +117,12 @@ src/qtopia/qtopiauistyle.h
 src/qtopia/topicbar.cpp
 src/qtopia/topicbar.h
 src/qtopia/ui
 src/qtopia/topicbar.cpp
 src/qtopia/topicbar.h
 src/qtopia/ui

+src/qtopia/ui/bufferview.ui

 src/qtopia/ui/coreconnectdlg.ui
 src/qtopia/ui/coreconnectprogressdlg.ui
 src/qtopia/ui/editcoreacctdlg.ui
 src/qtopia/ui/mainwidget.ui
 src/qtui
 src/qtopia/ui/coreconnectdlg.ui
 src/qtopia/ui/coreconnectprogressdlg.ui
 src/qtopia/ui/editcoreacctdlg.ui
 src/qtopia/ui/mainwidget.ui
 src/qtui

-src/qtui/bufferview.cpp
-src/qtui/bufferview.h
-src/qtui/bufferviewfilter.cpp
-src/qtui/bufferviewfilter.h

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


@@ -487,6 +139,8 @@ src/qtui/chatview.cpp
 src/qtui/chatview.h
 src/qtui/chatwidget.cpp
 src/qtui/chatwidget.h
 src/qtui/chatview.h
 src/qtui/chatwidget.cpp
 src/qtui/chatwidget.h

+src/qtui/configwizard.cpp
+src/qtui/configwizard.h

 src/qtui/coreconnectdlg.cpp
 src/qtui/coreconnectdlg.h
 src/qtui/guisettings.cpp
 src/qtui/coreconnectdlg.cpp
 src/qtui/coreconnectdlg.h
 src/qtui/guisettings.cpp


@@ -531,6 +185,10 @@ src/qtui/ui/settingsdlg.ui
 src/qtui/ui/topicwidget.ui
 src/qtui/ui/usermgmtpage.ui
 src/uisupport
 src/qtui/ui/topicwidget.ui
 src/qtui/ui/usermgmtpage.ui
 src/uisupport

+src/uisupport/bufferview.cpp
+src/uisupport/bufferview.h
+src/uisupport/bufferviewfilter.cpp
+src/uisupport/bufferviewfilter.h

 src/uisupport/uistyle.cpp
 src/uisupport/uistyle.h
 src/uisupport/uisupport.pri
 src/uisupport/uistyle.cpp
 src/uisupport/uistyle.h
 src/uisupport/uisupport.pri

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 8bbafb2..29e68d8 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -323,7 +323,7 @@ void Client::syncToCore(const QVariant &coreState) {
   foreach(QVariant networkid, networkids) {
     networkConnected(networkid.toUInt());
   }
   foreach(QVariant networkid, networkids) {
     networkConnected(networkid.toUInt());
   }

-  
+

   instance()->connectedToCore = true;
   updateCoreConnectionProgress();
 
   instance()->connectedToCore = true;
   updateCoreConnectionProgress();
 

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index 8c81f44..6a5ba02 100644 (file)
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -47,7 +47,10 @@ void ChatWidget::appendMsg(AbstractUiMsg *msg) {
 void ChatWidget::appendChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::End);
 void ChatWidget::appendChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::End);

-  insertChatLine(line);
+  if(!document()->isEmpty()) insertPlainText("\n");
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledText());

   setTextCursor(cursor);
 }
 
   setTextCursor(cursor);
 }
 


@@ -60,7 +63,11 @@ void ChatWidget::appendChatLines(QList<ChatLine *> list) {
 void ChatWidget::prependChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::Start);
 void ChatWidget::prependChatLine(ChatLine *line) {
   QTextCursor cursor = textCursor();
   moveCursor(QTextCursor::Start);

-  insertChatLine(line);
+  bool flg = document()->isEmpty();
+  insertStyledText(line->styledSender());
+  insertPlainText(" ");
+  insertStyledText(line->styledText());
+  if(!flg) insertPlainText("\n");

   setTextCursor(cursor);
 }
 
   setTextCursor(cursor);
 }
 


@@ -71,10 +78,10 @@ void ChatWidget::prependChatLines(QList<ChatLine *> list) {
 }
 
 void ChatWidget::insertChatLine(ChatLine *line) {
 }
 
 void ChatWidget::insertChatLine(ChatLine *line) {

+  if(!document()->isEmpty()) insertPlainText("\n");

   insertStyledText(line->styledSender());
   insertPlainText(" ");
   insertStyledText(line->styledText());
   insertStyledText(line->styledSender());
   insertPlainText(" ");
   insertStyledText(line->styledText());

-  insertPlainText("\n");

 }
 
 void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
 }
 
 void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index d3532d6..225823f 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -90,8 +90,8 @@ void QtopiaMainWin::connectedToCore() {
     emit requestBacklog(id, 100, -1);
   }
   // FIXME just for testing: select first available buffer
     emit requestBacklog(id, 100, -1);
   }
   // FIXME just for testing: select first available buffer

-  if(Client::allBufferInfos().count() > 2) {
-    Buffer *b = Client::buffer(Client::allBufferInfos()[2]);
+  if(Client::allBufferInfos().count() > 1) {
+    Buffer *b = Client::buffer(Client::allBufferInfos()[1]);

     Client::bufferModel()->selectBuffer(b);
   }
 }
     Client::bufferModel()->selectBuffer(b);
   }
 }

diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri
index 48c9075..cee2fad 100644 (file)
--- a/src/qtui/qtui.pri
+++ b/src/qtui/qtui.pri
@@ -1,11 +1,11 @@
 DEPMOD = uisupport common client
 QT_MOD = core gui network
 
 DEPMOD = uisupport common client
 QT_MOD = core gui network
 

-SRCS += bufferview.cpp bufferviewfilter.cpp bufferwidget.cpp channelwidgetinput.cpp chatline-old.cpp \
-       chatwidget.cpp coreconnectdlg.cpp configwizard.cpp \
-       guisettings.cpp identities.cpp mainwin.cpp qtui.cpp qtuistyle.cpp serverlist.cpp settingsdlg.cpp tabcompleter.cpp topicwidget.cpp
+SRCS += bufferwidget.cpp channelwidgetinput.cpp chatline-old.cpp \
+        chatwidget.cpp coreconnectdlg.cpp configwizard.cpp \
+        guisettings.cpp identities.cpp mainwin.cpp qtui.cpp qtuistyle.cpp serverlist.cpp settingsdlg.cpp tabcompleter.cpp topicwidget.cpp

 
 

-HDRS += bufferview.h bufferviewfilter.h bufferwidget.h channelwidgetinput.h chatline-old.h chatwidget.h configwizard.h \
+HDRS += bufferwidget.h channelwidgetinput.h chatline-old.h chatwidget.h configwizard.h \

         coreconnectdlg.h guisettings.h identities.h mainwin.h qtui.h qtuistyle.h serverlist.h settingsdlg.h settingspage.h tabcompleter.h topicwidget.h
 
 FORMNAMES = identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui \
         coreconnectdlg.h guisettings.h identities.h mainwin.h qtui.h qtuistyle.h serverlist.h settingsdlg.h settingspage.h tabcompleter.h topicwidget.h
 
 FORMNAMES = identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui \

diff --git a/src/qtui/bufferview.cpp b/src/uisupport/bufferview.cpp
similarity index 98%
rename from src/qtui/bufferview.cpp
rename to src/uisupport/bufferview.cpp
index e06ef72..7284375 100644 (file)
--- a/src/qtui/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "client.h"
  ***************************************************************************/
 
 #include "client.h"

+#include "buffer.h"

 #include "bufferview.h"
 #include "buffertreemodel.h"
 
 #include "bufferview.h"
 #include "buffertreemodel.h"
 


@@ -35,13 +36,15 @@ void BufferView::init() {
   header()->hide();
   header()->hideSection(1);
   expandAll();
   header()->hide();
   header()->hideSection(1);
   expandAll();

-  
+

   setAnimated(true);
   setAnimated(true);

-  
+
+#ifndef QT_NO_DRAGANDDROP

   setDragEnabled(true);
   setAcceptDrops(true);
   setDropIndicatorShown(true);
   setDragEnabled(true);
   setAcceptDrops(true);
   setDropIndicatorShown(true);

-  
+#endif
+

   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
   connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
   setSortingEnabled(true);
   sortByColumn(0, Qt::AscendingOrder);
   connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));

diff --git a/src/qtui/bufferview.h b/src/uisupport/bufferview.h
similarity index 100%
rename from src/qtui/bufferview.h
rename to src/uisupport/bufferview.h

diff --git a/src/qtui/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
similarity index 100%
rename from src/qtui/bufferviewfilter.cpp
rename to src/uisupport/bufferviewfilter.cpp

diff --git a/src/qtui/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
similarity index 100%
rename from src/qtui/bufferviewfilter.h
rename to src/uisupport/bufferviewfilter.h

diff --git a/src/uisupport/uisupport.pri b/src/uisupport/uisupport.pri
index 45fe465..642b98c 100644 (file)
--- a/src/uisupport/uisupport.pri
+++ b/src/uisupport/uisupport.pri
@@ -1,8 +1,8 @@
-DEPMOD = common
-QT_MOD = core gui
+DEPMOD = common client
+QT_MOD = core gui network

 
 

-SRCS += uistyle.cpp
-HDRS += uistyle.h
+SRCS += bufferview.cpp bufferviewfilter.cpp uistyle.cpp
+HDRS += bufferview.h bufferviewfilter.h uistyle.h

 
 FORMNAMES = 
 
 
 FORMNAMES =