From 5432f2c7a1ff02e1ee0e07e442ceb6c12ca66098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Feb 2015 14:09:23 +0100 Subject: Remove traces of the Maemo platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6b551de331aa0386ea53d8e96f50b669777d2d69 Reviewed-by: Friedemann Kleint Reviewed-by: Marc Mutz Reviewed-by: Tor Arne Vestbø --- examples/network/bearermonitor/bearermonitor.cpp | 11 - examples/network/bearermonitor/bearermonitor.pro | 2 - .../network/bearermonitor/bearermonitor_maemo.ui | 369 --------------------- examples/network/bearermonitor/sessionwidget.cpp | 11 - examples/network/bearermonitor/sessionwidget.h | 8 - .../network/bearermonitor/sessionwidget_maemo.ui | 310 ----------------- examples/widgets/doc/src/elidedlabel.qdoc | 6 - .../widgets/widgets/elidedlabel/testwidget.cpp | 3 - 8 files changed, 720 deletions(-) delete mode 100644 examples/network/bearermonitor/bearermonitor_maemo.ui delete mode 100644 examples/network/bearermonitor/sessionwidget_maemo.ui (limited to 'examples') diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp index 2f5d6cda1c..2d8fbf42b1 100644 --- a/examples/network/bearermonitor/bearermonitor.cpp +++ b/examples/network/bearermonitor/bearermonitor.cpp @@ -56,13 +56,8 @@ BearerMonitor::BearerMonitor(QWidget *parent) : QWidget(parent) { setupUi(this); -#ifdef MAEMO_UI - newSessionButton->hide(); - deleteSessionButton->hide(); -#else delete tabWidget->currentWidget(); sessionGroup->hide(); -#endif updateConfigurations(); onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty()); QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration(); @@ -99,10 +94,8 @@ BearerMonitor::BearerMonitor(QWidget *parent) connect(newSessionButton, SIGNAL(clicked()), this, SLOT(createNewSession())); -#ifndef MAEMO_UI connect(deleteSessionButton, SIGNAL(clicked()), this, SLOT(deleteSession())); -#endif connect(scanButton, SIGNAL(clicked()), this, SLOT(performScan())); @@ -385,9 +378,7 @@ void BearerMonitor::createSessionFor(QTreeWidgetItem *item) tabWidget->addTab(session, conf.name()); -#ifndef MAEMO_UI sessionGroup->show(); -#endif sessionWidgets.append(session); } @@ -400,7 +391,6 @@ void BearerMonitor::createNewSession() createSessionFor(item); } -#ifndef MAEMO_UI void BearerMonitor::deleteSession() { SessionWidget *session = qobject_cast(tabWidget->currentWidget()); @@ -413,7 +403,6 @@ void BearerMonitor::deleteSession() sessionGroup->hide(); } } -#endif void BearerMonitor::performScan() { diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index 05584bd582..48358fc33c 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -12,8 +12,6 @@ FORMS = bearermonitor_240_320.ui \ bearermonitor_640_480.ui \ sessionwidget.ui -EXAMPLE_FILES = bearermonitor_maemo.ui sessionwidget_maemo.ui # not used - win32:!wince*:LIBS += -lws2_32 wince*:LIBS += -lws2 diff --git a/examples/network/bearermonitor/bearermonitor_maemo.ui b/examples/network/bearermonitor/bearermonitor_maemo.ui deleted file mode 100644 index 9c72bfd5b1..0000000000 --- a/examples/network/bearermonitor/bearermonitor_maemo.ui +++ /dev/null @@ -1,369 +0,0 @@ - - - BearerMonitor - - - - 0 - 0 - 612 - 555 - - - - BearerMonitor - - - - - - System State - - - true - - - - 0 - - - - - Online State: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - Configurations && Sessions - - - true - - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - 0 - - - false - - - - Configurations - - - - - - - 0 - 0 - - - - false - - - false - - - - 1 - - - - - - - - - - - - Name: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - State: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Type: - - - - - - - - 0 - 0 - - - - Invalid - - - - - - - - - - - Purpose: - - - - - - - - 0 - 0 - - - - Unknown - - - - - - - - - - - Identifier: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Roaming: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Children: - - - - - - - - 0 - 0 - - - - - - - - - - - - - Network Location Awareness - - - - - - Register - - - - - - - Unregister - - - - - - - - - - New Session - - - - - - - Delete Session - - - - - - - Scan - - - - - - - 0 - - - 23280 - - - false - - - false - - - %p% - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - - - - diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp index da134d4ac0..b40d6a7e42 100644 --- a/examples/network/bearermonitor/sessionwidget.cpp +++ b/examples/network/bearermonitor/sessionwidget.cpp @@ -74,10 +74,6 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren this, SLOT(closeSession())); connect(stopSessionButton, SIGNAL(clicked()), this, SLOT(stopSession())); -#ifdef MAEMO_UI - connect(deleteSessionButton, SIGNAL(clicked()), - this, SLOT(deleteSession())); -#endif } SessionWidget::~SessionWidget() @@ -94,13 +90,6 @@ void SessionWidget::timerEvent(QTimerEvent *e) } } -#ifdef MAEMO_UI -void SessionWidget::deleteSession() -{ - delete this; -} -#endif - void SessionWidget::updateSession() { updateSessionState(session->state()); diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h index a42c20495d..ac9d88c00e 100644 --- a/examples/network/bearermonitor/sessionwidget.h +++ b/examples/network/bearermonitor/sessionwidget.h @@ -43,11 +43,7 @@ #include -#ifdef MAEMO_UI -#include "ui_sessionwidget_maemo.h" -#else #include "ui_sessionwidget.h" -#endif QT_USE_NAMESPACE @@ -72,10 +68,6 @@ private Q_SLOTS: void stopSession(); void updateSession(); void updateSessionError(QNetworkSession::SessionError error); -#ifdef MAEMO_UI - void deleteSession(); -#endif - private: QNetworkSession *session; diff --git a/examples/network/bearermonitor/sessionwidget_maemo.ui b/examples/network/bearermonitor/sessionwidget_maemo.ui deleted file mode 100644 index 8867509d01..0000000000 --- a/examples/network/bearermonitor/sessionwidget_maemo.ui +++ /dev/null @@ -1,310 +0,0 @@ - - - SessionWidget - - - - 0 - 0 - 497 - 615 - - - - Session Details - - - - - - - - - - Session ID: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - 0 - 0 - - - - Session State: - - - - - - - - 0 - 0 - - - - Invalid - - - - - - - - - - - Configuration: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Bearer: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Interface Name: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Interface GUID: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Last Error: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Error String - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - - - Qt::AlignCenter - - - - - - - 0 - - - Qt::AlignCenter - - - - - - - - - - - Active Time: - - - - - - - - 0 - 0 - - - - 0 seconds - - - - - - - - - - - - - Open - - - - - - - Close - - - - - - - Blocking Open - - - - - - - Stop - - - - - - - Delete - - - - - - - - - - diff --git a/examples/widgets/doc/src/elidedlabel.qdoc b/examples/widgets/doc/src/elidedlabel.qdoc index 5a4d384de8..6722b194b7 100644 --- a/examples/widgets/doc/src/elidedlabel.qdoc +++ b/examples/widgets/doc/src/elidedlabel.qdoc @@ -131,12 +131,6 @@ \snippet widgets/elidedlabel/testwidget.cpp 4 - On the Maemo platform, windows are stuck in landscape mode by default. With - this attribute set, the window manager is aware that this window can be - rotated. - - \snippet widgets/elidedlabel/testwidget.cpp 5 - The \c widthSlider and \c heightSlider have the exact same length as the dimensions of the \c elidedText. The maximum value for both of them is thus their lengths, and each tick indicates one pixel. diff --git a/examples/widgets/widgets/elidedlabel/testwidget.cpp b/examples/widgets/widgets/elidedlabel/testwidget.cpp index 249757ab2b..f17ad03673 100644 --- a/examples/widgets/widgets/elidedlabel/testwidget.cpp +++ b/examples/widgets/widgets/elidedlabel/testwidget.cpp @@ -116,10 +116,7 @@ TestWidget::TestWidget(QWidget *parent): setLayout(layout); //! [4] - - //! [5] } -//! [5] //! [6] void TestWidget::resizeEvent(QResizeEvent *event) -- cgit v1.2.3