summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorEspen Riskedal <espenr@trolltech.com>2009-06-22 09:21:38 (GMT)
committerEspen Riskedal <espenr@trolltech.com>2009-06-22 09:21:38 (GMT)
commit72f4849e17417a6854dbeccbf7a94809283eaa46 (patch)
treebdb551214a2daca38f7d94e0cf36a6c5f5516a0e /demos
parentbe49dfa4f3ed9111731d9503061882ac70b89e71 (diff)
parent2d4d17eda8a172ab3839997b44d9fc952292eb94 (diff)
downloadQt-72f4849e17417a6854dbeccbf7a94809283eaa46.zip
Qt-72f4849e17417a6854dbeccbf7a94809283eaa46.tar.gz
Qt-72f4849e17417a6854dbeccbf7a94809283eaa46.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'demos')
-rw-r--r--demos/embedded/desktopservices/linktab.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/demos/embedded/desktopservices/linktab.cpp b/demos/embedded/desktopservices/linktab.cpp
index 58d1cc6..32411fe 100644
--- a/demos/embedded/desktopservices/linktab.cpp
+++ b/demos/embedded/desktopservices/linktab.cpp
@@ -49,19 +49,19 @@
// CLASS HEADER
#include "linktab.h"
-LinkTab::LinkTab(QWidget *parent) :
+LinkTab::LinkTab(QWidget *parent) :
ContentTab(parent)
-{
+{
}
-
-LinkTab::~LinkTab()
+
+LinkTab::~LinkTab()
{
}
void LinkTab::populateListWidget()
{
m_WebItem = new QListWidgetItem(QIcon(":/resources/browser.png"), tr("Launch Browser"), this);
- m_MailToItem = new QListWidgetItem(QIcon(":/resources/message.png"), tr("New e-mail"), this);
+ m_MailToItem = new QListWidgetItem(QIcon(":/resources/message.png"), tr("New e-mail"), this);
}
QUrl LinkTab::itemUrl(QListWidgetItem *item)
@@ -78,8 +78,8 @@ QUrl LinkTab::itemUrl(QListWidgetItem *item)
}
void LinkTab::handleErrorInOpen(QListWidgetItem *item)
{
- if(m_MailToItem == item) {
- QMessageBox::warning( this, tr("Operation Failed"), tr("Please check that you have\ne-mail accunt defined"), QMessageBox::Close);
+ if(m_MailToItem == item) {
+ QMessageBox::warning( this, tr("Operation Failed"), tr("Please check that you have\ne-mail account defined."), QMessageBox::Close);
} else {
ContentTab::handleErrorInOpen(item);
}