jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-29 10:03:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clang-format (#3028)

Browse source 
* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
This commit is contained in:
ctrlaltca 2018-01-27 10:41:32 +01:00 • committed by GitHub
parent 8dbdd24c8e
commit b29bd9e070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 13378 additions and 9535 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cockatrice/src/tab_userlists.h
View file

@ -1,8 +1,8 @@
#ifndef TAB_USERLISTS_H
#define TAB_USERLISTS_H
#include "tab.h"
#include "pb/serverinfo_user.pb.h"
#include "tab.h"
#include <QLineEdit>
class AbstractClient;
@ -17,7 +17,8 @@ class ServerInfo_User;
class Event_AddToList;
class Event_RemoveFromList;
class TabUserLists : public Tab {
class TabUserLists : public Tab
{
Q_OBJECT
signals:
void openMessageDialog(const QString &userName, bool focus);
@ -33,6 +34,7 @@ private slots:
void processRemoveFromListEvent(const Event_RemoveFromList &event);
void addToIgnoreList();
void addToBuddyList();
private:
AbstractClient *client;
UserList *allUsersList;
@ -42,13 +44,29 @@ private:
QLineEdit *addBuddyEdit;
QLineEdit *addIgnoreEdit;
void addToList(const std::string &listName, const QString &userName);
public:
TabUserLists(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo, QWidget *parent = 0);
TabUserLists(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
const ServerInfo_User &userInfo,
QWidget *parent = 0);
void retranslateUi();
QString getTabText() const { return tr("Account"); }
const UserList *getAllUsersList() const { return allUsersList; }
const UserList *getBuddyList() const { return buddyList; }
const UserList *getIgnoreList() const { return ignoreList; }
QString getTabText() const
{
return tr("Account");
}
const UserList *getAllUsersList() const
{
return allUsersList;
}
const UserList *getBuddyList() const
{
return buddyList;
}
const UserList *getIgnoreList() const
{
return ignoreList;
}
};
#endif