From e14e2ce1375108725a1249285ba76ab6cbcd1328 Mon Sep 17 00:00:00 2001 From: Jakub Jaszczynski Date: Mon, 23 Aug 2010 14:23:19 +0200 Subject: [PATCH] add "this" when create Qt obiect. --- trunk/src/base/gui/AboutWidget.cpp | 12 ++++++------ trunk/src/base/gui/BookmarksWidget.cpp | 6 +++--- trunk/src/base/gui/DictManagerWidget.cpp | 14 +++++++------- trunk/src/base/gui/DictTypeSelectDialog.cpp | 4 ++-- trunk/src/base/gui/HistoryListDialog.cpp | 4 ++-- trunk/src/base/gui/MainWindow.cpp | 12 ++++++------ trunk/src/base/gui/MenuWidget.cpp | 2 +- trunk/src/base/gui/SearchBarWidget.cpp | 20 ++++++++++---------- trunk/src/base/gui/SettingsWidget.cpp | 14 +++++++------- trunk/src/base/gui/TranslationWidget.cpp | 9 ++------- trunk/src/includes/settings.h | 2 ++ trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp | 6 +++--- trunk/src/plugins/xdxf/src/XdxfDictDialog.h | 1 - trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp | 14 +++++++------- trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp | 21 +++++++++++---------- 15 files changed, 69 insertions(+), 72 deletions(-) diff --git a/trunk/src/base/gui/AboutWidget.cpp b/trunk/src/base/gui/AboutWidget.cpp index d2edb32..c77d58b 100644 --- a/trunk/src/base/gui/AboutWidget.cpp +++ b/trunk/src/base/gui/AboutWidget.cpp @@ -22,19 +22,19 @@ AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent) QString("

"); setWindowTitle(tr("About")); - mainLayout = new QVBoxLayout; + mainLayout = new QVBoxLayout(this); #ifndef Q_WS_MAEMO_5 - scrollLayout = new QVBoxLayout; - scroll = new QScrollArea; + scrollLayout = new QVBoxLayout(this); + scroll = new QScrollArea(this); w = new QWidget(this); #endif - imageLabel = new QLabel; - mainLabel = new QLabel; - licenseLabel = new QLabel; + imageLabel = new QLabel(this); + mainLabel = new QLabel(this); + licenseLabel = new QLabel(this); QImage img(":/icons/logo/mdictionary.png"); diff --git a/trunk/src/base/gui/BookmarksWidget.cpp b/trunk/src/base/gui/BookmarksWidget.cpp index 047bad7..438edac 100644 --- a/trunk/src/base/gui/BookmarksWidget.cpp +++ b/trunk/src/base/gui/BookmarksWidget.cpp @@ -30,12 +30,12 @@ BookmarksWidget::BookmarksWidget(GUIInterface *parent) : { setWindowTitle(tr("Bookmarks")); - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); - showAllBookmarksPushButton = new QPushButton(tr("Show all bookmarks")); + showAllBookmarksPushButton = new QPushButton(tr("Show all bookmarks"),this); removeAllBookmarksPushButton = - new QPushButton(tr("Remove all bookmarks")); + new QPushButton(tr("Remove all bookmarks"),this); verticalLayout->addWidget(showAllBookmarksPushButton); verticalLayout->addWidget(removeAllBookmarksPushButton); diff --git a/trunk/src/base/gui/DictManagerWidget.cpp b/trunk/src/base/gui/DictManagerWidget.cpp index 6209364..f11d5ed 100644 --- a/trunk/src/base/gui/DictManagerWidget.cpp +++ b/trunk/src/base/gui/DictManagerWidget.cpp @@ -36,23 +36,23 @@ DictManagerWidget::DictManagerWidget(GUIInterface *parent) : setWindowTitle(tr("Dictionaries")); this->guiInterface = parent; - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); - dictListWidget = new QListWidget; + dictListWidget = new QListWidget(this); verticalLayout->addWidget(dictListWidget); dictListWidget->setSelectionMode(QAbstractItemView::SingleSelection); dictListWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - addNewDictButton = new QPushButton(tr("Add")); - removeDictButton = new QPushButton(tr("Remove")); - settingsButton = new QPushButton(tr("Settings")); + addNewDictButton = new QPushButton(tr("Add"),this); + removeDictButton = new QPushButton(tr("Remove"),this); + settingsButton = new QPushButton(tr("Settings"),this); removeDictButton->setEnabled(false); settingsButton->setEnabled(false); - buttonGroup = new QHBoxLayout; + buttonGroup = new QHBoxLayout(this); buttonGroup->addWidget(addNewDictButton); buttonGroup->addWidget(removeDictButton); @@ -94,7 +94,7 @@ void DictManagerWidget::refreshDictsList() { while(i.hasNext()) { i.next(); - QListWidgetItem* item = new QListWidgetItem; + QListWidgetItem* item = new QListWidgetItem(); QString name = i.key()->langFrom() + " - " + i.key()->langTo() + " (" + i.key()->type() + " " + i.key()->name() + ")"; item->setText(name); diff --git a/trunk/src/base/gui/DictTypeSelectDialog.cpp b/trunk/src/base/gui/DictTypeSelectDialog.cpp index 6b28fc4..4d0e317 100644 --- a/trunk/src/base/gui/DictTypeSelectDialog.cpp +++ b/trunk/src/base/gui/DictTypeSelectDialog.cpp @@ -30,10 +30,10 @@ DictTypeSelectDialog::DictTypeSelectDialog(QList plugins, this->plugins = plugins; - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); - pluginsListWidget = new QListWidget; + pluginsListWidget = new QListWidget(this); verticalLayout->addWidget(pluginsListWidget); diff --git a/trunk/src/base/gui/HistoryListDialog.cpp b/trunk/src/base/gui/HistoryListDialog.cpp index 97c5ce9..8905578 100644 --- a/trunk/src/base/gui/HistoryListDialog.cpp +++ b/trunk/src/base/gui/HistoryListDialog.cpp @@ -26,12 +26,12 @@ HistoryListDialog::HistoryListDialog(QStringList words, QWidget *parent): QDialog(parent) { - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); oryginalList = words; - historyListWidget = new QListWidget; + historyListWidget = new QListWidget(this); verticalLayout->addWidget(historyListWidget); for(int i=0; isetLayout(mainLayout); setCentralWidget(w); - menuBar = new QMenuBar; + menuBar = new QMenuBar(this); setMenuBar(menuBar); - searchBarWidget = new SearchBarWidget; + searchBarWidget = new SearchBarWidget(this); - wordListWidget = new WordListWidget; + wordListWidget = new WordListWidget(this); - welcomeScreenWidget = new WelcomeScreenWidget; + welcomeScreenWidget = new WelcomeScreenWidget(this); #ifdef Q_WS_MAEMO_5 diff --git a/trunk/src/base/gui/MenuWidget.cpp b/trunk/src/base/gui/MenuWidget.cpp index fa6210b..7dd6475 100644 --- a/trunk/src/base/gui/MenuWidget.cpp +++ b/trunk/src/base/gui/MenuWidget.cpp @@ -29,7 +29,7 @@ MenuWidget::MenuWidget(QWidget *parent) : QWidgetAction(parent) { //creating custom tab widget, and sets style sheet to have centered tabs - tabWidget = new MenuTabWidget(); + tabWidget = new MenuTabWidget(this); tabWidget->setStyleSheet("QTabWidget::tab-bar {alignment: center;}"); } diff --git a/trunk/src/base/gui/SearchBarWidget.cpp b/trunk/src/base/gui/SearchBarWidget.cpp index 60fd4e6..cc4e6c8 100644 --- a/trunk/src/base/gui/SearchBarWidget.cpp +++ b/trunk/src/base/gui/SearchBarWidget.cpp @@ -105,15 +105,15 @@ void SearchBarWidget::initializeUI() { #endif - horizontalLayout = new QHBoxLayout(); - verticalLayout = new QVBoxLayout(); + horizontalLayout = new QHBoxLayout(this); + verticalLayout = new QVBoxLayout(this); - searchPushButton = new QPushButton(tr("Search")); + searchPushButton = new QPushButton(tr("Search"),this); searchPushButton->setMinimumWidth(125); - searchWordLineEdit = new QLineEdit(); + searchWordLineEdit = new QLineEdit(this); searchWordLineEdit->setMinimumWidth(250); #ifndef Q_WS_MAEMO_5 @@ -123,11 +123,11 @@ void SearchBarWidget::initializeUI() { //create layout for lineEdit to have clear button on it - QHBoxLayout* lineEditLayout = new QHBoxLayout; + QHBoxLayout* lineEditLayout = new QHBoxLayout(this); searchWordLineEdit->setLayout(lineEditLayout); - clearSearchWordToolButton = new QToolButton(); + clearSearchWordToolButton = new QToolButton(this); #ifdef Q_WS_MAEMO_5 clearSearchWordToolButton->setIcon(QIcon::fromTheme("general_stop")); //tool buttons will have size 2 times smaller @@ -142,7 +142,7 @@ void SearchBarWidget::initializeUI() { #endif - historyNextToolButton = new QToolButton(); + historyNextToolButton = new QToolButton(this); #ifdef Q_WS_MAEMO_5 historyNextToolButton->setIcon( generateIcon(QIcon::fromTheme("general_forward"))); @@ -153,7 +153,7 @@ void SearchBarWidget::initializeUI() { - historyPrevToolButton = new QToolButton(); + historyPrevToolButton = new QToolButton(this); #ifdef Q_WS_MAEMO_5 historyPrevToolButton->setIcon( generateIcon(QIcon::fromTheme("general_back"))); @@ -164,7 +164,7 @@ void SearchBarWidget::initializeUI() { - historyShowToolButton = new QToolButton(); + historyShowToolButton = new QToolButton(this); #ifdef Q_WS_MAEMO_5 historyShowToolButton->setIcon( generateIcon(QIcon::fromTheme("general_back"), 90)); @@ -186,7 +186,7 @@ void SearchBarWidget::initializeUI() { #endif*/ - searchingProgressBar = new QProgressBar(); + searchingProgressBar = new QProgressBar(this); //progress bar have minimum and maximum values set to 0, which will effect //with "I'm alive" bar searchingProgressBar->setMinimum(0); diff --git a/trunk/src/base/gui/SettingsWidget.cpp b/trunk/src/base/gui/SettingsWidget.cpp index 2d72d99..4cf721d 100644 --- a/trunk/src/base/gui/SettingsWidget.cpp +++ b/trunk/src/base/gui/SettingsWidget.cpp @@ -31,13 +31,13 @@ SettingsWidget::SettingsWidget(GUIInterface *parent) : setWindowTitle(tr("Settings")); - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); - historySizeSpinBox = new QSpinBox; - searchResultSizeSpinBox = new QSpinBox; + historySizeSpinBox = new QSpinBox(this); + searchResultSizeSpinBox = new QSpinBox(this); - spinBoxesFormLayout = new QFormLayout; + spinBoxesFormLayout = new QFormLayout(this); spinBoxesFormLayout->addRow(tr("Search result size"), searchResultSizeSpinBox); @@ -54,10 +54,10 @@ SettingsWidget::SettingsWidget(GUIInterface *parent) : verticalLayout->addLayout(spinBoxesFormLayout); - checkBoxesLabel = new QLabel(tr("Search in:")); + checkBoxesLabel = new QLabel(tr("Search in:"),this); - searchInBookmarksCheckBox = new QCheckBox(tr("Bookmarks")); - searchInDictionariesCheckBox = new QCheckBox(tr("Dictionaries")); + searchInBookmarksCheckBox = new QCheckBox(tr("Bookmarks"),this); + searchInDictionariesCheckBox = new QCheckBox(tr("Dictionaries"),this); verticalLayout->addSpacing(20); verticalLayout->addWidget(checkBoxesLabel); diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp index deaec70..f62ffda 100644 --- a/trunk/src/base/gui/TranslationWidget.cpp +++ b/trunk/src/base/gui/TranslationWidget.cpp @@ -78,16 +78,11 @@ void TranslationWidget::show(QStringList translations) { trans=tr("") + tr("\n ") + trans + tr("\n "); trans=XslConversion(trans); -// textEdit->setDocument(document); textEdit->insertHtml(trans); -// textEdit->append(""); - // textEdit->textCursor().insertImage("starimage"); - // textEdit->setPlainText(trans); textEdit->repaint(this->rect()); - update(this->rect()); emit updateSize(); @@ -202,14 +197,14 @@ void TranslationWidget::initButtons() { void TranslationWidget::initializeUI() { - textEdit = new TranslationTextEdit; + textEdit = new TranslationTextEdit(this); textEdit->setReadOnly(true); resizer = new TranslationWidgetAutoResizer(textEdit); connect(this, SIGNAL(updateSize()), resizer, SLOT(textEditChanged())); - QWidget*w = new QWidget; + QWidget*w = new QWidget(this); verticalLayout = new QVBoxLayout(w); verticalLayout->addWidget(textEdit); diff --git a/trunk/src/includes/settings.h b/trunk/src/includes/settings.h index a6faba7..c50136a 100644 --- a/trunk/src/includes/settings.h +++ b/trunk/src/includes/settings.h @@ -31,6 +31,7 @@ #include #include #include "CommonDictInterface.h" +#include class CommonDictInterface; @@ -45,6 +46,7 @@ class Settings { Settings(const Settings* set) { _settings = QHash(set->_settings); } + ~Settings(){} /*! \returns value fo given key \param key diff --git a/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp index 8cb8e45..604ee03 100644 --- a/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp @@ -35,15 +35,15 @@ XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) : setLayout(verticalLayout); setWindowTitle(tr("Caching dictionary, please wait")); - cachingProgressBar = new QProgressBar; + cachingProgressBar = new QProgressBar(this); cachingProgressBar->setMinimum(0); cachingProgressBar->setMaximum(100); cachingProgressBar->setTextVisible(true); - cancelButton = new QPushButton(tr("Cancel")); + cancelButton = new QPushButton(tr("Cancel"),this); - cachingLabel = new QLabel(); + cachingLabel = new QLabel(this); cachingLabel->hide(); diff --git a/trunk/src/plugins/xdxf/src/XdxfDictDialog.h b/trunk/src/plugins/xdxf/src/XdxfDictDialog.h index f822b2e..ac83859 100644 --- a/trunk/src/plugins/xdxf/src/XdxfDictDialog.h +++ b/trunk/src/plugins/xdxf/src/XdxfDictDialog.h @@ -36,7 +36,6 @@ class XdxfDictDialog : public DictDialog { Q_OBJECT public: explicit XdxfDictDialog(XdxfPlugin* plugin, QObject *parent = 0); - /*! Shows add new xdxf dictionary dialog and returns settings of new dict \param parent parent widget on which will be displayed dialog diff --git a/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp index 2cf4a00..8b4a039 100644 --- a/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp @@ -27,29 +27,29 @@ XdxfLoadDialog::XdxfLoadDialog(QWidget *parent) : QDialog(parent) { - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); setWindowTitle(tr("Add new XDXF dictionary")); - browseLayout = new QHBoxLayout; + browseLayout = new QHBoxLayout(this); verticalLayout->addLayout(browseLayout); - browseButton = new QPushButton(tr("Browse")); - browseLabel = new QLabel(tr("Dictionary file: not selected")); + browseButton = new QPushButton(tr("Browse"),this); + browseLabel = new QLabel(tr("Dictionary file: not selected"),this); browseLayout->addWidget(browseLabel); browseLayout->addWidget(browseButton,0, Qt::AlignRight); - cacheLayout = new QHBoxLayout; + cacheLayout = new QHBoxLayout(this); verticalLayout->addLayout(cacheLayout); - cacheCheckBox = new QCheckBox(tr("Optimize for quicker searches (may take some time)")); + cacheCheckBox = new QCheckBox(tr("Optimize for quicker searches (may take some time)"),this); cacheCheckBox->setChecked(true); cacheLayout->addWidget(cacheCheckBox); - addButton = new QPushButton(tr("Add")); + addButton = new QPushButton(tr("Add"),this); verticalLayout->addWidget(addButton); diff --git a/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp index 26e0176..9b6d991 100644 --- a/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp @@ -30,13 +30,13 @@ XdxfSettingsDialog::XdxfSettingsDialog(XdxfPlugin *plugin, QWidget *parent) : QDialog(parent) { this->plugin = plugin; - verticalLayout = new QVBoxLayout; + verticalLayout = new QVBoxLayout(this); setLayout(verticalLayout); setWindowTitle(tr("XDXF Settings")); - infoLabel = new QLabel; + infoLabel = new QLabel(this); infoLabel->setText(tr("Plugin type: ") + plugin->type() +"\n" + tr("From: ") + plugin->langFrom() + "\n" + @@ -45,21 +45,21 @@ XdxfSettingsDialog::XdxfSettingsDialog(XdxfPlugin *plugin, QWidget *parent) : verticalLayout->addWidget(infoLabel); - browseLayout = new QHBoxLayout; + browseLayout = new QHBoxLayout(this); verticalLayout->addLayout(browseLayout); - browseButton = new QPushButton(tr("Browse")); + browseButton = new QPushButton(tr("Browse"),this); browseLabel = new QLabel(tr("Dictionary file: ") + - plugin->settings()->value("path")); + plugin->settings()->value("path"),this); browseLayout->addWidget(browseLabel); browseLayout->addWidget(browseButton,0, Qt::AlignRight); - cacheLayout = new QHBoxLayout; + cacheLayout = new QHBoxLayout(this); verticalLayout->addLayout(cacheLayout); - cacheCheckBox = new QCheckBox(tr("Cached")); + cacheCheckBox = new QCheckBox(tr("Cached"),this); if(plugin->settings()->value("cached") == "true") { cacheCheckBox->setChecked(true); _generateCache = true; @@ -71,7 +71,7 @@ XdxfSettingsDialog::XdxfSettingsDialog(XdxfPlugin *plugin, QWidget *parent) : cacheLayout->addWidget(cacheCheckBox); - saveButton = new QPushButton(tr("Save settings")); + saveButton = new QPushButton(tr("Save settings"),this); verticalLayout->addWidget(saveButton); @@ -133,10 +133,11 @@ Settings* XdxfSettingsDialog::getSettings(XdxfPlugin *plugin, settings->setValue("generateCache", "false"); } plugin->setSettings(settings); - return NULL; + delete settings; + return 0; } - return NULL; + return 0; } -- 1.7.9.5