projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Fix build with Qt4 and/or MSVC
[quassel.git]
/
src
/
uisupport
/
networkmodelcontroller.h
diff --git
a/src/uisupport/networkmodelcontroller.h
b/src/uisupport/networkmodelcontroller.h
index
48fc5eb
..
3abc79d
100644
(file)
--- a/
src/uisupport/networkmodelcontroller.h
+++ b/
src/uisupport/networkmodelcontroller.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-45,8
+45,10
@@
public:
NetworkMask = 0x0f,
NetworkConnect = 0x01,
NetworkDisconnect = 0x02,
NetworkMask = 0x0f,
NetworkConnect = 0x01,
NetworkDisconnect = 0x02,
- NetworkConnectAll = 0x03,
- NetworkDisconnectAll = 0x04,
+ NetworkConnectAllWithDropdown = 0x03,
+ NetworkDisconnectAllWithDropdown = 0x04,
+ NetworkConnectAll = 0x05,
+ NetworkDisconnectAll = 0x06,
// Buffer actions
BufferMask = 0xf0,
// Buffer actions
BufferMask = 0xf0,
@@
-64,6
+66,7
@@
public:
HideMode = 0x0500,
HideDayChange = 0x0600,
HideTopic = 0x0700,
HideMode = 0x0500,
HideDayChange = 0x0600,
HideTopic = 0x0700,
+ HideJoinPartQuit = 0xd00,
HideUseDefaults = 0xe00,
HideApplyToAll = 0xf00,
HideUseDefaults = 0xe00,
HideApplyToAll = 0xf00,
@@
-138,7
+141,7
@@
protected:
void setSlot(QObject *receiver, const char *method);
Action *registerAction(ActionType type, const QString &text, bool checkable = false);
void setSlot(QObject *receiver, const char *method);
Action *registerAction(ActionType type, const QString &text, bool checkable = false);
- Action *registerAction(
ActionType type, const QPixmap
&icon, const QString &text, bool checkable = false);
+ Action *registerAction(
NetworkModelController::ActionType type, const QIcon
&icon, const QString &text, bool checkable = false);
bool checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
QString nickName(const QModelIndex &index) const;
bool checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
QString nickName(const QModelIndex &index) const;