← Back to branch summary

~ubuntu-branches/ubuntu/trusty/quassel/trusty-updates

« back to all changes in this revision

Viewing changes to src/common/quassel.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2014-02-18 23:18:25 UTC
  • mfrom: (1.1.54)
  • Revision ID: package-import@ubuntu.com-20140218231825-6vvoh451otn95pkn
Tags: 0.10~beta1-0ubuntu1
* New upstream beta relase
  - Drop debian/patches/upstream_fix_fullscreen_mode.diff which had been
    cherrypicked from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/quassel.cpp
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2005-2013 by the Quassel Project                        *
 
2
 *   Copyright (C) 2005-2014 by the Quassel Project                        *
3
3
 *   devel@quassel-irc.org                                                 *
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
23
23
#include <iostream>
24
24
#include <signal.h>
25
25
#if !defined Q_OS_WIN32 && !defined Q_OS_MAC
 
26
#  include <sys/types.h>
 
27
#  include <sys/time.h>
26
28
#  include <sys/resource.h>
27
29
#endif
28
30
 
29
31
#include <QCoreApplication>
30
32
#include <QDateTime>
31
33
#include <QFileInfo>
 
34
#include <QHostAddress>
32
35
#include <QLibraryInfo>
33
36
#include <QSettings>
34
37
#include <QTranslator>
35
 
#include <QHostAddress>
 
38
#include <QUuid>
36
39
 
 
40
#include "bufferinfo.h"
 
41
#include "identity.h"
 
42
#include "logger.h"
37
43
#include "message.h"
38
 
#include "identity.h"
39
44
#include "network.h"
40
 
#include "bufferinfo.h"
 
45
#include "protocol.h"
 
46
#include "syncableobject.h"
41
47
#include "types.h"
42
 
#include "syncableobject.h"
43
 
#include "logger.h"
44
48
 
45
49
Quassel::BuildInfo Quassel::_buildInfo;
46
50
AbstractCliParser *Quassel::_cliParser = 0;
186
190
    qRegisterMetaType<MsgId>("MsgId");
187
191
 
188
192
    qRegisterMetaType<QHostAddress>("QHostAddress");
 
193
    qRegisterMetaType<QUuid>("QUuid");
189
194
 
190
195
    qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");
191
196
    qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
194
199
    qRegisterMetaTypeStreamOperators<AccountId>("AccountId");
195
200
    qRegisterMetaTypeStreamOperators<MsgId>("MsgId");
196
201
 
 
202
    qRegisterMetaType<Protocol::SessionState>("Protocol::SessionState");
 
203
 
197
204
    // Versions of Qt prior to 4.7 didn't define QVariant as a meta type
198
205
    if (!QMetaType::type("QVariant")) {
199
206
        qRegisterMetaType<QVariant>("QVariant");