diff options
author | Chris Skluzacek <cskludev@gmail.com> | 2010-07-23 22:04:37 +0300 |
---|---|---|
committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-08-06 15:25:52 +0300 |
commit | 00052ecfcff505446a246013d514fae4173e1c8c (patch) | |
tree | 90b9424c326d35598be322309b6eabb267a959ea /demos/widgetsgallery | |
parent | bf971e724cc7f87da5cc6dcd92969d021f77c8d7 (diff) |
Fixes: NB#167386, Many classes in WidgetGallery have uninitialized members
RevBy: Dénes Dezsö
Details: Ensure that all member variables are initialized properly. Also
fix some issues with pointers and other minor miscellaneous items.
Diffstat (limited to 'demos/widgetsgallery')
28 files changed, 147 insertions, 51 deletions
diff --git a/demos/widgetsgallery/bannerspage.cpp b/demos/widgetsgallery/bannerspage.cpp index e11da132..b19b5ec0 100644 --- a/demos/widgetsgallery/bannerspage.cpp +++ b/demos/widgetsgallery/bannerspage.cpp @@ -61,7 +61,8 @@ public: BannersPage::BannersPage() : TemplatePage(TemplatePage::DialogsAndBanners), policy(0), - list(0) + list(0), + banner(0) { } diff --git a/demos/widgetsgallery/bubblelistmodel.cpp b/demos/widgetsgallery/bubblelistmodel.cpp index 69430197..78808f20 100644 --- a/demos/widgetsgallery/bubblelistmodel.cpp +++ b/demos/widgetsgallery/bubblelistmodel.cpp @@ -24,7 +24,8 @@ #include <QDir> BubbleListModel::BubbleListModel( QObject* parent ) - : QAbstractListModel(parent) + : QAbstractListModel(parent), + chatMessages() { QString avatar_1(QDir(CONTACTS_DIR).canonicalPath() + QDir::separator() +"avatar-jets.png"); diff --git a/demos/widgetsgallery/bubblepage.cpp b/demos/widgetsgallery/bubblepage.cpp index 6d835e71..4ad23836 100644 --- a/demos/widgetsgallery/bubblepage.cpp +++ b/demos/widgetsgallery/bubblepage.cpp @@ -32,13 +32,7 @@ #include "bubblepage.h" #include "bubblelistmodel.h" -class BubbleItemCreator -{ -public: - MBubbleItem *createBubbleItem(const QModelIndex& index) const; -}; - -MBubbleItem *BubbleItemCreator::createBubbleItem(const QModelIndex& index) const +static MBubbleItem *createBubbleItem(const QModelIndex& index) { MBubbleItem* bi = new MBubbleItem; QVariant data = index.data(Qt::DisplayRole); @@ -57,7 +51,8 @@ MBubbleItem *BubbleItemCreator::createBubbleItem(const QModelIndex& index) const } BubblePage::BubblePage() - : TemplatePage(TemplatePage::ListsGridsAndPopups) + : TemplatePage(TemplatePage::ListsGridsAndPopups), + messageBox() { } @@ -73,12 +68,11 @@ void BubblePage::createContent() QGraphicsLinearLayout * layout = new QGraphicsLinearLayout(Qt::Vertical); panel->setLayout(layout); - BubbleItemCreator cellCreator; BubbleListModel * model = new BubbleListModel; for (int i = 0; i < model->rowCount(); ++i) { - MBubbleItem *item = cellCreator.createBubbleItem(model->index(i,0)); + MBubbleItem *item = createBubbleItem(model->index(i,0)); connect(item, SIGNAL(linkActivated(QString)), this, SLOT(bubbleLinkActivated(QString))); connect(item, SIGNAL(bubbleClicked()), this, SLOT(speechBubbleClicked())); layout->addItem(item); diff --git a/demos/widgetsgallery/buttongrouppage.cpp b/demos/widgetsgallery/buttongrouppage.cpp index b866a7c8..3722785b 100644 --- a/demos/widgetsgallery/buttongrouppage.cpp +++ b/demos/widgetsgallery/buttongrouppage.cpp @@ -38,6 +38,9 @@ ButtonGroupPage::ButtonGroupPage() : pushButton4(NULL), pushButton5(NULL), pushButton6(NULL), + pushButton7(NULL), + pushButton8(NULL), + pushButton9(NULL), hLabel1(NULL), hLabel2(NULL), vLabel(NULL) diff --git a/demos/widgetsgallery/comboboxpage.cpp b/demos/widgetsgallery/comboboxpage.cpp index 76151a7a..e8bddabb 100644 --- a/demos/widgetsgallery/comboboxpage.cpp +++ b/demos/widgetsgallery/comboboxpage.cpp @@ -34,7 +34,10 @@ ComboBoxPage::ComboBoxPage() : TemplatePage(TemplatePage::ListsGridsAndPopups), - model1(0), + comboBox1(0), + comboBox2(0), + comboBox3(0), + model1(0), proxyModel(0) { } diff --git a/demos/widgetsgallery/contentitemspage.cpp b/demos/widgetsgallery/contentitemspage.cpp index 62d93372..4c1ff585 100644 --- a/demos/widgetsgallery/contentitemspage.cpp +++ b/demos/widgetsgallery/contentitemspage.cpp @@ -277,7 +277,9 @@ private: }; ContentItemsPage::ContentItemsPage() - : TemplatePage(TemplatePage::ListsGridsAndPopups) + : TemplatePage(TemplatePage::ListsGridsAndPopups), + contentItemLists(), + policy(0) { } diff --git a/demos/widgetsgallery/displaymodespage.cpp b/demos/widgetsgallery/displaymodespage.cpp index 304fc547..9480340c 100644 --- a/demos/widgetsgallery/displaymodespage.cpp +++ b/demos/widgetsgallery/displaymodespage.cpp @@ -33,7 +33,16 @@ #include <QStringList> #include <QTimer> -DisplayModesPage::DisplayModesPage() : TemplatePage(TemplatePage::ApplicationView) +DisplayModesPage::DisplayModesPage() + : TemplatePage(TemplatePage::ApplicationView), + comboNavigationBarDisplayMode(0), + comboEscapeButtonDisplayMode(0), + comboHomeButtonDisplayMode(0), + lblDisplayMode(0), + lblWindowState(0), + checkboxFullScreen(0), + lblFullScreen(0), + fullScreenCheckboxLayout(0) { } diff --git a/demos/widgetsgallery/gridmodel.cpp b/demos/widgetsgallery/gridmodel.cpp index e0256d38..b6e13c53 100644 --- a/demos/widgetsgallery/gridmodel.cpp +++ b/demos/widgetsgallery/gridmodel.cpp @@ -24,7 +24,9 @@ #include "gridmodel.h" GridModel::GridModel(const QSize &size, const QString &dir) - : m_loader(new Loader(size)), m_dir(dir) + : QAbstractTableModel(), + m_loader(new Loader(size)), + m_dir(dir) { qRegisterMetaType<MediaType>("MediaType"); diff --git a/demos/widgetsgallery/gridmodel.h b/demos/widgetsgallery/gridmodel.h index 45c9fde4..68c63cf9 100644 --- a/demos/widgetsgallery/gridmodel.h +++ b/demos/widgetsgallery/gridmodel.h @@ -87,7 +87,8 @@ class Loader : public QThread { Q_OBJECT public: - explicit Loader (const QSize &s) : size(s), stopWork(false) { } + explicit Loader (const QSize &s) + : QThread(), mutex(), haveWork(), backlog(), size(s), stopWork(false) { } void pushImage(const QString &path, int index); void stop(); void scaleImage(QImage& image) const; diff --git a/demos/widgetsgallery/gridvideowidget.cpp b/demos/widgetsgallery/gridvideowidget.cpp index f9c71a04..57402034 100644 --- a/demos/widgetsgallery/gridvideowidget.cpp +++ b/demos/widgetsgallery/gridvideowidget.cpp @@ -24,7 +24,8 @@ #ifdef HAVE_GSTREAMER GridVideoWidget::GridVideoWidget(QGraphicsItem *parent) - : MVideoWidget(parent) + : MVideoWidget(parent), + m_id() { } diff --git a/demos/widgetsgallery/itemdetailpage.cpp b/demos/widgetsgallery/itemdetailpage.cpp index af6a790c..42bc7b8d 100644 --- a/demos/widgetsgallery/itemdetailpage.cpp +++ b/demos/widgetsgallery/itemdetailpage.cpp @@ -64,7 +64,9 @@ void MyVideoWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } MyVideoOverlayToolbar::MyVideoOverlayToolbar(QGraphicsItem *parent) - : MWidgetController(parent) + : MWidgetController(parent), + landscapePolicy(0), + portraitPolicy(0) { MLayout *layout = new MLayout(this); @@ -98,13 +100,30 @@ void MyVideoOverlayToolbar::addItem(QGraphicsLayoutItem* button) #endif ItemDetailPage::ItemDetailPage() : + TimedemoPage(), + layout(0), + policy(0), + slider(0), + button(0), image(0), + #ifdef HAVE_GSTREAMER video(0), + lContainer(0), + rContainer(0), + tContainer(0), + bContainer(0), #endif + hideAnimation(0), showAnimation(0), + + imageId(), + videoId(), + + inactivityTimer(), + scaleFactor(10.0), lastScaleFactor(1.0) { diff --git a/demos/widgetsgallery/maincategorypage.cpp b/demos/widgetsgallery/maincategorypage.cpp index dc3f23d1..a8113cd8 100644 --- a/demos/widgetsgallery/maincategorypage.cpp +++ b/demos/widgetsgallery/maincategorypage.cpp @@ -10,7 +10,9 @@ class WidgetsGalleryCategoryDataModel : public QAbstractListModel { public: WidgetsGalleryCategoryDataModel(QAbstractItemModel *parentModel, const QModelIndex &parentIndex) - : QAbstractListModel(), widgetsGalleryModel(parentModel), categoryIndex(parentIndex) { + : QAbstractListModel(), + widgetsGalleryModel(parentModel), + categoryIndex(parentIndex) { } @@ -37,7 +39,9 @@ private: class WidgetGalleryCellCreator : public MAbstractCellCreator<MBasicListItem> { public: - WidgetGalleryCellCreator() : MAbstractCellCreator<MBasicListItem>() { + WidgetGalleryCellCreator() + : MAbstractCellCreator<MBasicListItem>() + { } MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { @@ -63,7 +67,10 @@ public: }; MainCategoryPage::MainCategoryPage(QAbstractItemModel *demosDataModel, const QModelIndex &parentIndex) : - dataModel(new WidgetsGalleryCategoryDataModel(demosDataModel, parentIndex)) + TimedemoPage(), + dataModel(new WidgetsGalleryCategoryDataModel(demosDataModel, parentIndex)), + list(0), + policy(0) { } diff --git a/demos/widgetsgallery/mainpage.cpp b/demos/widgetsgallery/mainpage.cpp index 6464eecd..d7be7d9d 100644 --- a/demos/widgetsgallery/mainpage.cpp +++ b/demos/widgetsgallery/mainpage.cpp @@ -81,7 +81,13 @@ public: typedef QList<TemplatePage*> TemplatePageList; typedef QList<QString> TemplatePageNameList; public: - WidgetsGalleryDataModel() : QAbstractItemModel() { + WidgetsGalleryDataModel() + : QAbstractItemModel(), + categoryPageNames(), + categoryPages(), + galleryPages(), + galleryPageNames() + { //% "Application View" addCategory(qtTrId("xx_wg_categories_application_view"), new MainCategoryPage(this, createIndex(0,0))); //% "Application Menu" @@ -270,14 +276,17 @@ public: }; MainPage::MainPage(const QString &title) - : list(0), + : TimedemoPage(), + list(0), actionThemes(0), actionOrientation(0), actionToggleFPS(0), actionLanguage(0), shownPage(0), policy(0), - languageSettingsPage(0) + languageSettingsPage(0), + buttons(), + initialPageToShow() { setTitle(title); diff --git a/demos/widgetsgallery/mgridpage.cpp b/demos/widgetsgallery/mgridpage.cpp index c9600680..10b8eec2 100644 --- a/demos/widgetsgallery/mgridpage.cpp +++ b/demos/widgetsgallery/mgridpage.cpp @@ -49,6 +49,9 @@ class ContentItemCreator : public MAbstractCellCreator<MWidgetController> { public: ContentItemCreator(MGridPage* gridPage) + : MAbstractCellCreator<MWidgetController>(), + m_gridPage(0), + m_preferredSize() { m_gridPage = gridPage; } diff --git a/demos/widgetsgallery/mlistpage.cpp b/demos/widgetsgallery/mlistpage.cpp index 3015fca5..91d66e0b 100644 --- a/demos/widgetsgallery/mlistpage.cpp +++ b/demos/widgetsgallery/mlistpage.cpp @@ -64,6 +64,8 @@ MListPage::MListPage() actionAdvancedConfiguration(NULL), dialogAdvancedConfiguration(NULL), list(NULL), + cellCreator(NULL), + longTappedIndex(), currentSortingIndex(0), currentListModeIndex(0) { diff --git a/demos/widgetsgallery/panningbenchmark.cpp b/demos/widgetsgallery/panningbenchmark.cpp index 6566339d..c9872f78 100644 --- a/demos/widgetsgallery/panningbenchmark.cpp +++ b/demos/widgetsgallery/panningbenchmark.cpp @@ -18,7 +18,10 @@ namespace { PanningBenchmark::PanningBenchmark( MApplicationPage * applicationPage, Timedemo * timedemo, M::OrientationAngle targetOrientationAngle) : TimedemoBenchmark(applicationPage, timedemo), + pannableViewport(0), timingStarted(false), + formerPosition(), + timer(), targetOrientationAngle(targetOrientationAngle) { diff --git a/demos/widgetsgallery/phonebookmodel.cpp b/demos/widgetsgallery/phonebookmodel.cpp index 17c5d13b..da8cdb7f 100644 --- a/demos/widgetsgallery/phonebookmodel.cpp +++ b/demos/widgetsgallery/phonebookmodel.cpp @@ -29,7 +29,14 @@ #include <MSortFilterProxyModel> PhoneBookModel::PhoneBookModel() - : MAbstractItemModel() + : MAbstractItemModel(), + phoneBookEntries(), + namesList(), + imageIdList(), + defaultThumbnail(), + groups(), + groupsSize(), + itemGroupCache() { namesList = loadFakeNames(); imageIdList = loadFakeImageIds(); @@ -228,6 +235,8 @@ void PhoneBookModel::updateData(const QModelIndex &first, const QModelIndex &las } PhoneBookImageLoader::PhoneBookImageLoader() + : QObject(), + thumbnailLoadingJobs() { } diff --git a/demos/widgetsgallery/querydialogspage.cpp b/demos/widgetsgallery/querydialogspage.cpp index e734ba66..5dcb3fee 100644 --- a/demos/widgetsgallery/querydialogspage.cpp +++ b/demos/widgetsgallery/querydialogspage.cpp @@ -66,7 +66,8 @@ public: QueryDialogsPage::QueryDialogsPage() : TemplatePage(TemplatePage::DialogsAndBanners), policy(0), - list(0) + list(0), + dialog() { } diff --git a/demos/widgetsgallery/singleselectiondialogspage.cpp b/demos/widgetsgallery/singleselectiondialogspage.cpp index 4eb6b321..ebf47135 100644 --- a/demos/widgetsgallery/singleselectiondialogspage.cpp +++ b/demos/widgetsgallery/singleselectiondialogspage.cpp @@ -65,7 +65,10 @@ public: SingleSelectionDialogsPage::SingleSelectionDialogsPage() : TemplatePage(TemplatePage::DialogsAndBanners), policy(0), - list(0) + list(0), + dialog(), + nestedDialog(), + nestedMessageBox() { } diff --git a/demos/widgetsgallery/swaphook.cpp b/demos/widgetsgallery/swaphook.cpp index f44e50b6..ee758063 100644 --- a/demos/widgetsgallery/swaphook.cpp +++ b/demos/widgetsgallery/swaphook.cpp @@ -68,11 +68,13 @@ timestamp Clock::time() } SwapHookPrivate::SwapHookPrivate() : + QObject(), func(0), lib(0), lurk(false), lurkBegin(0), - firstTimestamp(true) + firstTimestamp(true), + stamps() { #ifdef EGL QString preload = qgetenv("LD_PRELOAD"); @@ -146,15 +148,14 @@ void SwapHookPrivate::frameFinished() { } } -SwapHook::SwapHook() : d(new SwapHookPrivate) +SwapHook::SwapHook() + : QObject(), + d(new SwapHookPrivate) { } SwapHook::~SwapHook() { - if(d) { - delete d; - } } SwapHook* SwapHook::instance() { @@ -172,7 +173,7 @@ void SwapHook::startLurking() if (!d->func) { // fallback to even filtering as swap buffer monitoring is not available - MApplication::activeWindow()->viewport()->installEventFilter(d); + MApplication::activeWindow()->viewport()->installEventFilter(d.data()); } d->stamps.clear(); @@ -187,7 +188,7 @@ void SwapHook::stopLurking() return; if (!d->func) { - MApplication::activeWindow()->viewport()->removeEventFilter(d); + MApplication::activeWindow()->viewport()->removeEventFilter(d.data()); } d->lurk = false; diff --git a/demos/widgetsgallery/swaphook.h b/demos/widgetsgallery/swaphook.h index 35320822..adf5059e 100644 --- a/demos/widgetsgallery/swaphook.h +++ b/demos/widgetsgallery/swaphook.h @@ -58,7 +58,7 @@ public slots: void stopLurking(); private: - SwapHookPrivate *d; + QScopedPointer<SwapHookPrivate> d; }; diff --git a/demos/widgetsgallery/templatepage.cpp b/demos/widgetsgallery/templatepage.cpp index 9a72d68d..c4b8c7c7 100644 --- a/demos/widgetsgallery/templatepage.cpp +++ b/demos/widgetsgallery/templatepage.cpp @@ -29,6 +29,7 @@ #include <MLocale> TemplatePage::TemplatePage(TemplatePage::Category category) : + TimedemoPage(), layout(0), landscapePolicy(0), portraitPolicy(0), container(0), separator(0), infoLabel(0), containerLayout(0), containerPolicy(0), pageCategory(category) diff --git a/demos/widgetsgallery/textentrypage.cpp b/demos/widgetsgallery/textentrypage.cpp index dfa249bd..8e89d8a0 100644 --- a/demos/widgetsgallery/textentrypage.cpp +++ b/demos/widgetsgallery/textentrypage.cpp @@ -258,6 +258,14 @@ bool CustomTextEdit::event(QEvent *event) TextEntryPage::TextEntryPage() : TemplatePage(TemplatePage::UserInput), + label0(), label1(), label2(), label3(), label4(), label5(), + label6(), label7(), label8(), label9(), label10(), + labelNoEcho(), labelEchoOnEdit(), labelDirectIM(), + labelCustomToolbar1(), labelCustomToolbar2(), + labelHeader1(), + button1(), button2(), + labels(), + Entries(), m_autoCapitalisation(true), m_errorCorrection(true), m_completer(new MCompleter) @@ -267,7 +275,6 @@ TextEntryPage::TextEntryPage() TextEntryPage::~TextEntryPage() { - delete m_completer; } QString TextEntryPage::timedemoTitle() @@ -480,7 +487,7 @@ void TextEntryPage::createContent() m_completer->setCharactersToTrim(QString("<>")); m_completer->setCharactersToTrimForCompletionPrefix(QString(" ")); m_completer->setAcceptMultipleEntries(true); - Entries.at(row)->setCompleter(m_completer); + Entries.at(row)->setCompleter(m_completer.data()); label8 = new MLabel(centralWidget()); label8->setWordWrap(true); diff --git a/demos/widgetsgallery/textentrypage.h b/demos/widgetsgallery/textentrypage.h index 54454e62..d1a04adf 100644 --- a/demos/widgetsgallery/textentrypage.h +++ b/demos/widgetsgallery/textentrypage.h @@ -98,7 +98,7 @@ private: bool m_autoCapitalisation; bool m_errorCorrection; - QPointer<MCompleter> m_completer; + QScopedPointer<MCompleter> m_completer; QPointer<CustomDirectIMWidget> directIMWidget; }; diff --git a/demos/widgetsgallery/timedemo.cpp b/demos/widgetsgallery/timedemo.cpp index 56b841d6..01f2d486 100644 --- a/demos/widgetsgallery/timedemo.cpp +++ b/demos/widgetsgallery/timedemo.cpp @@ -39,12 +39,20 @@ namespace } Timedemo::Timedemo(MainPage *mainPage, const QStringList& demoPageTitles) - : m_pFrontPage(mainPage) - , m_currentPageIndex(0) - , m_currentBenchmarkIndex(0) - , demoPageTitles(demoPageTitles) - , timingStarted(false) - , timingStopped(false) + : QObject(), + m_pFrontPage(mainPage), + benchmarkResults(), + allBenchmarks(), + m_currentPageIndex(0), + m_currentBenchmarkIndex(0), + demoPages(), + demoPageTitles(demoPageTitles), + m_beginFrameCount(0), + m_beginTime(), + m_csvFilename(), + framelogFilename(), + timingStarted(false), + timingStopped(false) { connect(m_pFrontPage, SIGNAL(appeared()), this, SLOT(showFirstPage())); } diff --git a/demos/widgetsgallery/timedemobenchmark.cpp b/demos/widgetsgallery/timedemobenchmark.cpp index 747ce84f..c4d0e090 100644 --- a/demos/widgetsgallery/timedemobenchmark.cpp +++ b/demos/widgetsgallery/timedemobenchmark.cpp @@ -4,9 +4,11 @@ #include <MApplicationPage> TimedemoBenchmark::TimedemoBenchmark(MApplicationPage *applicationPage, Timedemo *timedemo) - : applicationPage(applicationPage) - , timedemo(timedemo) - , _type("common") + : QObject(), + verifyAppearanceTimer(0), + applicationPage(applicationPage), + timedemo(timedemo), + _type("common") { verifyAppearanceTimer = new QTimer(this); connect(verifyAppearanceTimer, SIGNAL(timeout()), this, SLOT(terminateIfNotAppeared())); diff --git a/demos/widgetsgallery/timedemopage.cpp b/demos/widgetsgallery/timedemopage.cpp index 22b9fc3e..6fda3288 100644 --- a/demos/widgetsgallery/timedemopage.cpp +++ b/demos/widgetsgallery/timedemopage.cpp @@ -5,7 +5,8 @@ #include "panningbenchmark.h" TimedemoPage::TimedemoPage(QGraphicsItem *parent) - : MApplicationPage(parent) + : MApplicationPage(parent), + m_benchmarks() { } diff --git a/demos/widgetsgallery/toolbarpage.cpp b/demos/widgetsgallery/toolbarpage.cpp index 4ccafe0a..74725ac0 100644 --- a/demos/widgetsgallery/toolbarpage.cpp +++ b/demos/widgetsgallery/toolbarpage.cpp @@ -35,8 +35,11 @@ #include <QDebug> TestModel::TestModel(QObject *parent) - : QAbstractListModel(parent), mode(InitiatedCall) { - maxRowCount = 4; + : QAbstractListModel(parent), + mode(InitiatedCall), + maxRowCount(4), + listNames() +{ listNames << "Lauri" << "Santeri" << "Kaarle" << "imran" << "Iqbal" << "Jakub" << "Mihaly" << "Ilias" << "Antti" <<"Jani" << "Tomas" << "Denis"; } |