mirror of
				https://github.com/gtalent/sc9k.git
				synced 2025-11-04 05:39:08 -06:00 
			
		
		
		
	Cleanup
This commit is contained in:
		@@ -16,6 +16,7 @@ SOURCES += \
 | 
				
			|||||||
    slideview.cpp
 | 
					    slideview.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HEADERS += \
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					    consts.hpp \
 | 
				
			||||||
    mainwindow.hpp \
 | 
					    mainwindow.hpp \
 | 
				
			||||||
    obsclient.hpp \
 | 
					    obsclient.hpp \
 | 
				
			||||||
    openlpclient.hpp \
 | 
					    openlpclient.hpp \
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								main.cpp
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								main.cpp
									
									
									
									
									
								
							@@ -5,10 +5,11 @@
 | 
				
			|||||||
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
					 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
				
			||||||
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
					 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include "mainwindow.hpp"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QApplication>
 | 
					#include <QApplication>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "mainwindow.hpp"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int argc, char *argv[]) {
 | 
					int main(int argc, char *argv[]) {
 | 
				
			||||||
	QApplication a(argc, argv);
 | 
						QApplication a(argc, argv);
 | 
				
			||||||
	MainWindow w;
 | 
						MainWindow w;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,7 @@
 | 
				
			|||||||
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
					 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
				
			||||||
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
					 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <cstdint>
 | 
					#include <cstdint>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -51,7 +51,7 @@ void OBSClient::poll() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void OBSClient::handlePollResponse(QNetworkReply *reply) {
 | 
					void OBSClient::handlePollResponse(QNetworkReply *reply) {
 | 
				
			||||||
	if (reply->error()) {
 | 
						if (reply->error()) {
 | 
				
			||||||
		qDebug() << reply->errorString();
 | 
							qDebug() << "OBSClient error response:" << reply->errorString();
 | 
				
			||||||
		emit pollFailed();
 | 
							emit pollFailed();
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,7 @@
 | 
				
			|||||||
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
					 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
				
			||||||
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
					 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QNetworkAccessManager>
 | 
					#include <QNetworkAccessManager>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -86,13 +86,13 @@ void OpenLPClient::poll() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void OpenLPClient::handleGeneralResponse(QNetworkReply *reply) {
 | 
					void OpenLPClient::handleGeneralResponse(QNetworkReply *reply) {
 | 
				
			||||||
	if (reply->error()) {
 | 
						if (reply->error()) {
 | 
				
			||||||
		qDebug() << reply->request().url() << ":" << reply->errorString();
 | 
							qDebug() << "OpenLPClient error response:" << reply->request().url() << ":" << reply->errorString();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void OpenLPClient::handlePollResponse(QNetworkReply *reply) {
 | 
					void OpenLPClient::handlePollResponse(QNetworkReply *reply) {
 | 
				
			||||||
	if (reply->error()) {
 | 
						if (reply->error()) {
 | 
				
			||||||
		qDebug() << reply->errorString();
 | 
							qDebug() << "OpenLPClient error response:" << reply->errorString();
 | 
				
			||||||
		emit pollFailed();
 | 
							emit pollFailed();
 | 
				
			||||||
		m_currentServiceId = -1;
 | 
							m_currentServiceId = -1;
 | 
				
			||||||
		m_currentSongId = "";
 | 
							m_currentSongId = "";
 | 
				
			||||||
@@ -121,7 +121,7 @@ void OpenLPClient::handlePollResponse(QNetworkReply *reply) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void OpenLPClient::handleSongListResponse(QNetworkReply *reply) {
 | 
					void OpenLPClient::handleSongListResponse(QNetworkReply *reply) {
 | 
				
			||||||
	if (reply->error()) {
 | 
						if (reply->error()) {
 | 
				
			||||||
		qDebug() << reply->errorString();
 | 
							qDebug() << "OpenLPClient error response:" << reply->errorString();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	auto data = reply->readAll();
 | 
						auto data = reply->readAll();
 | 
				
			||||||
	if (data.isEmpty()) {
 | 
						if (data.isEmpty()) {
 | 
				
			||||||
@@ -143,7 +143,7 @@ void OpenLPClient::handleSongListResponse(QNetworkReply *reply) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void OpenLPClient::handleSlideListResponse(QNetworkReply *reply) {
 | 
					void OpenLPClient::handleSlideListResponse(QNetworkReply *reply) {
 | 
				
			||||||
	if (reply->error()) {
 | 
						if (reply->error()) {
 | 
				
			||||||
		qDebug() << reply->errorString();
 | 
							qDebug() << "OpenLPClient error response:" << reply->errorString();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	auto data = reply->readAll();
 | 
						auto data = reply->readAll();
 | 
				
			||||||
	if (data.isEmpty()) {
 | 
						if (data.isEmpty()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,7 @@
 | 
				
			|||||||
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
					 * License, v. 2.0. If a copy of the MPL was not distributed with this
 | 
				
			||||||
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
					 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QHash>
 | 
					#include <QHash>
 | 
				
			||||||
@@ -16,6 +17,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
class OpenLPClient: public QObject {
 | 
					class OpenLPClient: public QObject {
 | 
				
			||||||
	Q_OBJECT
 | 
						Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   private:
 | 
					   private:
 | 
				
			||||||
	   struct Song {
 | 
						   struct Song {
 | 
				
			||||||
			QString name;
 | 
								QString name;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <QWidget>
 | 
					#include <QWidget>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class SlideView : public QWidget
 | 
					class SlideView: public QWidget {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	Q_OBJECT
 | 
						Q_OBJECT
 | 
				
			||||||
   private:
 | 
					   private:
 | 
				
			||||||
	   class QTableWidget *m_slideTable = nullptr;
 | 
						   class QTableWidget *m_slideTable = nullptr;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user