TDE
/
dolphin
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source 
(cherry picked from commit 33ca3afe64)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 5e5ef7ba6b
commit 3aca3483bf
21 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File

4
src/bookmarkselector.cpp
Unescape View File

@ -132,7 +132,7 @@ void BookmarkSelector::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = KGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = tqcolorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = KGlobalSettings::buttonTextColor();
} }
@ -142,7 +142,7 @@ void BookmarkSelector::drawButton(TQPainter* painter)
const bool isActive = (dolphin.activeView() == parentView); const bool isActive = (dolphin.activeView() == parentView);
if (!isActive) { if (!isActive) {
TQColor dimmColor(tqcolorGroup().background()); TQColor dimmColor(colorGroup().background());
foregroundColor = mixColors(foregroundColor, dimmColor); foregroundColor = mixColors(foregroundColor, dimmColor);
if (isHighlighted) { if (isHighlighted) {
backgroundColor = mixColors(backgroundColor, dimmColor); backgroundColor = mixColors(backgroundColor, dimmColor);

14
src/bookmarkssettingspage.cpp
Unescape View File

@ -49,9 +49,9 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) :
const int spacing = KDialog::spacingHint(); const int spacing = KDialog::spacingHint();
TQHBox* hBox = new TQHBox(parent); TQHBox* hBox = new TQHBox(parent);
hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
hBox->setSpacing(spacing); hBox->setSpacing(spacing);
hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored);
m_listView = new KListView(hBox); m_listView = new KListView(hBox);
m_listView->addColumn(i18n("Icon")); m_listView->addColumn(i18n("Icon"));
@ -76,27 +76,27 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) :
m_addButton = new KPushButton(i18n("Add..."), buttonBox); m_addButton = new KPushButton(i18n("Add..."), buttonBox);
connect(m_addButton, TQT_SIGNAL(clicked()), connect(m_addButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotAddButtonClicked())); this, TQT_SLOT(slotAddButtonClicked()));
m_addButton->tqsetSizePolicy(buttonSizePolicy); m_addButton->setSizePolicy(buttonSizePolicy);
m_editButton = new KPushButton(i18n("Edit..."), buttonBox); m_editButton = new KPushButton(i18n("Edit..."), buttonBox);
connect(m_editButton, TQT_SIGNAL(clicked()), connect(m_editButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotEditButtonClicked())); this, TQT_SLOT(slotEditButtonClicked()));
m_editButton->tqsetSizePolicy(buttonSizePolicy); m_editButton->setSizePolicy(buttonSizePolicy);
m_removeButton = new KPushButton(i18n("Remove"), buttonBox); m_removeButton = new KPushButton(i18n("Remove"), buttonBox);
connect(m_removeButton, TQT_SIGNAL(clicked()), connect(m_removeButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotRemoveButtonClicked())); this, TQT_SLOT(slotRemoveButtonClicked()));
m_removeButton->tqsetSizePolicy(buttonSizePolicy); m_removeButton->setSizePolicy(buttonSizePolicy);
m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox); m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox);
connect(m_moveUpButton, TQT_SIGNAL(clicked()), connect(m_moveUpButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotMoveUpButtonClicked())); this, TQT_SLOT(slotMoveUpButtonClicked()));
m_moveUpButton->tqsetSizePolicy(buttonSizePolicy); m_moveUpButton->setSizePolicy(buttonSizePolicy);
m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox); m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox);
connect(m_moveDownButton, TQT_SIGNAL(clicked()), connect(m_moveDownButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotMoveDownButtonClicked())); this, TQT_SLOT(slotMoveDownButtonClicked()));
m_moveDownButton->tqsetSizePolicy(buttonSizePolicy); m_moveDownButton->setSizePolicy(buttonSizePolicy);
// Add a dummy widget with no restriction regarding a vertical resizing. // Add a dummy widget with no restriction regarding a vertical resizing.
// This assures that the spacing between the buttons is not increased. // This assures that the spacing between the buttons is not increased.

2
src/bookmarkssidebarpage.cpp
Unescape View File

@ -40,7 +40,7 @@ BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) :
{ {
TQVBoxLayout* tqlayout = new TQVBoxLayout(this); TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
m_bookmarksList = new BookmarksListBox(this); m_bookmarksList = new BookmarksListBox(this);
m_bookmarksList->setPaletteBackgroundColor(tqcolorGroup().background()); m_bookmarksList->setPaletteBackgroundColor(colorGroup().background());
tqlayout->addWidget(m_bookmarksList); tqlayout->addWidget(m_bookmarksList);
connect(m_bookmarksList, TQT_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)), connect(m_bookmarksList, TQT_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)),

6
src/detailsviewsettingspage.cpp
Unescape View File

@ -58,7 +58,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
// create "Columns" properties // create "Columns" properties
TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this); TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this);
columnsGroup->tqsetSizePolicy(sizePolicy); columnsGroup->setSizePolicy(sizePolicy);
columnsGroup->setMargin(margin); columnsGroup->setMargin(margin);
TQHBox* visibleColumnsLayout = new TQHBox(columnsGroup); TQHBox* visibleColumnsLayout = new TQHBox(columnsGroup);
@ -76,7 +76,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
// Create "Icon" properties // Create "Icon" properties
TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this); TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this);
iconSizeGroup->tqsetSizePolicy(sizePolicy); iconSizeGroup->setSizePolicy(sizePolicy);
iconSizeGroup->setMargin(margin); iconSizeGroup->setMargin(margin);
m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup); m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup);
m_mediumIconSize = new TQRadioButton(i18n("Medium"), iconSizeGroup); m_mediumIconSize = new TQRadioButton(i18n("Medium"), iconSizeGroup);
@ -103,7 +103,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
// create "Text" properties // create "Text" properties
TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this);
textGroup->tqsetSizePolicy(sizePolicy); textGroup->setSizePolicy(sizePolicy);
textGroup->setMargin(margin); textGroup->setMargin(margin);
new TQLabel(i18n("Font family:"), textGroup); new TQLabel(i18n("Font family:"), textGroup);

26
src/dolphindetailsview.cpp
Unescape View File

@ -441,7 +441,7 @@ void DolphinDetailsView::paintEmptyArea(TQPainter* painter, const TQRect& rect)
KFileDetailView::paintEmptyArea(painter, rect); KFileDetailView::paintEmptyArea(painter, rect);
} }
else { else {
const TQBrush brush(tqcolorGroup().background()); const TQBrush brush(colorGroup().background());
painter->fillRect(rect, brush); painter->fillRect(rect, brush);
} }
} }
@ -467,7 +467,7 @@ void DolphinDetailsView::drawRubber()
point = contentsToViewport(point); point = contentsToViewport(point);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()), 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(); p.end();
} }
@ -553,7 +553,7 @@ void DolphinDetailsView::slotAutoScroll()
// select all items which intersect with the rubber, deselect all others // select all items which intersect with the rubber, deselect all others
bool bottomReached = false; bool bottomReached = false;
while ((item != 0) && !bottomReached) { while ((item != 0) && !bottomReached) {
TQRect rect(tqitemRect(item)); TQRect rect(itemRect(item));
rect.setWidth(filenameWidth(item)); rect.setWidth(filenameWidth(item));
rect = TQRect(viewportToContents(rect.topLeft()), rect = TQRect(viewportToContents(rect.topLeft()),
viewportToContents(rect.bottomRight())); viewportToContents(rect.bottomRight()));
@ -710,7 +710,7 @@ DolphinDetailsView::DolphinListViewItem::~DolphinListViewItem()
} }
void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
int column, int column,
int cellWidth, int cellWidth,
int tqalignment) 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 // 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 // behavior with the icon view is wanted, only the the column containing the file name
// should be shown as selected. // should be shown as selected.
TQColorGroup defaultColorGroup(tqcolorGroup); TQColorGroup defaultColorGroup(colorGroup);
const TQColor highlightColor(isActive ? backgroundColor(column) : view->tqcolorGroup().background()); const TQColor highlightColor(isActive ? backgroundColor(column) : view->colorGroup().background());
defaultColorGroup.setColor(TQColorGroup::Highlight , highlightColor); 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); KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, tqalignment);
if (column == 0) { if (column == 0) {
@ -732,19 +732,19 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter,
TQListView* parent = listView(); TQListView* parent = listView();
const int itemWidth = width(parent->fontMetrics(), parent, 0); const int itemWidth = width(parent->fontMetrics(), parent, 0);
if (isActive) { if (isActive) {
KFileListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); KFileListViewItem::paintCell(painter, colorGroup, column, itemWidth, tqalignment);
} }
else { else {
TQListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); TQListViewItem::paintCell(painter, colorGroup, column, itemWidth, tqalignment);
} }
} }
} }
else { else {
if (isActive) { if (isActive) {
KFileListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); KFileListViewItem::paintCell(painter, colorGroup, column, cellWidth, tqalignment);
} }
else { 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, void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
const TQRect& rect) const TQRect& rect)
{ {
// draw the focus consistently with the selection (see implementation notes // draw the focus consistently with the selection (see implementation notes
@ -771,7 +771,7 @@ void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter,
TQRect focusRect(rect); TQRect focusRect(rect);
focusRect.setWidth(visibleWidth); focusRect.setWidth(visibleWidth);
KFileListViewItem::paintFocus(painter, tqcolorGroup, focusRect); KFileListViewItem::paintFocus(painter, colorGroup, focusRect);
} }
int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const

4
src/dolphindetailsview.h
Unescape View File

@ -190,13 +190,13 @@ private:
KFileItem* fileItem); KFileItem* fileItem);
virtual ~DolphinListViewItem(); virtual ~DolphinListViewItem();
virtual void paintCell(TQPainter* painter, virtual void paintCell(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
int column, int column,
int cellWidth, int cellWidth,
int tqalignment); int tqalignment);
virtual void paintFocus(TQPainter* painter, virtual void paintFocus(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
const TQRect& rect); const TQRect& rect);
}; };

2
src/dolphiniconsview.cpp
Unescape View File

@ -293,7 +293,7 @@ void DolphinIconsView::drawBackground(TQPainter* painter, const TQRect& rect)
KFileIconView::drawBackground(painter, rect); KFileIconView::drawBackground(painter, rect);
} }
else { else {
const TQBrush brush(tqcolorGroup().background()); const TQBrush brush(colorGroup().background());
painter->fillRect(0, 0, width(), height(), brush); painter->fillRect(0, 0, width(), height(), brush);
} }
} }

4
src/dolphinstatusbar.cpp
Unescape View File

@ -36,7 +36,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
m_progress(100) m_progress(100)
{ {
m_messageLabel = new StatusBarMessageLabel(this); 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 = new StatusBarSpaceInfo(this);
m_spaceInfo->setURL(parent->url()); m_spaceInfo->setURL(parent->url());
@ -51,7 +51,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
connect(m_progressTimer, TQT_SIGNAL(timeout()), connect(m_progressTimer, TQT_SIGNAL(timeout()),
this, TQT_SLOT(slotProgressTimer())); this, TQT_SLOT(slotProgressTimer()));
const TQSize size(m_progressBar->tqsizeHint()); const TQSize size(m_progressBar->sizeHint());
m_progressBar->setMaximumWidth(size.width()); m_progressBar->setMaximumWidth(size.width());
setMinimumHeight(size.height()); setMinimumHeight(size.height());
m_messageLabel->setMinimumTextHeight(size.height()); m_messageLabel->setMinimumTextHeight(size.height());

6
src/editbookmarkdialog.cpp
Unescape View File

@ -72,7 +72,7 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title,
new TQLabel(i18n("Icon:"), grid); new TQLabel(i18n("Icon:"), grid);
m_iconName = icon; m_iconName = icon;
m_iconButton = new TQPushButton(SmallIcon(m_iconName), TQString(), grid); 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()), connect(m_iconButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(selectIcon())); this, TQT_SLOT(selectIcon()));
@ -86,13 +86,13 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title,
new TQLabel(i18n("Location:"), grid); new TQLabel(i18n("Location:"), grid);
TQHBox* locationBox = new TQHBox(grid); TQHBox* locationBox = new TQHBox(grid);
locationBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); locationBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
locationBox->setSpacing(spacingHint()); locationBox->setSpacing(spacingHint());
m_location = new TQLineEdit(url.prettyURL(), locationBox); m_location = new TQLineEdit(url.prettyURL(), locationBox);
m_location->setMinimumWidth(320); m_location->setMinimumWidth(320);
TQPushButton* selectLocationButton = new TQPushButton(SmallIcon("folder"), TQString(), locationBox); 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()), connect(selectLocationButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(selectLocation())); this, TQT_SLOT(selectLocation()));

12
src/generalsettingspage.cpp
Unescape View File

@ -53,18 +53,18 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
DolphinSettings& settings = DolphinSettings::instance(); DolphinSettings& settings = DolphinSettings::instance();
TQVBox* vBox = new TQVBox(parent); TQVBox* vBox = new TQVBox(parent);
vBox->tqsetSizePolicy(sizePolicy); vBox->setSizePolicy(sizePolicy);
vBox->setSpacing(spacing); vBox->setSpacing(spacing);
vBox->setMargin(margin); vBox->setMargin(margin);
vBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); vBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored);
// create 'Home URL' editor // create 'Home URL' editor
TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox); TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox);
homeGroup->tqsetSizePolicy(sizePolicy); homeGroup->setSizePolicy(sizePolicy);
homeGroup->setMargin(margin); homeGroup->setMargin(margin);
TQHBox* homeURLBox = new TQHBox(homeGroup); TQHBox* homeURLBox = new TQHBox(homeGroup);
homeURLBox->tqsetSizePolicy(sizePolicy); homeURLBox->setSizePolicy(sizePolicy);
homeURLBox->setSpacing(spacing); homeURLBox->setSpacing(spacing);
new TQLabel(i18n("Location:"), homeURLBox); new TQLabel(i18n("Location:"), homeURLBox);
@ -75,7 +75,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
this, TQT_SLOT(selectHomeURL())); this, TQT_SLOT(selectHomeURL()));
TQHBox* buttonBox = new TQHBox(homeGroup); TQHBox* buttonBox = new TQHBox(homeGroup);
buttonBox->tqsetSizePolicy(sizePolicy); buttonBox->setSizePolicy(sizePolicy);
buttonBox->setSpacing(spacing); buttonBox->setSpacing(spacing);
TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox); TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox);
connect(useCurrentButton, TQT_SIGNAL(clicked()), connect(useCurrentButton, TQT_SIGNAL(clicked()),
@ -86,7 +86,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
// create 'Default View Mode' group // create 'Default View Mode' group
TQButtonGroup* buttonGroup = new TQButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox); TQButtonGroup* buttonGroup = new TQButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox);
buttonGroup->tqsetSizePolicy(sizePolicy); buttonGroup->setSizePolicy(sizePolicy);
buttonGroup->setMargin(margin); buttonGroup->setMargin(margin);
m_iconsView = new TQRadioButton(i18n("Icons"), buttonGroup); m_iconsView = new TQRadioButton(i18n("Icons"), buttonGroup);

10
src/iconsviewsettingspage.cpp
Unescape View File

@ -63,11 +63,11 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
TQHBox* sizesLayout = new TQHBox(this); TQHBox* sizesLayout = new TQHBox(this);
sizesLayout->setSpacing(spacing); sizesLayout->setSpacing(spacing);
sizesLayout->tqsetSizePolicy(sizePolicy); sizesLayout->setSizePolicy(sizePolicy);
// create 'Icon Size' group including slider and preview // create 'Icon Size' group including slider and preview
TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout); TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout);
iconSizeGroup->tqsetSizePolicy(sizePolicy); iconSizeGroup->setSizePolicy(sizePolicy);
iconSizeGroup->setMargin(margin); iconSizeGroup->setMargin(margin);
const TQColor iconBackgroundColor(KGlobalSettings::baseColor()); const TQColor iconBackgroundColor(KGlobalSettings::baseColor());
@ -91,7 +91,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
if (m_mode == DolphinIconsView::Previews) { if (m_mode == DolphinIconsView::Previews) {
// create 'Preview Size' group including slider and preview // create 'Preview Size' group including slider and preview
TQGroupBox* previewSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout); TQGroupBox* previewSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout);
previewSizeGroup->tqsetSizePolicy(sizePolicy); previewSizeGroup->setSizePolicy(sizePolicy);
previewSizeGroup->setMargin(margin); previewSizeGroup->setMargin(margin);
TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup); TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup);
@ -113,7 +113,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
} }
TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this);
textGroup->tqsetSizePolicy(sizePolicy); textGroup->setSizePolicy(sizePolicy);
textGroup->setMargin(margin); textGroup->setMargin(margin);
new TQLabel(i18n("Font family:"), textGroup); new TQLabel(i18n("Font family:"), textGroup);
@ -135,7 +135,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
m_textWidthBox->insertItem(i18n("Large")); m_textWidthBox->insertItem(i18n("Large"));
TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this); TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this);
gridGroup->tqsetSizePolicy(sizePolicy); gridGroup->setSizePolicy(sizePolicy);
gridGroup->setMargin(margin); gridGroup->setMargin(margin);
const bool leftToRightArrangement = (settings->arrangement() == TQIconView::LeftToRight); const bool leftToRightArrangement = (settings->arrangement() == TQIconView::LeftToRight);

16
src/infosidebarpage.cpp
Unescape View File

@ -74,24 +74,24 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) :
// name // name
m_name = new TQLabel(this); m_name = new TQLabel(this);
m_name->setTextFormat(TQt::RichText); 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()); TQFontMetrics fontMetrics(m_name->font());
m_name->setMinimumHeight(fontMetrics.height() * 3); 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? TQWidget* sep1 = new TQHGroupBox(this); // TODO: check whether default widget exist for this?
sep1->setFixedHeight(1); sep1->setFixedHeight(1);
// general information // general information
m_infoGrid = new TQGrid(2, this); 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? TQWidget* sep2 = new TQHGroupBox(this); // TODO: check whether default widget exist for this?
sep2->setFixedHeight(1); sep2->setFixedHeight(1);
// actions // actions
m_actionBox = new TQVBox(this); 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. // Add a dummy widget with no restriction regarding a vertical resizing.
// This assures that information is always top aligned. // 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 // no labels are available anymore, hence create 2 new ones
TQLabel* label = new TQLabel(labelStr, m_infoGrid); TQLabel* label = new TQLabel(labelStr, m_infoGrid);
label->setTextFormat(TQt::RichText); label->setTextFormat(TQt::RichText);
label->tqsetAlignment(TQt::AlignRight | label->setAlignment(TQt::AlignRight |
TQt::AlignTop); TQt::AlignTop);
label->show(); label->show();
m_infoWidgets.append(label); m_infoWidgets.append(label);
TQLabel* info = new TQLabel(infoText, m_infoGrid); TQLabel* info = new TQLabel(infoText, m_infoGrid);
info->setTextFormat(TQt::RichText); info->setTextFormat(TQt::RichText);
info->tqsetAlignment(TQt::AlignTop | TQt::WordBreak); info->setAlignment(TQt::AlignTop | TQt::WordBreak);
info->show(); info->show();
m_infoWidgets.append(info); m_infoWidgets.append(info);
@ -535,7 +535,7 @@ ServiceButton::ServiceButton(const TQIconSet& icon,
m_hover(false), m_hover(false),
m_index(index) m_index(index)
{ {
setEraseColor(tqcolorGroup().background()); setEraseColor(colorGroup().background());
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
connect(this, TQT_SIGNAL(released()), connect(this, TQT_SIGNAL(released()),
this, TQT_SLOT(slotReleased())); this, TQT_SLOT(slotReleased()));
@ -557,7 +557,7 @@ void ServiceButton::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = KGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = tqcolorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = KGlobalSettings::buttonTextColor();
} }

8
src/sidebars.cpp
Unescape View File

@ -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(); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
size.setWidth(settings->width()); 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(); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
size.setWidth(settings->width()); size.setWidth(settings->width());

4
src/sidebars.h
Unescape View File

@ -40,7 +40,7 @@ class leftSidebar : public TQWidget
leftSidebar(TQWidget* parent); leftSidebar(TQWidget* parent);
virtual ~leftSidebar(); virtual ~leftSidebar();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
signals: signals:
/** /**
@ -69,7 +69,7 @@ class rightSidebar : public TQWidget
rightSidebar(TQWidget* parent); rightSidebar(TQWidget* parent);
virtual ~rightSidebar(); virtual ~rightSidebar();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
signals: signals:
/** /**

2
src/statusbarmessagelabel.cpp
Unescape View File

@ -108,7 +108,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */)
TQPainter painter(&buffer); TQPainter painter(&buffer);
// draw background // draw background
TQColor backgroundColor(tqcolorGroup().background()); TQColor backgroundColor(colorGroup().background());
TQColor foregroundColor(KGlobalSettings::textColor()); TQColor foregroundColor(KGlobalSettings::textColor());
if (m_illumination > 0) { if (m_illumination > 0) {
backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination); backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination);

2
src/statusbarspaceinfo.cpp
Unescape View File

@ -64,7 +64,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */)
const int widthDec = 3; // visual decrement for the available width 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 c2 = KGlobalSettings::buttonTextColor();
const TQColor frameColor((c1.red() + c2.red()) / 2, const TQColor frameColor((c1.red() + c2.red()) / 2,
(c1.green() + c2.green()) / 2, (c1.green() + c2.green()) / 2,

2
src/urlbutton.cpp
Unescape View File

@ -38,7 +38,7 @@ URLButton::URLButton(URLNavigator* parent)
m_urlNavigator(parent) m_urlNavigator(parent)
{ {
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
setMinimumHeight(parent->minimumHeight()); setMinimumHeight(parent->minimumHeight());
connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation())); connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation()));

4
src/urlnavigator.cpp
Unescape View File

@ -428,7 +428,7 @@ void URLNavigator::updateContent()
// TODO: don't hardcode the shortcut as part of the text // TODO: don't hardcode the shortcut as part of the text
TQToolTip::add(m_toggleButton, i18n("Browse (Ctrl+B, Escape)")); TQToolTip::add(m_toggleButton, i18n("Browse (Ctrl+B, Escape)"));
tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
m_pathBox->show(); m_pathBox->show();
m_pathBox->setURL(url()); m_pathBox->setURL(url());
} }
@ -436,7 +436,7 @@ void URLNavigator::updateContent()
// TODO: don't hardcode the shortcut as part of the text // TODO: don't hardcode the shortcut as part of the text
TQToolTip::add(m_toggleButton, i18n("Edit location (Ctrl+L)")); TQToolTip::add(m_toggleButton, i18n("Edit location (Ctrl+L)"));
tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_pathBox->hide(); m_pathBox->hide();
TQString dir_name; TQString dir_name;

4
src/urlnavigatorbutton.cpp
Unescape View File

@ -104,7 +104,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = KGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = tqcolorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = KGlobalSettings::buttonTextColor();
} }
@ -114,7 +114,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
const bool isActive = (dolphin.activeView() == parentView); const bool isActive = (dolphin.activeView() == parentView);
if (!isActive) { if (!isActive) {
TQColor dimmColor(tqcolorGroup().background()); TQColor dimmColor(colorGroup().background());
foregroundColor = mixColors(foregroundColor, dimmColor); foregroundColor = mixColors(foregroundColor, dimmColor);
if (isHighlighted) { if (isHighlighted) {
backgroundColor = mixColors(backgroundColor, dimmColor); backgroundColor = mixColors(backgroundColor, dimmColor);

2
src/viewproperties.cpp
Unescape View File

@ -229,7 +229,7 @@ void ViewProperties::save()
void ViewProperties::updateTimeStamp() void ViewProperties::updateTimeStamp()
{ {
m_changedProps = true; m_changedProps = true;
m_node.setTimeStamp(TQDateTime::tqcurrentDateTime()); m_node.setTimeStamp(TQDateTime::currentDateTime());
} }
ViewProperties::Properties::Properties() : ViewProperties::Properties::Properties() :

4
src/viewpropertiesdialog.cpp
Unescape View File

@ -56,7 +56,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
// create 'Properties' group containing view mode, sorting, sort order and show hidden files // create 'Properties' group containing view mode, sorting, sort order and show hidden files
TQGroupBox* propsGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Properties"), plainPage()); TQGroupBox* propsGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Properties"), plainPage());
propsGroup->tqsetSizePolicy(sizePolicy); propsGroup->setSizePolicy(sizePolicy);
propsGroup->setMargin(margin); propsGroup->setMargin(margin);
new TQLabel(i18n("View mode:"), propsGroup); new TQLabel(i18n("View mode:"), propsGroup);
@ -96,7 +96,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
Qt::Vertical, Qt::Vertical,
i18n("Apply view properties to:"), i18n("Apply view properties to:"),
plainPage()); plainPage());
buttonGroup->tqsetSizePolicy(sizePolicy); buttonGroup->setSizePolicy(sizePolicy);
buttonGroup->setMargin(margin); buttonGroup->setMargin(margin);
m_applyToCurrentFolder = new TQRadioButton(i18n("Current folder"), buttonGroup); m_applyToCurrentFolder = new TQRadioButton(i18n("Current folder"), buttonGroup);

Write Preview
Loading…
Cancel
Save