Trailing whitespace and tab/space fixes for demos/embedded

13 files changed, 93 insertions, 96 deletions

diff --git a/demos/embedded/anomaly/src/Main.cpp b/demos/embedded/anomaly/src/Main.cpp
index d861857e8f..6ab74031e4 100644
--- a/demos/embedded/anomaly/src/Main.cpp
+++ b/demos/embedded/anomaly/src/Main.cpp
@@ -51,4 +51,3 @@ int main(int argc, char *argv[])
 
     return app.exec();
 }
-
diff --git a/demos/embedded/desktopservices/contenttab.cpp b/demos/embedded/desktopservices/contenttab.cpp
index bdc5e0325c..619f5c0be8 100644
--- a/demos/embedded/desktopservices/contenttab.cpp
+++ b/demos/embedded/desktopservices/contenttab.cpp
@@ -53,32 +53,32 @@
 #include "contenttab.h"
 
 
-// CONSTRUCTORS & DESTRUCTORS  
-ContentTab::ContentTab(QWidget *parent) : 
+// CONSTRUCTORS & DESTRUCTORS
+ContentTab::ContentTab(QWidget *parent) :
     QListWidget(parent)
-{             
+{
     setDragEnabled(false);
     setIconSize(QSize(45, 45));
 }
-        
-ContentTab::~ContentTab() 
+
+ContentTab::~ContentTab()
 {
 }
 
 // NEW PUBLIC METHODS
-void ContentTab::init(const QDesktopServices::StandardLocation &location, 
-                      const QString &filter, 
+void ContentTab::init(const QDesktopServices::StandardLocation &location,
+                      const QString &filter,
                       const QString &icon)
 {
     setContentDir(location);
     QStringList filterList;
     filterList = filter.split(";");
-    m_ContentDir.setNameFilters(filterList); 
-    setIcon(icon);    
-    
+    m_ContentDir.setNameFilters(filterList);
+    setIcon(icon);
+
     connect(this, SIGNAL(itemClicked(QListWidgetItem *)),
-            this, SLOT(openItem(QListWidgetItem *)));            
-    
+            this, SLOT(openItem(QListWidgetItem *)));
+
     populateListWidget();
 }
 
@@ -98,7 +98,7 @@ void ContentTab::populateListWidget()
     QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
     foreach(QFileInfo item, fileList) {
         new QListWidgetItem(m_Icon, itemName(item), this);
-    }   
+    }
 }
 
 QString ContentTab::itemName(const QFileInfo &item)
@@ -111,21 +111,21 @@ QUrl ContentTab::itemUrl(QListWidgetItem *item)
     return QUrl("file:///" + m_ContentDir.absolutePath() + "/" + item->text());
 }
 
-void ContentTab::keyPressEvent(QKeyEvent *event)  
+void ContentTab::keyPressEvent(QKeyEvent *event)
 {
     switch(event->key()) {
     case Qt::Key_Up:
         if(currentRow() == 0) {
             setCurrentRow(count()-1);
         } else {
-            setCurrentRow(currentRow()-1);      
+            setCurrentRow(currentRow()-1);
         }
         break;
     case Qt::Key_Down:
         if(currentRow() == (count()-1)) {
-            setCurrentRow(0);   
+            setCurrentRow(0);
         } else {
-            setCurrentRow(currentRow()+1);      
+            setCurrentRow(currentRow()+1);
         }
         break;
     case Qt::Key_Select:
@@ -138,7 +138,7 @@ void ContentTab::keyPressEvent(QKeyEvent *event)
 
 void ContentTab::handleErrorInOpen(QListWidgetItem *item)
 {
-    Q_UNUSED(item);    
+    Q_UNUSED(item);
     QMessageBox::warning( this, tr("Operation Failed"), tr("Unkown error!"), QMessageBox::Close);
 }
 
diff --git a/demos/embedded/desktopservices/contenttab.h b/demos/embedded/desktopservices/contenttab.h
index 8d37209e4a..21da07fb62 100644
--- a/demos/embedded/desktopservices/contenttab.h
+++ b/demos/embedded/desktopservices/contenttab.h
@@ -61,41 +61,41 @@ QT_END_NAMESPACE
 
 /**
 * ContentTab class.
-* 
+*
 * This class implements general purpose tab for media files.
 */
 class ContentTab : public QListWidget
 {
     Q_OBJECT
 
-public:         // Constructors & Destructors          
+public:         // Constructors & Destructors
     ContentTab(QWidget *parent);
     virtual ~ContentTab();
-    
+
 public:         // New Methods
-    virtual void init(const QDesktopServices::StandardLocation &location, 
-                      const QString &filter, 
-                      const QString &icon);    
-    
+    virtual void init(const QDesktopServices::StandardLocation &location,
+                      const QString &filter,
+                      const QString &icon);
+
 protected:      // New Methods
     virtual void setContentDir(const QDesktopServices::StandardLocation &location);
-    virtual void setIcon(const QString &icon);    
+    virtual void setIcon(const QString &icon);
     virtual void populateListWidget();
     virtual QString itemName(const QFileInfo &item);
     virtual QUrl itemUrl(QListWidgetItem *item);
     virtual void handleErrorInOpen(QListWidgetItem *item);
 protected:
-    void keyPressEvent(QKeyEvent *event);   
-    
+    void keyPressEvent(QKeyEvent *event);
+
 public slots:   // New Slots
-    virtual void openItem(QListWidgetItem *item);  
+    virtual void openItem(QListWidgetItem *item);
 
-protected:     // Owned variables   
+protected:     // Owned variables
     QDir m_ContentDir;
     QIcon m_Icon;
 };
 
 
-#endif // CONTENTTAB_H_    
+#endif // CONTENTTAB_H_
 
 // End of File
diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro
index 32cb6d9b09..32dfa40dd4 100644
--- a/demos/embedded/desktopservices/desktopservices.pro
+++ b/demos/embedded/desktopservices/desktopservices.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = 
+TARGET =
 INCLUDEPATH += .
 
 HEADERS += desktopwidget.h contenttab.h linktab.h
@@ -18,6 +18,6 @@ DEPLOYMENT += music image
 include($$QT_SOURCE_TREE/demos/demobase.pri)
 
 symbian {
-    TARGET.UID3 = 0xA000C611 
+    TARGET.UID3 = 0xA000C611
     ICON = ./resources/heart.svg
 }
diff --git a/demos/embedded/desktopservices/desktopservices.qrc b/demos/embedded/desktopservices/desktopservices.qrc
index d36205dec4..410175ff88 100644
--- a/demos/embedded/desktopservices/desktopservices.qrc
+++ b/demos/embedded/desktopservices/desktopservices.qrc
@@ -1,8 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">  
-    <file>resources/music.png</file>    
-    <file>resources/photo.png</file>    
-    <file>resources/browser.png</file>  
-    <file>resources/message.png</file>                          
+<qresource prefix="/">
+    <file>resources/music.png</file>
+    <file>resources/photo.png</file>
+    <file>resources/browser.png</file>
+    <file>resources/message.png</file>
 </qresource>
 </RCC>
diff --git a/demos/embedded/desktopservices/desktopwidget.cpp b/demos/embedded/desktopservices/desktopwidget.cpp
index 3abe591af2..f3c02dc1a2 100644
--- a/demos/embedded/desktopservices/desktopwidget.cpp
+++ b/demos/embedded/desktopservices/desktopwidget.cpp
@@ -51,40 +51,40 @@
 // CLASS HEADER
 #include "desktopwidget.h"
 
-// CONSTRUCTORS & DESTRUCTORS  
+// CONSTRUCTORS & DESTRUCTORS
 DesktopWidget::DesktopWidget(QWidget *parent) : QWidget(parent)
-    
+
 {
     QTabWidget *tabWidget = new QTabWidget(this);
 
     // Images
     ContentTab* imageTab = new ContentTab(tabWidget);
-    imageTab->init(QDesktopServices::PicturesLocation, 
+    imageTab->init(QDesktopServices::PicturesLocation,
                    "*.png;*.jpg;*.jpeg;*.bmp;*.gif",
                    ":/resources/photo.png");
-    tabWidget->addTab(imageTab, tr("Images")); 
-    
+    tabWidget->addTab(imageTab, tr("Images"));
+
     // Music
-    ContentTab* musicTab = new ContentTab(tabWidget);     
-    musicTab->init(QDesktopServices::MusicLocation, 
-                   "*.wav;*.mp3;*.mp4",        
-                   ":/resources/music.png");        
-    tabWidget->addTab(musicTab, tr("Music"));       
-    
+    ContentTab* musicTab = new ContentTab(tabWidget);
+    musicTab->init(QDesktopServices::MusicLocation,
+                   "*.wav;*.mp3;*.mp4",
+                   ":/resources/music.png");
+    tabWidget->addTab(musicTab, tr("Music"));
+
     // Links
-    LinkTab* othersTab = new LinkTab(tabWidget);;   
+    LinkTab* othersTab = new LinkTab(tabWidget);;
     // Given icon file will be overriden by LinkTab
-    othersTab->init(QDesktopServices::PicturesLocation, "", "");    
-    tabWidget->addTab(othersTab, tr("Links"));       
-    
+    othersTab->init(QDesktopServices::PicturesLocation, "", "");
+    tabWidget->addTab(othersTab, tr("Links"));
+
     // Layout
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(tabWidget);
-    setLayout(layout);     
+    setLayout(layout);
 }
-      
+
 DesktopWidget::~DesktopWidget()
 {
 }
-    
+
 // End of file
diff --git a/demos/embedded/desktopservices/desktopwidget.h b/demos/embedded/desktopservices/desktopwidget.h
index 246ab18584..6b0af79203 100644
--- a/demos/embedded/desktopservices/desktopwidget.h
+++ b/demos/embedded/desktopservices/desktopwidget.h
@@ -55,19 +55,19 @@ QT_END_NAMESPACE
 // CLASS DECLARATION
 /**
 * DesktopWidget class.
-* 
+*
 * Implements the main top level widget for QDesktopServices demo app.
 */
 class DesktopWidget : public QWidget
 {
-    Q_OBJECT        
-        
-public:        // Constructors & Destructors  
+    Q_OBJECT
+
+public:        // Constructors & Destructors
     DesktopWidget(QWidget *parent);
     ~DesktopWidget();
-   
+
 };
-    
-#endif // DESKTOPWIDGET_H_    
-    
+
+#endif // DESKTOPWIDGET_H_
+
 // End of file
diff --git a/demos/embedded/desktopservices/linktab.h b/demos/embedded/desktopservices/linktab.h
index a9c986804c..e44b7859d6 100644
--- a/demos/embedded/desktopservices/linktab.h
+++ b/demos/embedded/desktopservices/linktab.h
@@ -57,30 +57,30 @@ QT_END_NAMESPACE
 
 /**
 * LinkTab class.
-* 
+*
 * This class implements tab for opening http and mailto links.
 */
 class LinkTab : public ContentTab
 {
     Q_OBJECT
-    
-public:     // Constructors & Destructors   
+
+public:     // Constructors & Destructors
     LinkTab(QWidget *parent);
-    ~LinkTab();    
-    
-protected:  // Derived Methods  
+    ~LinkTab();
+
+protected:  // Derived Methods
     virtual void populateListWidget();
-    virtual QUrl itemUrl(QListWidgetItem *item);    
+    virtual QUrl itemUrl(QListWidgetItem *item);
     virtual void handleErrorInOpen(QListWidgetItem *item);
-    
-private:    // Used variables  
+
+private:    // Used variables
     QListWidgetItem *m_WebItem;
-    QListWidgetItem *m_MailToItem; 
-    
-private:    // Owned variables      
-    
+    QListWidgetItem *m_MailToItem;
+
+private:    // Owned variables
+
 };
 
-#endif // CONTENTTAB_H_    
-    
+#endif // CONTENTTAB_H_
+
 // End of File
diff --git a/demos/embedded/desktopservices/main.cpp b/demos/embedded/desktopservices/main.cpp
index ebbcf6312d..0abfc78f73 100644
--- a/demos/embedded/desktopservices/main.cpp
+++ b/demos/embedded/desktopservices/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 
     QApplication app(argc, argv);
     DesktopWidget* myWidget = new DesktopWidget(0);
-    myWidget->showMaximized(); 
-    
+    myWidget->showMaximized();
+
     return app.exec();
 }
 
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 25904ef6eb..a5e3465fc7 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/embedded
 INSTALLS += sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
index 51a04e7c5d..3ce2fbf649 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -9,7 +9,7 @@ RESOURCES += embeddedsvgviewer.qrc
 target.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
 sources.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
-INSTALLS += target sources 
+INSTALLS += target sources
 
 wince* {
    DEPLOYMENT_PLUGIN += qsvg
@@ -18,4 +18,3 @@ wince* {
 include($$QT_SOURCE_TREE/demos/demobase.pri)
 
 symbian:TARGET.UID3 = 0xA000A640
-
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index f6bac67b26..95e96bdc10 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -13,7 +13,7 @@
     <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/>
     <example filename="drilldown" name="Drilldown" image="screenshots/drilldown_s60.png"/>
     <example filename="softkeys" name="Softkeys" image="screenshots/softkeys_s60.png"/>
-    <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/>    
+    <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
     <imagedir dir="slides"/>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 0d83945e2a..3eff37b008 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = 
+TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
@@ -55,9 +55,9 @@ wince*{
     DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
 }
 
-symbian {                    
+symbian {
     load(data_caging_paths)
-    
+
     TARGET.UID3 = 0xA000A641
 
     executables.sources = \
@@ -73,7 +73,7 @@ symbian {
         fridgemagnets.exe \
         drilldown.exe \
         softkeys.exe
-    contains(QT_CONFIG, webkit) {        
+    contains(QT_CONFIG, webkit) {
         executables.sources += anomaly.exe
         }
 
@@ -92,9 +92,9 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
-    contains(QT_CONFIG, webkit) {        
+    contains(QT_CONFIG, webkit) {
         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
-        }                
+        }
 
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
@@ -111,9 +111,9 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
-    contains(QT_CONFIG, webkit) {        
+    contains(QT_CONFIG, webkit) {
         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
-        }           
+        }
 
     resource.path = $$APP_RESOURCE_DIR
 
@@ -134,9 +134,9 @@ symbian {
         $$PWD/../desktopservices/data/*.mp3 \
         $$PWD/../desktopservices/data/*.wav
     desktopservices_music.path = /data/sounds
-    
+
     desktopservices_images.sources = $$PWD/../desktopservices/data/*.png
-    desktopservices_images.path = /data/images    
+    desktopservices_images.path = /data/images
 
     saxbookmarks.sources = $$PWD/../../../examples/xml/saxbookmarks/frank.xbel
     saxbookmarks.sources += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel