summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-04 10:34:57 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-04 10:43:47 (GMT)
commit12b37100d5fff9a2309cd8e86cd90325b63cc485 (patch)
tree8adb0642bbe27c5e14b5670eb037317ab5a47fc1 /examples
parente6bb00250b321b149dd80259dc4f479088d5949b (diff)
downloadQt-12b37100d5fff9a2309cd8e86cd90325b63cc485.zip
Qt-12b37100d5fff9a2309cd8e86cd90325b63cc485.tar.gz
Qt-12b37100d5fff9a2309cd8e86cd90325b63cc485.tar.bz2
'Trailing whitespace' and 'blank line' fixes for demos and examples
Diffstat (limited to 'examples')
-rw-r--r--examples/examplebase.pri5
-rw-r--r--examples/network/ftp/ftpwindow.cpp18
-rw-r--r--examples/network/ftp/main.cpp6
-rw-r--r--examples/network/ftp/sym_iap_util.h2
-rw-r--r--examples/painting/svgviewer/svgviewer.pro2
-rw-r--r--examples/sql/drilldown/drilldown.pro4
-rw-r--r--examples/sql/drilldown/informationwindow.cpp4
-rw-r--r--examples/sql/drilldown/main.cpp8
-rw-r--r--examples/sql/drilldown/view.cpp14
-rw-r--r--examples/widgets/softkeys/softkeys.cpp2
10 files changed, 32 insertions, 33 deletions
diff --git a/examples/examplebase.pri b/examples/examplebase.pri
index 70e1c37..caaf819 100644
--- a/examples/examplebase.pri
+++ b/examples/examplebase.pri
@@ -1,6 +1,6 @@
symbian {
- RSS_RULES ="group_name=\"QtExamples\";"
-
+ RSS_RULES ="group_name=\"QtExamples\";"
+
vendorinfo = \
"; Localised Vendor name" \
"%{\"Nokia, Qt Software\"}" \
@@ -10,4 +10,3 @@ symbian {
" "
default_deployment.pkg_prerules += vendorinfo
}
- \ No newline at end of file
diff --git a/examples/network/ftp/ftpwindow.cpp b/examples/network/ftp/ftpwindow.cpp
index ffab8b4..b60da66 100644
--- a/examples/network/ftp/ftpwindow.cpp
+++ b/examples/network/ftp/ftpwindow.cpp
@@ -56,10 +56,10 @@ FtpWindow::FtpWindow(QWidget *parent)
ftpServerLabel->setBuddy(ftpServerLineEdit);
statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
-#ifdef Q_OS_SYMBIAN
- // Use word wrapping to fit the text on screen
+#ifdef Q_OS_SYMBIAN
+ // Use word wrapping to fit the text on screen
statusLabel->setWordWrap( true );
-#endif
+#endif
fileList = new QTreeWidget;
fileList->setEnabled(false);
@@ -69,7 +69,7 @@ FtpWindow::FtpWindow(QWidget *parent)
connectButton = new QPushButton(tr("Connect"));
connectButton->setDefault(true);
-
+
cdToParentButton = new QPushButton;
cdToParentButton->setIcon(QPixmap(":/images/cdtoparent.png"));
cdToParentButton->setEnabled(false);
@@ -105,15 +105,15 @@ FtpWindow::FtpWindow(QWidget *parent)
// Make app better lookin on small screen
QHBoxLayout *topLayout2 = new QHBoxLayout;
topLayout2->addWidget(cdToParentButton);
- topLayout2->addWidget(connectButton);
+ topLayout2->addWidget(connectButton);
#endif
-
+
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addLayout(topLayout);
-#ifdef Q_OS_SYMBIAN
+#ifdef Q_OS_SYMBIAN
// Make app better lookin on small screen
mainLayout->addLayout(topLayout2);
-#endif
+#endif
mainLayout->addWidget(fileList);
mainLayout->addWidget(statusLabel);
mainLayout->addWidget(buttonBox);
@@ -161,7 +161,7 @@ void FtpWindow::connectOrDisconnect()
setCursor(Qt::WaitCursor);
#endif
-//![1]
+//![1]
ftp = new QFtp(this);
connect(ftp, SIGNAL(commandFinished(int, bool)),
this, SLOT(ftpCommandFinished(int, bool)));
diff --git a/examples/network/ftp/main.cpp b/examples/network/ftp/main.cpp
index f928bcb..978db0b 100644
--- a/examples/network/ftp/main.cpp
+++ b/examples/network/ftp/main.cpp
@@ -55,12 +55,12 @@ int main(int argc, char *argv[])
// in order that user can access the downloaded content
QDir::setCurrent( "c:\\data" );
#endif
- QApplication app(argc, argv);
+ QApplication app(argc, argv);
FtpWindow ftpWin;
-#ifdef Q_OS_SYMBIAN
+#ifdef Q_OS_SYMBIAN
// Make application better looking and more usable on small screen
ftpWin.showMaximized();
-#else
+#else
ftpWin.show();
#endif
return ftpWin.exec();
diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h
index 74fe93a..c399b35 100644
--- a/examples/network/ftp/sym_iap_util.h
+++ b/examples/network/ftp/sym_iap_util.h
@@ -293,7 +293,7 @@ static QString qt_RouteInfoL() {
return output;
}
-QString qt_TDesC2QStringL(const TDesC& aDescriptor)
+QString qt_TDesC2QStringL(const TDesC& aDescriptor)
{
#ifdef QT_NO_UNICODE
return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length());
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
index 523dcf6..ea77946 100644
--- a/examples/painting/svgviewer/svgviewer.pro
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -28,5 +28,5 @@ symbian: {
TARGET.UID3 = 0xA000A64E
addFiles.sources = files\*.svg
addFiles.path = .
- DEPLOYMENT += addFiles
+ DEPLOYMENT += addFiles
}
diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro
index 7907bd2..1d0714b 100644
--- a/examples/sql/drilldown/drilldown.pro
+++ b/examples/sql/drilldown/drilldown.pro
@@ -1,7 +1,7 @@
HEADERS = ../connection.h \
imageitem.h \
informationwindow.h \
- view.h
+ view.h
RESOURCES = drilldown.qrc
SOURCES = imageitem.cpp \
informationwindow.cpp \
@@ -15,6 +15,6 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS drilldown.pro *.png *.jpg imag
sources.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
INSTALLS += target sources
-symbian:TARGET.UID3 = 0xA000C612
+symbian:TARGET.UID3 = 0xA000C612
include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp
index b01b753..8b5fd0c 100644
--- a/examples/sql/drilldown/informationwindow.cpp
+++ b/examples/sql/drilldown/informationwindow.cpp
@@ -101,9 +101,9 @@ InformationWindow::InformationWindow(int id, QSqlRelationalTableModel *offices,
setWindowFlags(Qt::Window);
enableButtons(false);
setWindowTitle(tr("Office: %1").arg(locationText->text()));
-#ifndef Q_OS_SYMBIAN
+#ifndef Q_OS_SYMBIAN
resize(320, sizeHint().height());
-#endif
+#endif
}
//! [4]
diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp
index 432849d..57a11ed 100644
--- a/examples/sql/drilldown/main.cpp
+++ b/examples/sql/drilldown/main.cpp
@@ -54,10 +54,10 @@ int main(int argc, char *argv[])
return 1;
View view("offices", "images");
-#ifndef Q_OS_SYMBIAN
+#ifndef Q_OS_SYMBIAN
view.show();
-#else
- view.showFullScreen();
-#endif
+#else
+ view.showFullScreen();
+#endif
return app.exec();
}
diff --git a/examples/sql/drilldown/view.cpp b/examples/sql/drilldown/view.cpp
index e288ac6..349547a 100644
--- a/examples/sql/drilldown/view.cpp
+++ b/examples/sql/drilldown/view.cpp
@@ -62,15 +62,15 @@ View::View(const QString &offices, const QString &images, QWidget *parent)
QGraphicsPixmapItem *logo = scene->addPixmap(QPixmap(":/logo.png"));
logo->setPos(30, 515);
-
+
#ifndef Q_OS_SYMBIAN
setMinimumSize(470, 620);
- setMaximumSize(470, 620);
+ setMaximumSize(470, 620);
#else
- setDragMode(QGraphicsView::ScrollHandDrag);
-#endif
+ setDragMode(QGraphicsView::ScrollHandDrag);
+#endif
- setWindowTitle(tr("Offices World Wide"));
+ setWindowTitle(tr("Offices World Wide"));
}
//! [1]
@@ -135,7 +135,7 @@ void View::showInformation(ImageItem *image)
window->show();
#else
window->showFullScreen();
-#endif
+#endif
} else {
InformationWindow *window;
window = new InformationWindow(id, officeTable, this);
@@ -148,7 +148,7 @@ void View::showInformation(ImageItem *image)
window->show();
#else
window->showFullScreen();
-#endif
+#endif
informationWindows.append(window);
}
}
diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp
index 110f2e6..d8ab09a 100644
--- a/examples/widgets/softkeys/softkeys.cpp
+++ b/examples/widgets/softkeys/softkeys.cpp
@@ -65,7 +65,7 @@ MainWindow::MainWindow(QWidget *parent)
toggleButton = new QPushButton(tr("Custom softkeys"), this);
toggleButton->setContextMenuPolicy(Qt::NoContextMenu);
- toggleButton->setCheckable(true);
+ toggleButton->setCheckable(true);
pushButton = new QPushButton(tr("Open File Dialog"), this);
pushButton->setContextMenuPolicy(Qt::NoContextMenu);