~ubuntu-branches/ubuntu/saucy/quassel/saucy

« back to all changes in this revision

Viewing changes to src/common/quassel.cpp

Committer: Package Import Robot
Author(s): Scott Kitterman
Date: 2012-02-14 18:38:55 UTC
mfrom: (1.1.46)
Revision ID: package-import@ubuntu.com-20120214183855-ak8af7n6qweqy3f0

Tags: 0.8~beta1-0ubuntu1

* New upstream beta release
- Update quasselcore man page for new oidentd option

files added:
.tx

.tx/config

po/en_AU.po

po/en_US.po

po/pull-from-transifex.sh

po/quassel.pot.patch

po/update-pot.sh

src/common/ctcpevent.cpp

src/common/ctcpevent.h

src/common/event.cpp

src/common/event.h

src/common/eventmanager.cpp

src/common/eventmanager.h

src/common/ircevent.cpp

src/common/ircevent.h

src/common/messageevent.cpp

src/common/messageevent.h

src/common/networkevent.cpp

src/common/networkevent.h

src/core/coresessioneventprocessor.cpp

src/core/coresessioneventprocessor.h

src/core/ctcpparser.cpp

src/core/ctcpparser.h

src/core/eventstringifier.cpp

src/core/eventstringifier.h

src/core/ircparser.cpp

src/core/ircparser.h

src/core/oidentdconfiggenerator.cpp

src/core/oidentdconfiggenerator.h

files removed:
src/core/ctcphandler.cpp

src/core/ctcphandler.h

src/core/ircserverhandler.cpp

src/core/ircserverhandler.h

files modified:
.pc/kubuntu_02_enable_message_indicator.diff/src/qtui/qtui.cpp

CMakeLists.txt

cmake/modules/QuasselMacros.cmake

data/scripts/inxi

debian/changelog

debian/mans/quasselcore.pod

po/LINGUAS

po/README.Translations

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_GB.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/hu.po

po/it.po

po/ja.po

po/nb.po

po/nl.po

po/oc.po

po/pt.po

po/pt_BR.po

po/quassel.pot

po/ru.po

po/sl.po

po/sq.po

po/sv.po

po/tr.po

po/uk.po

po/zh_CN.po

scripts/build/Info.plist

src/client/abstractui.h

src/client/clientsettings.cpp

src/client/clientsettings.h

src/client/clientuserinputhandler.cpp

src/client/messagefilter.cpp

src/client/treemodel.cpp

src/common/CMakeLists.txt

src/common/basichandler.cpp

src/common/basichandler.h

src/common/cliparser.cpp

src/common/cliparser.h

src/common/logger.cpp

src/common/logger.h

src/common/main.cpp

src/common/network.cpp

src/common/network.h

src/common/quassel.cpp

src/common/quassel.h

src/common/types.h

src/common/util.cpp

src/common/util.h

src/core/CMakeLists.txt

src/core/cipher.cpp

src/core/cipher.h

src/core/core.cpp

src/core/core.h

src/core/coreircchannel.cpp

src/core/coreircchannel.h

src/core/coreircuser.cpp

src/core/coreircuser.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/netsplit.cpp

src/core/netsplit.h

src/qtui/aboutdlg.cpp

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/chatviewsearchcontroller.cpp

src/qtui/columnhandleitem.cpp

src/qtui/columnhandleitem.h

src/qtui/inputwidget.cpp

src/qtui/inputwidget.h

src/qtui/knotificationbackend.cpp

src/qtui/knotificationbackend.h

src/qtui/legacysystemtray.cpp

src/qtui/legacysystemtray.h

src/qtui/mainwin.cpp

src/qtui/mainwin.h

src/qtui/qtui.cpp

src/qtui/qtui.h

src/qtui/qtuiapplication.cpp

src/qtui/settingspagedlg.cpp

src/qtui/settingspages/coreconnectionsettingspage.ui

src/qtui/settingspages/inputwidgetsettingspage.ui

src/qtui/settingspages/itemviewsettingspage.ui

src/qtui/settingspages/networkssettingspage.cpp

src/qtui/statusnotifieritem.cpp

src/qtui/statusnotifieritem.h

src/qtui/systemtray.cpp

src/qtui/systemtray.h

src/qtui/systraynotificationbackend.cpp

src/qtui/systraynotificationbackend.h

src/qtui/ui/channellistdlg.ui

src/qtui/webpreviewitem.cpp

src/uisupport/abstractbuffercontainer.cpp

src/uisupport/abstractbuffercontainer.h

src/uisupport/bufferview.cpp

src/uisupport/bufferview.h

src/uisupport/bufferviewfilter.cpp

src/uisupport/graphicalui.cpp

src/uisupport/graphicalui.h

src/uisupport/multilineedit.cpp

src/uisupport/multilineedit.h

src/uisupport/nickview.cpp

src/uisupport/nickview.h

src/uisupport/tabcompleter.cpp

src/uisupport/tabcompleter.h

src/uisupport/uisettings.cpp

src/uisupport/uisettings.h

src/uisupport/uistyle.cpp

version.inc

Show diffs side-by-side

added added

removed removed

src/common/quassel.cpp

#include <QLibraryInfo>

#include <QSettings>

#include <QTranslator>

#include <QHostAddress>

#include "message.h"

#include "identity.h"

QString Quassel::_coreDumpFileName;

Quassel *Quassel::_instance = 0;

bool Quassel::_handleCrashes = true;

Quassel::LogLevel Quassel::_logLevel = InfoLevel;

QFile *Quassel::_logFile = 0;

bool Quassel::_logToSyslog = false;

Quassel::Quassel() {

Q_ASSERT(!_instance);

}

Quassel::~Quassel() {

if(logFile()) {

logFile()->close();

logFile()->deleteLater();

}

delete _cliParser;

}

109

117

}

110

118

111

119

DEBUG = isOptionSet("debug");

120

121

// set up logging

122

if(Quassel::runMode() != Quassel::ClientOnly) {

123

if(isOptionSet("loglevel")) {

124

QString level = optionValue("loglevel");

125

126

if(level == "Debug") _logLevel = DebugLevel;

127

else if(level == "Info") _logLevel = InfoLevel;

128

else if(level == "Warning") _logLevel= WarningLevel;

129

else if(level == "Error") _logLevel = ErrorLevel;

130

}

131

132

QString logfilename = optionValue("logfile");

133

if(!logfilename.isEmpty()) {

134

_logFile = new QFile(logfilename);

135

if(!_logFile->open(QIODevice::Append | QIODevice::Text)) {

136

qWarning() << "Could not open log file" << logfilename << ":" << _logFile->errorString();

137

_logFile->deleteLater();

138

_logFile = 0;

139

}

140

}

141

#ifdef HAVE_SYSLOG

142

_logToSyslog = isOptionSet("syslog");

143

#endif

144

}

145

112

146

return true;

113

147

}

114

148

143

177

qRegisterMetaType<AccountId>("AccountId");

144

178

qRegisterMetaType<MsgId>("MsgId");

145

179

180

qRegisterMetaType<QHostAddress>("QHostAddress");

181

146

182

qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");

147

183

qRegisterMetaTypeStreamOperators<BufferId>("BufferId");

148

184

qRegisterMetaTypeStreamOperators<NetworkId>("NetworkId");

Older »