diff -Nru fgx-2.8.0~1029+git46d4c7f/debian/changelog fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/debian/changelog --- fgx-2.8.0~1029+git46d4c7f/debian/changelog 2013-11-16 14:00:43.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/debian/changelog 2015-01-22 20:24:28.000000000 +0000 @@ -1,3 +1,9 @@ +fgx (2.8.0~1029+git46d4c7f-really~1020+gitff80c01-0ubuntu1~ppa1~precise) precise; urgency=low + + * Reverting to git version ff80c01 due to map not being displayed. + + -- Saikrishna Arcot Thu, 22 Jan 2015 15:21:52 -0500 + fgx (2.8.0~1029+git46d4c7f-0ubuntu1~ppa1~precise1) precise; urgency=low [ Pedro ] diff -Nru fgx-2.8.0~1029+git46d4c7f/README.rst fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/README.rst --- fgx-2.8.0~1029+git46d4c7f/README.rst 2013-11-16 14:00:05.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/README.rst 2013-11-10 03:04:02.000000000 +0000 @@ -1,16 +1,21 @@ FGx ======== -**Free & Open Source XPlatform Launcher For FlightGear** +**FREE AND OPEN SOURCE LAUNCHER FOR FLIGHTGEAR** -* Version 2.8.x - see +* Version 2.8.x -Build Status --------------------------- .. image:: https://secure.travis-ci.org/fgx/fgx.png?branch=master :target: http://travis-ci.org/fgx/fgx +The project +-------------------------- + +* Bugs and documentation: http://code.google.com/p/fgx +* Code: http://gitorious.org/fgx + + Minimal Requirements -------------------------- Hard- and Software (TODO: Windows, Linux requirements): @@ -35,7 +40,7 @@ About -------------------------- -FGX is a Qt-based c++ launcher for FlightGear. There is more than one launcher around for FlightGear like FGrun or others, intention for FGX was mainly to have fast and small launcher for OSX, starting the real and only free and Open Source Flight Simulator FlightGear within 5 seconds (also development versions and nightly builds). Since it makes no sense to have such a launcher only for one platform using qt, it became cross-platform and could be used also with Debian and Win. +FGX is a qt-based c++ launcher for FlightGear. There is more than one launcher around for FlightGear like FGrun or others, intention for FGX was mainly to have fast and small launcher for OSX, starting the real and only free and Open Source Flight Simulator FlightGear within 5 seconds (also development versions and nightly builds). Since it makes no sense to have such a launcher only for one platform using qt, it became cross-platform and could be used also with Debian and Win. The FGX project was started early 2011 by Yves Sablonier in Swiss Mountains, peering to another project started once by Pedro. Bright Pedro in Wales (there are mountains too) was enough of a git to go and check it out, then code a load of patches to its current state and do all needed changes, to get more stable code. Yves Sablonier tried to step down, but Pedro still needs him for issue tracking, polish, to get a good logo, and maybe once for good manuals and documentation. So Yves Sablonier did not step down, but he is always one step behind ... @@ -99,6 +104,6 @@ http://www.gitorious.org/fg FlightGear Forum (User and Development Forums): -http://forums.flightgear.org +http://www.flightgear.org/forums diff -Nru fgx-2.8.0~1029+git46d4c7f/src/aircraft/aircraftwidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/aircraft/aircraftwidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/aircraft/aircraftwidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/aircraft/aircraftwidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -9,39 +9,38 @@ #include "app_config.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -// @TODO - qt5 dont use this #include #include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include #include "aircraft/aircraftwidget.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/aircraft/aircraftwidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/aircraft/aircraftwidget.h --- fgx-2.8.0~1029+git46d4c7f/src/aircraft/aircraftwidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/aircraft/aircraftwidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -12,16 +12,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "xobjects/mainobject.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/airports/airportswidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/airportswidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/airports/airportswidget.cpp 2013-11-16 14:00:05.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/airportswidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -16,28 +16,28 @@ #include #include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include -#include +#include @@ -376,7 +376,7 @@ mapWidget = new OpenLayerWidget(mainObject); mapWidget->setMinimumWidth(400); mainLayout->addWidget(mapWidget); - mapWidget->load_map("airport"); + mapWidget->load_map("airport"); connect(mapWidget, SIGNAL(map_double_clicked(QString,QString, QString)), this, SLOT(on_map_double_clicked(QString, QString, QString))); diff -Nru fgx-2.8.0~1029+git46d4c7f/src/airports/airportswidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/airportswidget.h --- fgx-2.8.0~1029+git46d4c7f/src/airports/airportswidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/airportswidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -13,21 +13,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include "xwidgets/xgroupboxes.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/airports/importairportsdialog.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/importairportsdialog.cpp --- fgx-2.8.0~1029+git46d4c7f/src/airports/importairportsdialog.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/importairportsdialog.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -7,19 +7,19 @@ // GNU GPLv2, see main.cpp and shipped licence.txt for further information -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "airports/importairportsdialog.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/airports/importairportsdialog.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/importairportsdialog.h --- fgx-2.8.0~1029+git46d4c7f/src/airports/importairportsdialog.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/airports/importairportsdialog.h 2013-11-10 03:04:02.000000000 +0000 @@ -10,11 +10,11 @@ #define IMPORTAIRPORTSWIDGET_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "xobjects/xsettings.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/fgx.pro fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/fgx.pro --- fgx-2.8.0~1029+git46d4c7f/src/fgx.pro 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/fgx.pro 2013-11-10 03:04:02.000000000 +0000 @@ -146,40 +146,3 @@ resources/default.qrc \ resources/images.qrc CONFIG += qt thread - -unix { - contains(SYSTEM_ZLIB, "ON") { - packagesExist(zlib) { - CONFIG += link_pkgconfig - PKGCONFIG += zlib - message("Using system zlib") - DEFINE += USE_SYSTEM_ZLIB - HEADERS -= utilities/zlib/inftrees.h \ - utilities/zlib/inflate.h \ - utilities/zlib/inffixed.h \ - utilities/zlib/inffast.h \ - utilities/zlib/gzguts.h \ - utilities/zlib/fgx_zutil.h \ - utilities/zlib/fgx_zlib.h \ - utilities/zlib/fgx_zconf.h \ - utilities/zlib/deflate.h \ - utilities/zlib/crc32.h \ - utilities/zlib/trees.h - SOURCES -= utilities/zlib/uncompr.c \ - utilities/zlib/trees.c \ - utilities/zlib/inftrees.c \ - utilities/zlib/inflate.c \ - utilities/zlib/inffast.c \ - utilities/zlib/infback.c \ - utilities/zlib/gzwrite.c \ - utilities/zlib/gzread.c \ - utilities/zlib/gzlib.c \ - utilities/zlib/gzclose.c \ - utilities/zlib/deflate.c \ - utilities/zlib/crc32.c \ - utilities/zlib/compress.c \ - utilities/zlib/adler32.c \ - utilities/zlib/zutil.c - } - } -} diff -Nru fgx-2.8.0~1029+git46d4c7f/src/launcher/launcherwindow.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/launcherwindow.cpp --- fgx-2.8.0~1029+git46d4c7f/src/launcher/launcherwindow.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/launcherwindow.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -6,24 +6,24 @@ // Geoff McLane // GNU GPLv2, see main.cpp and shipped licence.txt for further information -#include -#include +#include +#include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "xwidgets/xgroupboxes.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/launcher/launcherwindow.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/launcherwindow.h --- fgx-2.8.0~1029+git46d4c7f/src/launcher/launcherwindow.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/launcherwindow.h 2013-11-10 03:04:02.000000000 +0000 @@ -9,12 +9,12 @@ #ifndef LAUNCHERWINDOW_H #define LAUNCHERWINDOW_H -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include "panes/coresettingswidget.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/menuwidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.cpp 2013-11-16 14:00:05.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/menuwidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -100,18 +100,17 @@ defaultProfileAction->setStatusTip(tr("Reload FGx default profile (built-in)")); connect(defaultProfileAction, SIGNAL(triggered()), this, SLOT(on_menu_default_profile())); - //======================================= // Menu FlightGear Help actions + urlActionWiki = new QAction(tr("FlightGear Wiki"), this); connect(urlActionWiki, SIGNAL(triggered()), this, SLOT(on_menu_url_wiki())); urlActionForums = new QAction(tr("FlightGear Forums"), this); connect(urlActionForums, SIGNAL(triggered()), this, SLOT(on_menu_url_forums())); - //======================================= // Menu FGx Help actions - urlActionFGxUserHelp = new QAction(tr("FGx - User Forum"), this); + urlActionFGxUserHelp = new QAction(tr("FGx User Forums"), this); connect(urlActionFGxUserHelp, SIGNAL(triggered()), this, SLOT(on_menu_fgx_user_forums())); // Add actions to menu "FGx"/"Windows" (OSX = "Windows") @@ -132,9 +131,7 @@ // Add actions to menu "Help" helpFlightGearGroup->addAction(urlActionWiki); helpFlightGearGroup->addAction(urlActionForums); - helpFGxGroup->addAction("FGx - Source code and Bugs at github", this, SLOT(on_menu_fgx_github()) ); - helpFGxGroup->addAction(urlActionFGxUserHelp); - + helpFGxGroup->addAction(urlActionFGxUserHelp); helpMenu->addMenu(helpFlightGearGroup); helpMenu->addMenu(helpFGxGroup); @@ -263,16 +260,12 @@ void MenuWidget::on_menu_url_forums() { - QUrl url("http://forum.flightgear.org/"); + QUrl url("http://www.flightgear.org/forums"); QDesktopServices::openUrl( url ); } void MenuWidget::on_menu_fgx_user_forums() { - QUrl url("http://forum.flightgear.org/viewforum.php?f=65"); - QDesktopServices::openUrl( url ); -} - -void MenuWidget::on_menu_fgx_github(){ - QDesktopServices::openUrl( QUrl("https://github.com/fgx/fgx") ); -} + QUrl url("http://www.flightgear.org/forums/viewforum.php?f=65"); + QDesktopServices::openUrl( url ); +} \ No newline at end of file diff -Nru fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/menuwidget.h --- fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.h 2013-11-16 14:00:05.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/launcher/menuwidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -14,11 +14,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "xwidgets/fgxdebugwidget.h" @@ -88,7 +88,7 @@ void on_menu_url_wiki(); void on_menu_url_forums(); void on_menu_fgx_user_forums(); - void on_menu_fgx_github(); + }; #endif // XMENUWIDGET_H diff -Nru fgx-2.8.0~1029+git46d4c7f/src/logs/viewlogswidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/logs/viewlogswidget.h --- fgx-2.8.0~1029+git46d4c7f/src/logs/viewlogswidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/logs/viewlogswidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -10,10 +10,10 @@ #define VIEWLOGSWIDGET_H -#include -#include -#include -#include +#include +#include +#include +#include #include "xobjects/mainobject.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/main.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/main.cpp --- fgx-2.8.0~1029+git46d4c7f/src/main.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/main.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -2,7 +2,7 @@ // ,,-''' `'''--. -=-=-=-=-=-=-=-=-=-=-=-=-=-=- // ,' `. FGx FlightGear Launcher // ,' \ -=-=-=-=-=-=-=-=-=-=-=-=-=-=- -// ,' / ' (c) 2010-2013 +// ,' / ' (c) 2010-2012 // / ,---[ || Yves Sablonier, Pete Morgan // | _,.--| / \ Geoff McLane // | .-'' ' /' ,',-._ diff -Nru fgx-2.8.0~1029+git46d4c7f/src/map/openlayerwidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/map/openlayerwidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/map/openlayerwidget.cpp 2013-11-16 14:00:05.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/map/openlayerwidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -7,21 +7,21 @@ // GNU GPLv2, see main.cpp and shipped licence.txt for further information -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include @@ -301,15 +301,13 @@ void OpenLayerWidget::load_map(QString m_typ) { this->map_type = m_typ; - QFile file(":/openlayers/map.html"); + QFile file(":/openlayers/map.html"); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){ - qDebug() << "MAP: could not open file" << file.fileName(); + //qDebug() << "MAP: could not open file" << file.fileName(); return; } - QByteArray contents = file.readAll(); - // @TODO: This stuff id dodgy and "qrc:///" caused seg fault - pete - webView->setHtml(contents, QUrl("qrc://")); // This prefix does not work with src:///openlayers/ .. help.. Geoff.. gral.? + webView->setHtml(contents, QUrl("qrc:///")); // This prefix does not work with src:///openlayers/ .. help.. Geoff.. gral.? webView->page()->mainFrame()->addToJavaScriptWindowObject("Qt", this); webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, mainObject->debug_mode); diff -Nru fgx-2.8.0~1029+git46d4c7f/src/map/openlayerwidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/map/openlayerwidget.h --- fgx-2.8.0~1029+git46d4c7f/src/map/openlayerwidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/map/openlayerwidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -17,14 +17,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff -Nru fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapwidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapwidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapwidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapwidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -12,11 +12,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "mpmap/mpmapwidget.h" #include "panes/coresettingswidget.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapwidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapwidget.h --- fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapwidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapwidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -11,14 +11,14 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include #include #include diff -Nru fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapxwidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapxwidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapxwidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapxwidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -6,21 +6,21 @@ // Geoff McLane // GNU GPLv2, see main.cpp and shipped licence.txt for further information -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include "mpmap/mpmapxwidget.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapxwidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapxwidget.h --- fgx-2.8.0~1029+git46d4c7f/src/mpmap/mpmapxwidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/mpmapxwidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -9,20 +9,20 @@ #ifndef MPMAPXWIDGET_H #define MPMAPXWIDGET_H -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "map/openlayerwidget.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/mpmap/pilotswidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/pilotswidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/mpmap/pilotswidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/pilotswidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -10,12 +10,12 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include #include diff -Nru fgx-2.8.0~1029+git46d4c7f/src/mpmap/pilotswidget.h fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/pilotswidget.h --- fgx-2.8.0~1029+git46d4c7f/src/mpmap/pilotswidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/mpmap/pilotswidget.h 2013-11-10 03:04:02.000000000 +0000 @@ -1,7 +1,7 @@ // -=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- // FGx FlightGear Launcher // pilotswidget.h // -=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=-=-=- -// (c) 2010-201 +// (c) 2010-2012 // Yves Sablonier, Pete Morgan // Geoff McLane // GNU GPLv2, see main.cpp and shipped licence.txt for further information @@ -10,16 +10,16 @@ #define PILOTSWIDGET_H -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "xobjects/mainobject.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/network/mptelnet.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/network/mptelnet.cpp --- fgx-2.8.0~1029+git46d4c7f/src/network/mptelnet.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/network/mptelnet.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -7,7 +7,7 @@ // GNU GPLv2, see main.cpp and shipped licence.txt for further information -#include +#include #include "mptelnet.h" diff -Nru fgx-2.8.0~1029+git46d4c7f/src/network/networkwidget.cpp fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/network/networkwidget.cpp --- fgx-2.8.0~1029+git46d4c7f/src/network/networkwidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f-really~1020+gitff80c01/src/network/networkwidget.cpp 2013-11-10 03:04:02.000000000 +0000 @@ -6,33 +6,33 @@ // Geoff McLane // GNU GPLv2, see main.cpp and shipped licence.txt for further information -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include