jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 11:33: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

23
cockatrice/src/window_main.h
View file

@ -22,9 +22,9 @@
#include <QList>
#include <QMainWindow>
#include <QSystemTrayIcon>
#include <QProcess>
#include <QMessageBox>
#include <QProcess>
#include <QSystemTrayIcon>
#include <QtNetwork>
#include "abstractclient.h"
@ -38,7 +38,8 @@ class ServerInfo_User;
class QThread;
class DlgViewLog;
class MainWindow : public QMainWindow {
class MainWindow : public QMainWindow
{
Q_OBJECT
public slots:
void actCheckCardUpdates();
@ -93,6 +94,7 @@ private slots:
void actManageSets();
void actEditTokens();
private:
static const QString appName;
static const QStringList fileNameFilters;
@ -105,7 +107,10 @@ private:
void createTrayActions();
int getNextCustomSetPrefix(QDir dataDir);
// TODO: add a preference item to choose updater name for other games
inline QString getCardUpdaterBinaryName() { return "oracle"; };
inline QString getCardUpdaterBinaryName()
{
return "oracle";
};
QList<QMenu *> tabMenus;
QMenu *cockatriceMenu, *dbMenu, *helpMenu;
@ -120,21 +125,23 @@ private:
RemoteClient *client;
QThread *clientThread;
LocalServer *localServer;
bool bHasActivated;
QMessageBox serverShutdownMessageBox;
QProcess * cardUpdateProcess;
QProcess *cardUpdateProcess;
DlgViewLog *logviewDialog;
DlgViewLog * logviewDialog;
public:
MainWindow(QWidget *parent = 0);
~MainWindow();
protected:
void closeEvent(QCloseEvent *event);
void changeEvent(QEvent *event);
QString extractInvalidUsernameMessage(QString & in);
QString extractInvalidUsernameMessage(QString &in);
};
#endif