From 33ca3afe641f5cb46cda167f2c6700747ee0c06f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:08:27 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- src/bookmarkselector.cpp | 4 ++-- src/bookmarkssettingspage.cpp | 14 +++++++------- src/bookmarkssidebarpage.cpp | 2 +- src/detailsviewsettingspage.cpp | 6 +++--- src/dolphindetailsview.cpp | 26 +++++++++++++------------- src/dolphindetailsview.h | 4 ++-- src/dolphiniconsview.cpp | 2 +- src/dolphinstatusbar.cpp | 4 ++-- src/editbookmarkdialog.cpp | 6 +++--- src/generalsettingspage.cpp | 12 ++++++------ src/iconsviewsettingspage.cpp | 10 +++++----- src/infosidebarpage.cpp | 16 ++++++++-------- src/sidebars.cpp | 8 ++++---- src/sidebars.h | 4 ++-- src/statusbarmessagelabel.cpp | 2 +- src/statusbarspaceinfo.cpp | 2 +- src/urlbutton.cpp | 2 +- src/urlnavigator.cpp | 4 ++-- src/urlnavigatorbutton.cpp | 4 ++-- src/viewproperties.cpp | 2 +- src/viewpropertiesdialog.cpp | 4 ++-- 21 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp index 1e996a1..7272aac 100644 --- a/src/bookmarkselector.cpp +++ b/src/bookmarkselector.cpp @@ -132,7 +132,7 @@ void BookmarkSelector::drawButton(TQPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = tqcolorGroup().background(); + backgroundColor = colorGroup().background(); foregroundColor = KGlobalSettings::buttonTextColor(); } @@ -142,7 +142,7 @@ void BookmarkSelector::drawButton(TQPainter* painter) const bool isActive = (dolphin.activeView() == parentView); if (!isActive) { - TQColor dimmColor(tqcolorGroup().background()); + TQColor dimmColor(colorGroup().background()); foregroundColor = mixColors(foregroundColor, dimmColor); if (isHighlighted) { backgroundColor = mixColors(backgroundColor, dimmColor); diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp index adcb467..42c8973 100644 --- a/src/bookmarkssettingspage.cpp +++ b/src/bookmarkssettingspage.cpp @@ -49,9 +49,9 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : const int spacing = KDialog::spacingHint(); TQHBox* hBox = new TQHBox(parent); - hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); hBox->setSpacing(spacing); - hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); + hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); m_listView = new KListView(hBox); m_listView->addColumn(i18n("Icon")); @@ -76,27 +76,27 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : m_addButton = new KPushButton(i18n("Add..."), buttonBox); connect(m_addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddButtonClicked())); - m_addButton->tqsetSizePolicy(buttonSizePolicy); + m_addButton->setSizePolicy(buttonSizePolicy); m_editButton = new KPushButton(i18n("Edit..."), buttonBox); connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditButtonClicked())); - m_editButton->tqsetSizePolicy(buttonSizePolicy); + m_editButton->setSizePolicy(buttonSizePolicy); m_removeButton = new KPushButton(i18n("Remove"), buttonBox); connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveButtonClicked())); - m_removeButton->tqsetSizePolicy(buttonSizePolicy); + m_removeButton->setSizePolicy(buttonSizePolicy); m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox); connect(m_moveUpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUpButtonClicked())); - m_moveUpButton->tqsetSizePolicy(buttonSizePolicy); + m_moveUpButton->setSizePolicy(buttonSizePolicy); m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox); connect(m_moveDownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownButtonClicked())); - m_moveDownButton->tqsetSizePolicy(buttonSizePolicy); + m_moveDownButton->setSizePolicy(buttonSizePolicy); // Add a dummy widget with no restriction regarding a vertical resizing. // This assures that the spacing between the buttons is not increased. diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index af39d7e..c5f0408 100644 --- a/src/bookmarkssidebarpage.cpp +++ b/src/bookmarkssidebarpage.cpp @@ -40,7 +40,7 @@ BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) : { TQVBoxLayout* tqlayout = new TQVBoxLayout(this); m_bookmarksList = new BookmarksListBox(this); - m_bookmarksList->setPaletteBackgroundColor(tqcolorGroup().background()); + m_bookmarksList->setPaletteBackgroundColor(colorGroup().background()); tqlayout->addWidget(m_bookmarksList); connect(m_bookmarksList, TQT_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)), diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index 6aa4855..e4d0953 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -58,7 +58,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : // create "Columns" properties TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this); - columnsGroup->tqsetSizePolicy(sizePolicy); + columnsGroup->setSizePolicy(sizePolicy); columnsGroup->setMargin(margin); TQHBox* visibleColumnsLayout = new TQHBox(columnsGroup); @@ -76,7 +76,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : // Create "Icon" properties TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this); - iconSizeGroup->tqsetSizePolicy(sizePolicy); + iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup); m_mediumIconSize = new TQRadioButton(i18n("Medium"), iconSizeGroup); @@ -103,7 +103,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : // create "Text" properties TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); - textGroup->tqsetSizePolicy(sizePolicy); + textGroup->setSizePolicy(sizePolicy); textGroup->setMargin(margin); new TQLabel(i18n("Font family:"), textGroup); diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 03282fb..816deb1 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -441,7 +441,7 @@ void DolphinDetailsView::paintEmptyArea(TQPainter* painter, const TQRect& rect) KFileDetailView::paintEmptyArea(painter, rect); } else { - const TQBrush brush(tqcolorGroup().background()); + const TQBrush brush(colorGroup().background()); painter->fillRect(rect, brush); } } @@ -467,7 +467,7 @@ void DolphinDetailsView::drawRubber() point = contentsToViewport(point); tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()), - tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base()); + colorGroup(), TQStyle::Style_Default, colorGroup().base()); p.end(); } @@ -553,7 +553,7 @@ void DolphinDetailsView::slotAutoScroll() // select all items which intersect with the rubber, deselect all others bool bottomReached = false; while ((item != 0) && !bottomReached) { - TQRect rect(tqitemRect(item)); + TQRect rect(itemRect(item)); rect.setWidth(filenameWidth(item)); rect = TQRect(viewportToContents(rect.topLeft()), viewportToContents(rect.bottomRight())); @@ -710,7 +710,7 @@ DolphinDetailsView::DolphinListViewItem::~DolphinListViewItem() } void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, int column, int cellWidth, int tqalignment) @@ -721,10 +721,10 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, // Per default the selection is drawn above the whole width of the item. As a consistent // behavior with the icon view is wanted, only the the column containing the file name // should be shown as selected. - TQColorGroup defaultColorGroup(tqcolorGroup); - const TQColor highlightColor(isActive ? backgroundColor(column) : view->tqcolorGroup().background()); + TQColorGroup defaultColorGroup(colorGroup); + const TQColor highlightColor(isActive ? backgroundColor(column) : view->colorGroup().background()); defaultColorGroup.setColor(TQColorGroup::Highlight , highlightColor); - defaultColorGroup.setColor(TQColorGroup::HighlightedText, tqcolorGroup.color(TQColorGroup::Text)); + defaultColorGroup.setColor(TQColorGroup::HighlightedText, colorGroup.color(TQColorGroup::Text)); KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, tqalignment); if (column == 0) { @@ -732,19 +732,19 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, TQListView* parent = listView(); const int itemWidth = width(parent->fontMetrics(), parent, 0); if (isActive) { - KFileListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); + KFileListViewItem::paintCell(painter, colorGroup, column, itemWidth, tqalignment); } else { - TQListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); + TQListViewItem::paintCell(painter, colorGroup, column, itemWidth, tqalignment); } } } else { if (isActive) { - KFileListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); + KFileListViewItem::paintCell(painter, colorGroup, column, cellWidth, tqalignment); } else { - TQListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); + TQListViewItem::paintCell(painter, colorGroup, column, cellWidth, tqalignment); } } @@ -756,7 +756,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, } void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, const TQRect& rect) { // draw the focus consistently with the selection (see implementation notes @@ -771,7 +771,7 @@ void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter, TQRect focusRect(rect); focusRect.setWidth(visibleWidth); - KFileListViewItem::paintFocus(painter, tqcolorGroup, focusRect); + KFileListViewItem::paintFocus(painter, colorGroup, focusRect); } int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h index 6b968ed..f159303 100644 --- a/src/dolphindetailsview.h +++ b/src/dolphindetailsview.h @@ -190,13 +190,13 @@ private: KFileItem* fileItem); virtual ~DolphinListViewItem(); virtual void paintCell(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, int column, int cellWidth, int tqalignment); virtual void paintFocus(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, const TQRect& rect); }; diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 6c7b9a9..18b1c4e 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -293,7 +293,7 @@ void DolphinIconsView::drawBackground(TQPainter* painter, const TQRect& rect) KFileIconView::drawBackground(painter, rect); } else { - const TQBrush brush(tqcolorGroup().background()); + const TQBrush brush(colorGroup().background()); painter->fillRect(0, 0, width(), height(), brush); } } diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index d07c5d2..543bb47 100644 --- a/src/dolphinstatusbar.cpp +++ b/src/dolphinstatusbar.cpp @@ -36,7 +36,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) : m_progress(100) { m_messageLabel = new StatusBarMessageLabel(this); - m_messageLabel->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); + m_messageLabel->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); m_spaceInfo = new StatusBarSpaceInfo(this); m_spaceInfo->setURL(parent->url()); @@ -51,7 +51,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) : connect(m_progressTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgressTimer())); - const TQSize size(m_progressBar->tqsizeHint()); + const TQSize size(m_progressBar->sizeHint()); m_progressBar->setMaximumWidth(size.width()); setMinimumHeight(size.height()); m_messageLabel->setMinimumTextHeight(size.height()); diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp index 3a3f5ca..ba6bd60 100644 --- a/src/editbookmarkdialog.cpp +++ b/src/editbookmarkdialog.cpp @@ -72,7 +72,7 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, new TQLabel(i18n("Icon:"), grid); m_iconName = icon; m_iconButton = new TQPushButton(SmallIcon(m_iconName), TQString(), grid); - m_iconButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_iconButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect(m_iconButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectIcon())); @@ -86,13 +86,13 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, new TQLabel(i18n("Location:"), grid); TQHBox* locationBox = new TQHBox(grid); - locationBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + locationBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); locationBox->setSpacing(spacingHint()); m_location = new TQLineEdit(url.prettyURL(), locationBox); m_location->setMinimumWidth(320); TQPushButton* selectLocationButton = new TQPushButton(SmallIcon("folder"), TQString(), locationBox); - selectLocationButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + selectLocationButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect(selectLocationButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectLocation())); diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index f3fbebb..cc6acf6 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -53,18 +53,18 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : DolphinSettings& settings = DolphinSettings::instance(); TQVBox* vBox = new TQVBox(parent); - vBox->tqsetSizePolicy(sizePolicy); + vBox->setSizePolicy(sizePolicy); vBox->setSpacing(spacing); vBox->setMargin(margin); - vBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); + vBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); // create 'Home URL' editor TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox); - homeGroup->tqsetSizePolicy(sizePolicy); + homeGroup->setSizePolicy(sizePolicy); homeGroup->setMargin(margin); TQHBox* homeURLBox = new TQHBox(homeGroup); - homeURLBox->tqsetSizePolicy(sizePolicy); + homeURLBox->setSizePolicy(sizePolicy); homeURLBox->setSpacing(spacing); new TQLabel(i18n("Location:"), homeURLBox); @@ -75,7 +75,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : this, TQT_SLOT(selectHomeURL())); TQHBox* buttonBox = new TQHBox(homeGroup); - buttonBox->tqsetSizePolicy(sizePolicy); + buttonBox->setSizePolicy(sizePolicy); buttonBox->setSpacing(spacing); TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox); connect(useCurrentButton, TQT_SIGNAL(clicked()), @@ -86,7 +86,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : // create 'Default View Mode' group TQButtonGroup* buttonGroup = new TQButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox); - buttonGroup->tqsetSizePolicy(sizePolicy); + buttonGroup->setSizePolicy(sizePolicy); buttonGroup->setMargin(margin); m_iconsView = new TQRadioButton(i18n("Icons"), buttonGroup); diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 9271bbb..a3a11ed 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -63,11 +63,11 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, TQHBox* sizesLayout = new TQHBox(this); sizesLayout->setSpacing(spacing); - sizesLayout->tqsetSizePolicy(sizePolicy); + sizesLayout->setSizePolicy(sizePolicy); // create 'Icon Size' group including slider and preview TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout); - iconSizeGroup->tqsetSizePolicy(sizePolicy); + iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); const TQColor iconBackgroundColor(KGlobalSettings::baseColor()); @@ -91,7 +91,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, if (m_mode == DolphinIconsView::Previews) { // create 'Preview Size' group including slider and preview TQGroupBox* previewSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout); - previewSizeGroup->tqsetSizePolicy(sizePolicy); + previewSizeGroup->setSizePolicy(sizePolicy); previewSizeGroup->setMargin(margin); TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup); @@ -113,7 +113,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, } TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); - textGroup->tqsetSizePolicy(sizePolicy); + textGroup->setSizePolicy(sizePolicy); textGroup->setMargin(margin); new TQLabel(i18n("Font family:"), textGroup); @@ -135,7 +135,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, m_textWidthBox->insertItem(i18n("Large")); TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this); - gridGroup->tqsetSizePolicy(sizePolicy); + gridGroup->setSizePolicy(sizePolicy); gridGroup->setMargin(margin); const bool leftToRightArrangement = (settings->arrangement() == TQIconView::LeftToRight); diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 2766e1f..3cdc23a 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -74,24 +74,24 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) : // name m_name = new TQLabel(this); m_name->setTextFormat(TQt::RichText); - m_name->tqsetAlignment(m_name->tqalignment() | TQt::AlignHCenter); + m_name->setAlignment(m_name->tqalignment() | TQt::AlignHCenter); TQFontMetrics fontMetrics(m_name->font()); m_name->setMinimumHeight(fontMetrics.height() * 3); - m_name->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Maximum); + m_name->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Maximum); TQWidget* sep1 = new TQHGroupBox(this); // TODO: check whether default widget exist for this? sep1->setFixedHeight(1); // general information m_infoGrid = new TQGrid(2, this); - m_infoGrid->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + m_infoGrid->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); TQWidget* sep2 = new TQHGroupBox(this); // TODO: check whether default widget exist for this? sep2->setFixedHeight(1); // actions m_actionBox = new TQVBox(this); - m_actionBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + m_actionBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // Add a dummy widget with no restriction regarding a vertical resizing. // This assures that information is always top aligned. @@ -388,14 +388,14 @@ void InfoSidebarPage::addInfoLine(const TQString& labelText, const TQString& inf // no labels are available anymore, hence create 2 new ones TQLabel* label = new TQLabel(labelStr, m_infoGrid); label->setTextFormat(TQt::RichText); - label->tqsetAlignment(TQt::AlignRight | + label->setAlignment(TQt::AlignRight | TQt::AlignTop); label->show(); m_infoWidgets.append(label); TQLabel* info = new TQLabel(infoText, m_infoGrid); info->setTextFormat(TQt::RichText); - info->tqsetAlignment(TQt::AlignTop | TQt::WordBreak); + info->setAlignment(TQt::AlignTop | TQt::WordBreak); info->show(); m_infoWidgets.append(info); @@ -535,7 +535,7 @@ ServiceButton::ServiceButton(const TQIconSet& icon, m_hover(false), m_index(index) { - setEraseColor(tqcolorGroup().background()); + setEraseColor(colorGroup().background()); setFocusPolicy(TQ_NoFocus); connect(this, TQT_SIGNAL(released()), this, TQT_SLOT(slotReleased())); @@ -557,7 +557,7 @@ void ServiceButton::drawButton(TQPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = tqcolorGroup().background(); + backgroundColor = colorGroup().background(); foregroundColor = KGlobalSettings::buttonTextColor(); } diff --git a/src/sidebars.cpp b/src/sidebars.cpp index 11f1ca1..463d63d 100644 --- a/src/sidebars.cpp +++ b/src/sidebars.cpp @@ -73,9 +73,9 @@ leftSidebar::~leftSidebar() { } -TQSize leftSidebar::tqsizeHint() const +TQSize leftSidebar::sizeHint() const { - TQSize size(TQWidget::tqsizeHint()); + TQSize size(TQWidget::sizeHint()); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar(); size.setWidth(settings->width()); @@ -148,9 +148,9 @@ rightSidebar::~rightSidebar() { } -TQSize rightSidebar::tqsizeHint() const +TQSize rightSidebar::sizeHint() const { - TQSize size(TQWidget::tqsizeHint()); + TQSize size(TQWidget::sizeHint()); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar(); size.setWidth(settings->width()); diff --git a/src/sidebars.h b/src/sidebars.h index 7e65f20..5c11461 100644 --- a/src/sidebars.h +++ b/src/sidebars.h @@ -40,7 +40,7 @@ class leftSidebar : public TQWidget leftSidebar(TQWidget* parent); virtual ~leftSidebar(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: /** @@ -69,7 +69,7 @@ class rightSidebar : public TQWidget rightSidebar(TQWidget* parent); virtual ~rightSidebar(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: /** diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index 11f74cc..c79fc44 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -108,7 +108,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */) TQPainter painter(&buffer); // draw background - TQColor backgroundColor(tqcolorGroup().background()); + TQColor backgroundColor(colorGroup().background()); TQColor foregroundColor(KGlobalSettings::textColor()); if (m_illumination > 0) { backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination); diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index 87feaa3..1dfe84d 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -64,7 +64,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */) const int widthDec = 3; // visual decrement for the available width - const TQColor c1 = tqcolorGroup().background(); + const TQColor c1 = colorGroup().background(); const TQColor c2 = KGlobalSettings::buttonTextColor(); const TQColor frameColor((c1.red() + c2.red()) / 2, (c1.green() + c2.green()) / 2, diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp index a48c833..a9cc644 100644 --- a/src/urlbutton.cpp +++ b/src/urlbutton.cpp @@ -38,7 +38,7 @@ URLButton::URLButton(URLNavigator* parent) m_urlNavigator(parent) { setFocusPolicy(TQ_NoFocus); - tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); setMinimumHeight(parent->minimumHeight()); connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation())); diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 58de6b0..ce718d8 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -428,7 +428,7 @@ void URLNavigator::updateContent() // TODO: don't hardcode the shortcut as part of the text TQToolTip::add(m_toggleButton, i18n("Browse (Ctrl+B, Escape)")); - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_pathBox->show(); m_pathBox->setURL(url()); } @@ -436,7 +436,7 @@ void URLNavigator::updateContent() // TODO: don't hardcode the shortcut as part of the text TQToolTip::add(m_toggleButton, i18n("Edit location (Ctrl+L)")); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_pathBox->hide(); TQString dir_name; diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index 8d893f9..4082ad7 100644 --- a/src/urlnavigatorbutton.cpp +++ b/src/urlnavigatorbutton.cpp @@ -104,7 +104,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = tqcolorGroup().background(); + backgroundColor = colorGroup().background(); foregroundColor = KGlobalSettings::buttonTextColor(); } @@ -114,7 +114,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter) const bool isActive = (dolphin.activeView() == parentView); if (!isActive) { - TQColor dimmColor(tqcolorGroup().background()); + TQColor dimmColor(colorGroup().background()); foregroundColor = mixColors(foregroundColor, dimmColor); if (isHighlighted) { backgroundColor = mixColors(backgroundColor, dimmColor); diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index ced4b4b..0d34dd4 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -229,7 +229,7 @@ void ViewProperties::save() void ViewProperties::updateTimeStamp() { m_changedProps = true; - m_node.setTimeStamp(TQDateTime::tqcurrentDateTime()); + m_node.setTimeStamp(TQDateTime::currentDateTime()); } ViewProperties::Properties::Properties() : diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 93f1c3e..b089b6d 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -56,7 +56,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // create 'Properties' group containing view mode, sorting, sort order and show hidden files TQGroupBox* propsGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Properties"), plainPage()); - propsGroup->tqsetSizePolicy(sizePolicy); + propsGroup->setSizePolicy(sizePolicy); propsGroup->setMargin(margin); new TQLabel(i18n("View mode:"), propsGroup); @@ -96,7 +96,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : Qt::Vertical, i18n("Apply view properties to:"), plainPage()); - buttonGroup->tqsetSizePolicy(sizePolicy); + buttonGroup->setSizePolicy(sizePolicy); buttonGroup->setMargin(margin); m_applyToCurrentFolder = new TQRadioButton(i18n("Current folder"), buttonGroup);