frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove widgets (#35) 

* Trying to remove dependency on Widget
removed unused bonjour example source

* forgot the modified files
This commit is contained in:
penfold42 2016-06-22 07:34:57 +10:00 committed by brindosch
parent 1b6dcc85a4
commit 48134d0aef
22 changed files with 13 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/boblightserver/CMakeLists.txt
View File

@ -26,8 +26,6 @@ add_library(boblightserver
${BoblightServer_HEADERS_MOC}
)
qt5_use_modules(boblightserver Widgets)
target_link_libraries(boblightserver
hyperion
hyperion-utils

2
libsrc/bonjour/CMakeLists.txt
View File

@ -31,7 +31,7 @@ add_library(bonjour
${Bonjour_RESOURCES_RCC}
)
qt5_use_modules(bonjour Widgets Network)
qt5_use_modules(bonjour Network)
target_link_libraries(bonjour
hyperion

39
libsrc/bonjour/main.cpp
View File

@ -1,39 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved.
**
** This file is part of the example classes of the Qt Toolkit.
**
** This file may be used under the terms of the GNU General Public
** License version 2.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of
** this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
** http://www.trolltech.com/products/qt/opensource.html
**
** If you are unsure which license is appropriate for your use, please
** review the following information:
** http://www.trolltech.com/products/qt/licensing.html or contact the
** sales department at sales@trolltech.com.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
****************************************************************************/
#include <QApplication>
#include <QtCore>
#include <stdlib.h>
#include "server.h"
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Server server;
server.show();
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
int x = server.exec();
return x;
}

96
libsrc/bonjour/server.cpp
View File

@ -1,96 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved.
**
** This file is part of the example classes of the Qt Toolkit.
**
** This file may be used under the terms of the GNU General Public
** License version 2.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of
** this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
** http://www.trolltech.com/products/qt/opensource.html
**
** If you are unsure which license is appropriate for your use, please
** review the following information:
** http://www.trolltech.com/products/qt/licensing.html or contact the
** sales department at sales@trolltech.com.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
****************************************************************************/
#include <QtGui>
#include <QtNetwork>
#include <stdlib.h>
#include "server.h"
#include "bonjourserviceregister.h"
Server::Server(QWidget *parent)
: QDialog(parent)
{
setWindowModality(Qt::ApplicationModal);
statusLabel = new QLabel;
quitButton = new QPushButton(tr("Quit"));
quitButton->setAutoDefault(false);
tcpServer = new QTcpServer(this);
if (!tcpServer->listen()) {
QMessageBox::critical(this, tr("Fortune Server"),
tr("Unable to start the server: %1.")
.arg(tcpServer->errorString()));
close();
return;
}
statusLabel->setText(tr("The server is running on port %1.\n"
"Run the Fortune Client example now.")
.arg(tcpServer->serverPort()));
fortunes << tr("You've been leading a dog's life. Stay off the furniture.")
<< tr("You've got to think about tomorrow.")
<< tr("You will be surprised by a loud noise.")
<< tr("You will feel hungry again in another hour.")
<< tr("You might have mail.")
<< tr("You cannot kill time without injuring eternity.")
<< tr("Computers are not intelligent. They only think they are.");
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
connect(tcpServer, SIGNAL(newConnection()), this, SLOT(sendFortune()));
QHBoxLayout *buttonLayout = new QHBoxLayout;
buttonLayout->addStretch(1);
buttonLayout->addWidget(quitButton);
buttonLayout->addStretch(1);
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(statusLabel);
mainLayout->addLayout(buttonLayout);
setLayout(mainLayout);
bonjourRegister = new BonjourServiceRegister(this);
bonjourRegister->registerService(BonjourRecord(tr("Fortune Server on %1").arg(QHostInfo::localHostName()),
QLatin1String("_trollfortune._tcp"), QString()),
tcpServer->serverPort());
setWindowTitle(tr("Fortune Server"));
}
void Server::sendFortune()
{
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_0);
out << (quint16)0;
out << fortunes.at(qrand() % fortunes.size());
out.device()->seek(0);
out << (quint16)(block.size() - sizeof(quint16));
QTcpSocket *clientConnection = tcpServer->nextPendingConnection();
connect(clientConnection, SIGNAL(disconnected()),
clientConnection, SLOT(deleteLater()));
clientConnection->write(block);
clientConnection->disconnectFromHost();
}

52
libsrc/bonjour/server.h
View File

@ -1,52 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved.
**
** This file is part of the example classes of the Qt Toolkit.
**
** This file may be used under the terms of the GNU General Public
** License version 2.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of
** this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
** http://www.trolltech.com/products/qt/opensource.html
**
** If you are unsure which license is appropriate for your use, please
** review the following information:
** http://www.trolltech.com/products/qt/licensing.html or contact the
** sales department at sales@trolltech.com.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
****************************************************************************/
#ifndef SERVER_H
#define SERVER_H
#include <QDialog>
class QLabel;
class QPushButton;
class QTcpServer;
class BonjourServiceRegister;
class Server : public QDialog
{
Q_OBJECT
public:
Server(QWidget *parent = 0);
private slots:
void sendFortune();
private:
QLabel *statusLabel;
QPushButton *quitButton;
QTcpServer *tcpServer;
QStringList fortunes;
BonjourServiceRegister *bonjourRegister;
};
#endif

2
libsrc/effectengine/CMakeLists.txt
View File

@ -39,8 +39,6 @@ add_library(effectengine
${EffectEngineSOURCES}
)
qt5_use_modules(effectengine Widgets)
target_link_libraries(effectengine
hyperion
jsoncpp

2
libsrc/grabber/v4l2/CMakeLists.txt
View File

@ -25,8 +25,6 @@ add_library(v4l2-grabber
${V4L2_HEADERS_MOC}
)
qt5_use_modules(v4l2-grabber Widgets)
target_link_libraries(v4l2-grabber
hyperion
${QT_LIBRARIES}

2
libsrc/hyperion/CMakeLists.txt
View File

@ -53,8 +53,6 @@ add_library(hyperion
${Hyperion_RESOURCES_RCC}
)
qt5_use_modules(hyperion Widgets)
target_link_libraries(hyperion
blackborder
hyperion-utils

2
libsrc/jsonserver/CMakeLists.txt
View File

@ -33,7 +33,7 @@ add_library(jsonserver
${JsonServer_RESOURCES_RCC}
)
qt5_use_modules(jsonserver Widgets Network)
qt5_use_modules(jsonserver Network)
target_link_libraries(jsonserver
hyperion

2
libsrc/leddevice/CMakeLists.txt
View File

@ -137,7 +137,7 @@ add_library(leddevice
${Leddevice_SOURCES}
)
qt5_use_modules(leddevice Widgets Network)
qt5_use_modules(leddevice Network)
target_link_libraries(leddevice
hyperion-utils

2
libsrc/protoserver/CMakeLists.txt
View File

@ -46,7 +46,7 @@ add_library(protoserver
${ProtoServer_PROTO_HDRS}
)
qt5_use_modules(protoserver Widgets)
qt5_use_modules(protoserver Gui)
target_link_libraries(protoserver
hyperion

2
libsrc/udplistener/CMakeLists.txt
View File

@ -24,8 +24,6 @@ add_library(udplistener
${UDPListener_HEADERS_MOC}
)
qt5_use_modules(udplistener Widgets)
target_link_libraries(udplistener
hyperion
hyperion-utils

2
libsrc/utils/CMakeLists.txt
View File

@ -49,7 +49,7 @@ add_library(hyperion-utils
${CURRENT_SOURCE_DIR}/jsonschema/JsonSchemaChecker.cpp
)
qt5_use_modules(hyperion-utils Widgets)
qt5_use_modules(hyperion-utils Core)
target_link_libraries(hyperion-utils
jsoncpp

2
libsrc/webconfig/CMakeLists.txt
View File

@ -38,7 +38,7 @@ add_library(webconfig
${WebConfig_HEADERS_MOC}
)
qt5_use_modules(webconfig Widgets Network)
qt5_use_modules(webconfig Network)
target_link_libraries(webconfig
hyperion

2
libsrc/xbmcvideochecker/CMakeLists.txt
View File

@ -24,8 +24,6 @@ add_library(xbmcvideochecker
${XBMCVideoChecker_SOURCES}
)
qt5_use_modules(xbmcvideochecker Widgets)
target_link_libraries(xbmcvideochecker
hyperion
${QT_LIBRARIES})

2
src/hyperion-aml/CMakeLists.txt
View File

@ -38,6 +38,6 @@ target_link_libraries(${PROJECT_NAME}
pthread
)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )

2
src/hyperion-dispmanx/CMakeLists.txt
View File

@ -40,6 +40,6 @@ target_link_libraries( ${PROJECT_NAME}
pthread
)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )

2
src/hyperion-framebuffer/CMakeLists.txt
View File

@ -38,6 +38,6 @@ target_link_libraries( ${PROJECT_NAME}
pthread
)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )

2
src/hyperion-osx/CMakeLists.txt
View File

@ -38,6 +38,6 @@ target_link_libraries( ${PROJECT_NAME}
pthread
)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )

2
src/hyperion-remote/CMakeLists.txt
View File

@ -30,7 +30,7 @@ target_link_libraries(${PROJECT_NAME}
getoptPlusPlus
${QT_LIBRARIES})
qt5_use_modules(${PROJECT_NAME} Widgets Core Network)
qt5_use_modules(${PROJECT_NAME} Gui Core Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )

2
src/hyperion-v4l2/CMakeLists.txt
View File

@ -43,6 +43,6 @@ target_link_libraries(${PROJECT_NAME}
${QT_LIBRARIES}
)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )

2
src/hyperion-x11/CMakeLists.txt
View File

@ -41,6 +41,6 @@ target_link_libraries(${PROJECT_NAME}
pthread
)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
qt5_use_modules(${PROJECT_NAME} Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )