← Back to branch summary

~ubuntu-branches/ubuntu/raring/quassel/raring-proposed

~ubuntu-branches/ubuntu/raring/quassel/raring-proposed

« back to all changes in this revision

Viewing changes to src/client/coreconnection.h

Committer: Bazaar Package Importer
Author(s): Scott Kitterman
Date: 2010-08-11 12:48:08 UTC
mfrom: (1.1.40 upstream)
Revision ID: james.westby@ubuntu.com-20100811124808-wl3zpp4gpbzmvn4t

Tags: 0.7~beta1-0ubuntu1

* New upstream beta release
  - Add libqca2-dev to build-depends for blowfish support
* Switch to source format v3 (Quilt) to use .bz2 tarball
  - Drop build-depends on quilt and update debian/rules
  - Add debian/source/format

files added:
.pc

.pc/.version

.pc/applied-patches

.pc/kubuntu_01_default_network_channel.patch

.pc/kubuntu_01_default_network_channel.patch/data

.pc/kubuntu_01_default_network_channel.patch/data/networks.ini

.pc/kubuntu_02_enable_message_indicator.diff

.pc/kubuntu_02_enable_message_indicator.diff/src

.pc/kubuntu_02_enable_message_indicator.diff/src/qtui

.pc/kubuntu_02_enable_message_indicator.diff/src/qtui/indicatornotificationbackend.cpp

.pc/kubuntu_02_enable_message_indicator.diff/src/qtui/qtui.cpp

.pc/kubuntu_02_enable_message_indicator.diff/src/qtui/settingspages

.pc/kubuntu_02_enable_message_indicator.diff/src/qtui/settingspages/appearancesettingspage.ui

cmake/modules/FindQCA2.cmake

debian/source

debian/source/format

icons/hicolor/64x64/status/quassel_message.png

icons/oxygen_kde/16x16/actions/configure-shortcuts.png

icons/oxygen_kde/16x16/actions/edit-clear-locationbar-ltr.png

icons/oxygen_kde/16x16/actions/window_fullscreen.png

icons/oxygen_kde/16x16/actions/window_nofullscreen.png

icons/oxygen_kde/scalable/actions/configure-shortcuts.svgz

icons/oxygen_kde/scalable/actions/edit-clear-locationbar-ltr.svgz

icons/oxygen_kde/scalable/actions/window_fullscreen.svgz

icons/oxygen_kde/scalable/actions/window_nofullscreen.svgz

po/el.po

po/ja.po

src/core/cipher.cpp

src/core/cipher.h

src/core/coreircuser.cpp

src/core/coreircuser.h

src/qtui/markerlineitem.cpp

src/qtui/markerlineitem.h

src/qtui/settingspages/keysequencewidget.cpp

src/qtui/settingspages/keysequencewidget.h

src/qtui/settingspages/shortcutsmodel.cpp

src/qtui/settingspages/shortcutsmodel.h

src/qtui/settingspages/shortcutssettingspage.cpp

src/qtui/settingspages/shortcutssettingspage.h

src/qtui/settingspages/shortcutssettingspage.ui

files removed:
scripts/manageusers.py

src/qtui/jumpkeyhandler.cpp

src/qtui/jumpkeyhandler.h

files modified:
CMakeLists.txt

ChangeLog

INSTALL

cmake/modules/FindQt4.cmake

cmake/modules/Qt4ConfigDependentSettings.cmake

data/networks.ini

data/quasselclient.desktop *

data/stylesheets/LinuxDolt-bluestheme.qss

data/stylesheets/default.qss

data/stylesheets/jussi01-darktheme.qss

data/stylesheets/m4yer.qss

debian/changelog

debian/control

debian/rules

icons/hicolor.qrc

icons/hicolor/16x16/status/quassel_message.png

icons/hicolor/22x22/status/quassel_message.png

icons/hicolor/32x32/status/quassel_message.png

icons/hicolor/48x48/status/quassel_message.png

icons/import/blacklisted-icons

icons/oxygen_kde.qrc

pics/CMakeLists.txt

po/LINGUAS

po/cs.po

po/es.po

po/it.po

po/quassel.pot

po/ru.po

po/tr.po

po/uk.po

src/CMakeLists.txt

src/client/bufferviewoverlay.cpp

src/client/bufferviewoverlay.h

src/client/client.cpp

src/client/client.h

src/client/clientbacklogmanager.cpp

src/client/clientbacklogmanager.h

src/client/clientbufferviewmanager.cpp

src/client/clientbufferviewmanager.h

src/client/clientsettings.cpp

src/client/clientsettings.h

src/client/clientuserinputhandler.cpp

src/client/clientuserinputhandler.h

src/client/coreconnection.cpp

src/client/coreconnection.h

src/client/networkmodel.cpp

src/client/networkmodel.h

src/client/treemodel.cpp

src/common/CMakeLists.txt

src/common/buffersyncer.cpp

src/common/buffersyncer.h

src/common/ircchannel.cpp

src/common/ircchannel.h

src/common/ircuser.cpp

src/common/logbacktrace_win.cpp

src/common/message.h

src/common/network.cpp

src/common/network.h

src/common/util.cpp

src/common/util.h

src/core/CMakeLists.txt

src/core/abstractsqlstorage.cpp

src/core/abstractsqlstorage.h

src/core/corebasichandler.cpp

src/core/coreircchannel.cpp

src/core/coreircchannel.h

src/core/corenetwork.cpp

src/core/corenetwork.h

src/core/coresession.cpp

src/core/coresession.h

src/core/coreuserinputhandler.cpp

src/core/coreuserinputhandler.h

src/core/ctcphandler.cpp

src/core/ctcphandler.h

src/core/ircserverhandler.cpp

src/core/ircserverhandler.h

src/core/postgresqlstorage.cpp

src/core/sqlitestorage.cpp

src/qtui/CMakeLists.txt

src/qtui/bufferwidget.cpp

src/qtui/bufferwidget.h

src/qtui/chatitem.cpp

src/qtui/chatitem.h

src/qtui/chatline.cpp

src/qtui/chatline.h

src/qtui/chatlinemodelitem.cpp

src/qtui/chatscene.cpp

src/qtui/chatscene.h

src/qtui/chatview.cpp

src/qtui/chatview.h

src/qtui/columnhandleitem.cpp

src/qtui/columnhandleitem.h

src/qtui/debugbufferviewoverlay.cpp

src/qtui/indicatornotificationbackend.cpp

src/qtui/inputwidget.cpp

src/qtui/inputwidget.h

src/qtui/mainwin.cpp

src/qtui/mainwin.h

src/qtui/qtui.cpp

src/qtui/qtuistyle.cpp

src/qtui/settingspagedlg.cpp

src/qtui/settingspages/appearancesettingspage.cpp

src/qtui/settingspages/appearancesettingspage.h

src/qtui/settingspages/appearancesettingspage.ui

src/qtui/settingspages/chatviewsettingspage.cpp

src/qtui/settingspages/chatviewsettingspage.ui

src/qtui/settingspages/inputwidgetsettingspage.ui

src/qtui/settingspages/settingspages.inc

src/qtui/statusnotifieritemdbus.cpp

src/qtui/systemtray.cpp

src/qtui/topicwidget.cpp

src/uisupport/CMakeLists.txt

src/uisupport/abstractbuffercontainer.cpp

src/uisupport/abstractbuffercontainer.h

src/uisupport/actioncollection.cpp

src/uisupport/bufferview.cpp

src/uisupport/bufferview.h

src/uisupport/bufferviewoverlayfilter.cpp

src/uisupport/contextmenuactionprovider.cpp

src/uisupport/graphicalui.cpp

src/uisupport/graphicalui.h

src/uisupport/multilineedit.cpp

src/uisupport/multilineedit.h

src/uisupport/networkmodelcontroller.cpp

src/uisupport/networkmodelcontroller.h

src/uisupport/qssparser.cpp

src/uisupport/uisettings.cpp

src/uisupport/uisettings.h

src/uisupport/uistyle.cpp

src/uisupport/uistyle.h

version.inc

Show diffs side-by-side

added added

removed removed

src/client/coreconnection.h

71

71

inline int progressValue() const;

72

72

inline QString progressText() const;

73

73

74

//! Check if we consider the last connect as reconnect

75

inline bool wasReconnect() const { return _wasReconnect; }

76

74

77

#ifdef HAVE_SSL

75

78

inline const QSslSocket *sslSocket() const;

76

79

#endif

182

185

QString _progressText;

183

186

184

187

QString _coreInfoString(const QVariantMap &);

188

bool _wasReconnect;

189

bool _requestedDisconnect;

185

190

186

191

inline CoreAccountModel *accountModel() const;

187

192

Older »