1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00

Cleanup to match the Webkit coding style

This commit is contained in:
kelteseth 2017-03-27 16:38:42 +02:00
parent 520077d328
commit 0e564a34c6
5 changed files with 17 additions and 41 deletions

View File

@ -1,38 +1,28 @@
#include <QGuiApplication>
#include <QQmlApplicationEngine>
#include <qt_windows.h>
#include <QWindow>
#include <QQuickView>
#include <QLibrary>
#include <QScreen>
#include <QDebug>
#include <QDebug>
#include <QDir>
#include <QGuiApplication>
#include <QLibrary>
#include <QQmlApplicationEngine>
#include <QQuickView>
#include <QScreen>
#include <QUrl>
#include <QWindow>
#include <qt_windows.h>
#include "screenplay.h"
//#include "steam_api.h"
//#include "steamworkshop.h"
int main(int argc, char *argv[])
int main(int argc, char* argv[])
{
QGuiApplication app(argc, argv);
QCoreApplication::setOrganizationName("Aimber");
QCoreApplication::setOrganizationDomain("aimber.net");
QCoreApplication::setApplicationName("ScreenPlay");
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
// if(!SteamAPI_Init()){
// qFatal("Could not init Steam sdk!");
// }
QQmlApplicationEngine mainWindow(QUrl(QStringLiteral("qrc:/qml/main.qml")));
//ScreenPlay sp(GetSystemMetrics(SM_CXSCREEN),GetSystemMetrics(SM_CYSCREEN));
return app.exec();
}

View File

@ -14,7 +14,6 @@ BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam)
return TRUE;
}
ScreenPlay::ScreenPlay(QWindow* parent)
: QWindow(parent)
{
@ -22,8 +21,7 @@ ScreenPlay::ScreenPlay(QWindow* parent)
ScreenPlay::ScreenPlay(int width, int height)
{
this->setHeight(height);
this->setHeight(height);
this->setWidth(width);
this->hwnd = (HWND)this->winId();
@ -49,8 +47,7 @@ ScreenPlay::ScreenPlay(int width, int height)
SetWindowLongPtr(hwnd, GWL_EXSTYLE,
WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_NOACTIVATE | WS_EX_TOPMOST | WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW);
this->quickRenderer = new QQuickView(QUrl(QStringLiteral("qrc:/qml/Components/ScreenPlay.qml")), this);
this->quickRenderer = new QQuickView(QUrl(QStringLiteral("qrc:/qml/ComponentScreenPlay.qml")), this);
Qt::WindowFlags flags = this->flags();
this->setFlags(flags | Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint);
@ -61,11 +58,6 @@ ScreenPlay::ScreenPlay(int width, int height)
ScreenPlay::~ScreenPlay()
{
qDebug()<< "exit";
qDebug() << "exit";
ShowWindow(worker_hwnd, SW_HIDE);
}

View File

@ -5,7 +5,6 @@
#include <QWindow>
#include <qt_windows.h>
class ScreenPlay : public QWindow {
Q_OBJECT
public:
@ -23,6 +22,4 @@ private:
QQuickView* quickRenderer = nullptr;
};
#endif // SCREENPLAY_H

View File

@ -2,5 +2,4 @@
SteamWorkshop::SteamWorkshop()
{
}

View File

@ -6,14 +6,12 @@
//#include "isteamugc.h"
//#include "steam_api.h" public ISteamUGC,
class SteamWorkshop : public QObject
{
class SteamWorkshop : public QObject {
public:
SteamWorkshop();
// ISteamUGC interface
public:
};
#endif // STEAMWORKSHOP_H