e94063f · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

do some cleanup

e94063fMichael Zanetti12 years ago

src/Dash/main.cpp−17

compare with xenial

unifiedsplit

@@ -17,26 +17,13 @@

17 * along with this program. If not, see <http://www.gnu.org/licenses/>.

18 */

20−// Qt

21−//#include <QCommandLineParser>

22#include <QtQuick/QQuickView>

20#include <QtQuick/QQuickView>

23#include <QtGui/QGuiApplication>

21#include <QtGui/QGuiApplication>

24#include <QtQml/QQmlEngine>

22#include <QtQml/QQmlEngine>

25#include <QtQml/QQmlContext>

23#include <QtQml/QQmlContext>

26−//#include <qpa/qplatformnativeinterface.h>

27−//#include <QLibrary>

28#include <QDebug>

24#include <QDebug>

29−//#include <libintl.h>

30−//#include <dlfcn.h>

31−//#include <csignal>

33−//// local

34#include <paths.h>

26#include <paths.h>

35−//#include "MouseTouchAdaptor.h"

36−//#include "ApplicationArguments.h"

37−

38−//#include <unity-mir/qmirserver.h>

39−

41int main(int argc, const char *argv[])

28int main(int argc, const char *argv[])

42{

29{

@@ -45,8 +32,6 @@ int main(int argc, const char *argv[])

45 QQuickView* view = new QQuickView();

32 QQuickView* view = new QQuickView();

46 view->setResizeMode(QQuickView::SizeRootObjectToView);

33 view->setResizeMode(QQuickView::SizeRootObjectToView);

47 view->setTitle("Unity Dash");

34 view->setTitle("Unity Dash");

48−// view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

49−// view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);

51 QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

36 QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

52 prependImportPaths(view->engine(), ::overrideImportPaths());

37 prependImportPaths(view->engine(), ::overrideImportPaths());

@@ -57,8 +42,6 @@ int main(int argc, const char *argv[])

58 int result = application->exec();

43 int result = application->exec();

60− qDebug() << "fooooooooooo" << result;

61−

62 delete view;

45 delete view;

63 delete application;

46 delete application;