From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: Whitespace cleanup: remove trailing whitespace Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen --- tests/manual/bearerex/bearerex.cpp | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'tests/manual/bearerex/bearerex.cpp') diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp index 4417253930..185dbe123e 100644 --- a/tests/manual/bearerex/bearerex.cpp +++ b/tests/manual/bearerex/bearerex.cpp @@ -49,9 +49,9 @@ BearerEx::BearerEx(QWidget* parent) : QMainWindow(parent) { setupUi(this); - + createMenus(); - + connect(&m_NetworkConfigurationManager, SIGNAL(updateCompleted()), this, SLOT(configurationsUpdateCompleted())); connect(&m_NetworkConfigurationManager, SIGNAL(configurationAdded(QNetworkConfiguration)), this, SLOT(configurationAdded(QNetworkConfiguration))); @@ -79,19 +79,19 @@ void BearerEx::showConfigurations() { listWidget->clear(); QListWidgetItem* listItem; - + QNetworkConfiguration defaultConfig = m_NetworkConfigurationManager.defaultConfiguration(); if (defaultConfig.type() == QNetworkConfiguration::UserChoice) { listItem = new QListWidgetItem(); QFont font = listItem->font(); font.setBold(true); font.setUnderline(true); - listItem->setFont(font); + listItem->setFont(font); listItem->setText(" UserChoice"); listItem->setData(Qt::UserRole, QVariant::fromValue(defaultConfig)); listWidget->addItem(listItem); } - + QList configurations = m_NetworkConfigurationManager.allConfigurations(); for (int i=0; ifont(); font.setBold(true); font.setUnderline(true); - listItem->setFont(font); + listItem->setFont(font); } listItem->setText(text); listItem->setData(Qt::UserRole, QVariant::fromValue(configurations[i])); @@ -151,7 +151,7 @@ void BearerEx::on_createSessionButton_clicked() QListWidgetItem* item = listWidget->currentItem(); if (!item) { return; - } + } QNetworkConfiguration networkConfiguration = qvariant_cast(item->data(Qt::UserRole)); int newTabIndex = mainTabWidget->count(); SessionTab* newTab = new SessionTab(&networkConfiguration,&m_NetworkConfigurationManager,eventListWidget,newTabIndex-1); @@ -184,7 +184,7 @@ void BearerEx::onlineStateChanged(bool isOnline) QListWidgetItem* listItem = new QListWidgetItem(); QFont font = listItem->font(); font.setBold(true); - listItem->setFont(font); + listItem->setFont(font); if (isOnline) { listItem->setText(QString("> Online")); } else { @@ -231,7 +231,7 @@ DetailedInfoDialog::DetailedInfoDialog(QNetworkConfiguration* apNetworkConfigura tableWidget->setColumnCount(2); int rowCount = 2; - + if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) { rowCount = rowCount + apNetworkConfiguration->children().count(); } @@ -274,7 +274,7 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration, connect(m_NetworkSession, SIGNAL(opened()), this, SLOT(opened())); connect(m_NetworkSession, SIGNAL(closed()), this, SLOT(closed())); connect(m_NetworkSession, SIGNAL(error(QNetworkSession::SessionError)), this, SLOT(error(QNetworkSession::SessionError))); - + if (apNetworkConfiguration->type() == QNetworkConfiguration::InternetAccessPoint) { snapLabel->hide(); snapLineEdit->hide(); @@ -342,7 +342,7 @@ void SessionTab::on_openSessionButton_clicked() { m_NetworkSession->open(); if (m_NetworkSession->isOpen()) { - newState(m_NetworkSession->state()); + newState(m_NetworkSession->state()); } } @@ -350,7 +350,7 @@ void SessionTab::on_closeSessionButton_clicked() { m_NetworkSession->close(); if (!m_NetworkSession->isOpen()) { - newState(m_NetworkSession->state()); + newState(m_NetworkSession->state()); } } @@ -414,10 +414,10 @@ void SessionTab::opened() QListWidgetItem* listItem = new QListWidgetItem(); QFont font = listItem->font(); font.setBold(true); - listItem->setFont(font); + listItem->setFont(font); listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+QString("Opened")); m_eventListWidget->addItem(listItem); - + QVariant identifier = m_NetworkSession->sessionProperty("ActiveConfiguration"); if (!identifier.isNull()) { QString configId = identifier.toString(); @@ -445,7 +445,7 @@ void SessionTab::closed() QListWidgetItem* listItem = new QListWidgetItem(); QFont font = listItem->font(); font.setBold(true); - listItem->setFont(font); + listItem->setFont(font); listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+QString("Closed")); m_eventListWidget->addItem(listItem); } @@ -492,10 +492,10 @@ void SessionTab::on_dataObjectChanged(const QString &newObjectType) } -void SessionTab::stateChanged(QNetworkSession::State state) +void SessionTab::stateChanged(QNetworkSession::State state) { newState(state); - + QListWidgetItem* listItem = new QListWidgetItem(); listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+stateString(state)); m_eventListWidget->addItem(listItem); @@ -527,7 +527,7 @@ void SessionTab::error(QNetworkSession::SessionError error) QListWidgetItem* listItem = new QListWidgetItem(); QMessageBox msgBox; msgBox.setStandardButtons(QMessageBox::Close); - + QString errorString; switch (error) { @@ -549,7 +549,7 @@ void SessionTab::error(QNetworkSession::SessionError error) } listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+errorString); m_eventListWidget->addItem(listItem); - + msgBox.setText(errorString); msgBox.exec(); } -- cgit v1.2.3