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

Rename obsolete tq methods to standard names

Browse Source 
(cherry picked from commit 8c77c4da5b)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent aeb9d1f604
commit 6c5dcecc92
54 changed files with 266 additions and 266 deletions
Show Stats Download Patch File Download Diff File

6
digikam/digikam/albumfiletip.cpp
Unescape View File

@ -107,14 +107,14 @@ AlbumFileTip::AlbumFileTip(AlbumIconView* view)
setFrameStyle(TQFrame::Plain | TQFrame::Box);
setLineWidth(1);
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, d->tipBorder+1, 0);
TQVBoxLayout *layout = new TQVBoxLayout(this, d->tipBorder+1, 0);
d->label = new TQLabel(this);
d->label->setMargin(0);
d->label->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
tqlayout->addWidget(d->label);
tqlayout->setResizeMode(TQLayout::Fixed);
layout->addWidget(d->label);
layout->setResizeMode(TQLayout::Fixed);
renderArrows();
}

8
digikam/digikam/albumiconview.cpp
Unescape View File

@ -525,7 +525,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos)
TQPopupMenu popmenu(this);
KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
{
@ -684,7 +684,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
KAction *copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0);
KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
{
paste->setEnabled(false);
@ -848,12 +848,12 @@ void AlbumIconView::slotCopy()
TQDragObject* drag = 0;
drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this);
kapp->tqclipboard()->setData(drag);
kapp->clipboard()->setData(drag);
}
void AlbumIconView::slotPaste()
{
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data)
return;

10
digikam/digikam/firstrun.cpp
Unescape View File

@ -48,16 +48,16 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent )
: TQWidget( parent )
{
setName( "FirstRunWidget" );
TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
m_textLabel2 = new TQLabel( this );
vtqlayout->addWidget( m_textLabel2 );
vlayout->addWidget( m_textLabel2 );
TQFrame *line1 = new TQFrame( this );
line1->setFrameShape( TQFrame::HLine );
line1->setFrameShadow( TQFrame::Sunken );
line1->setFrameShape( TQFrame::HLine );
vtqlayout->addWidget( line1 );
vlayout->addWidget( line1 );
TQGridLayout *grid = new TQGridLayout( 0, 1, 1, 0, 6 );
@ -74,8 +74,8 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent )
m_textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
grid->addWidget( m_textLabel1, 0, 1 );
vtqlayout->addLayout( grid );
vtqlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
vlayout->addLayout( grid );
vlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
languageChange();
resize( TQSize(479, 149).expandedTo(minimumSizeHint()) );

4
digikam/digikam/folderitem.cpp
Unescape View File

@ -211,14 +211,14 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co
if ((type() == TQCheckListItem::CheckBox) ||
(type() == TQCheckListItem::CheckBoxController))
{
int boxsize = fv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, fv);
int boxsize = fv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, fv);
int x = 3;
int y = (height() - boxsize)/2 + margin;
r += boxsize + 4;
p->fillRect(0, 0, r, height(), cg.base());
fv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
fv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
TQRect(x, y, boxsize, height()),
cg, styleflags, TQStyleOption(this));
}

2
digikam/digikam/folderview.cpp
Unescape View File

@ -358,7 +358,7 @@ bool FolderView::mouseInItemRect(TQListViewItem* item, int x) const
FolderCheckListItem* citem = dynamic_cast<FolderCheckListItem*>(item);
if (citem &&
((citem->type() == TQCheckListItem::CheckBox) || (citem->type() == TQCheckListItem::CheckBoxController)))
boxsize = tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, this);
boxsize = style().pixelMetric(TQStyle::PM_CheckListButtonSize, this);
return (x > (offset + boxsize) && x < (offset + boxsize + width));
}

2
digikam/digikam/iconview.cpp
Unescape View File

@ -1067,7 +1067,7 @@ void IconView::drawRubber(TQPainter* p)
TQPoint pnt(r.x(), r.y());
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p,
style().tqdrawPrimitive(TQStyle::PE_FocusRect, p,
TQRect( pnt.x(), pnt.y(),
r.width(), r.height() ),
colorGroup(), TQStyle::Style_Default,

2
digikam/digikam/ratingwidget.cpp
Unescape View File

@ -185,7 +185,7 @@ void RatingWidget::slotThemeChanged()
TQPainter painter3(&d->disPixmap);
painter3.fillRect(0, 0, d->disPixmap.width(), d->disPixmap.height(),
tqpalette().disabled().foreground());
palette().disabled().foreground());
painter3.end();
setFixedSize(TQSize(d->regPixmap.width()*5, d->regPixmap.height()));

30
digikam/digikam/searchadvanceddialog.cpp
Unescape View File

@ -122,10 +122,10 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
d->rulesBox = new TQVGroupBox(i18n("Search Rules"), page);
TQWhatsThis::add(d->rulesBox, i18n("<p>Here you can review the search rules used to filter image-"
"searching in album library."));
d->rulesBox->tqlayout()->setSpacing( spacingHint() );
d->rulesBox->tqlayout()->setMargin( spacingHint() );
d->rulesBox->layout()->setSpacing( spacingHint() );
d->rulesBox->layout()->setMargin( spacingHint() );
d->rulesBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
d->rulesBox->tqlayout()->setAlignment( TQt::AlignTop );
d->rulesBox->layout()->setAlignment( TQt::AlignTop );
// ----------------------------------------------------------------
// Box for the add/delete
@ -135,8 +135,8 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
"by adding/removing criteria."));
groupbox1->setColumnLayout(0, Qt::Vertical );
groupbox1->tqlayout()->setSpacing( KDialog::spacingHint() );
groupbox1->tqlayout()->setMargin( KDialog::marginHint() );
groupbox1->layout()->setSpacing( KDialog::spacingHint() );
groupbox1->layout()->setMargin( KDialog::marginHint() );
d->optionsCombo = new TQComboBox(groupbox1);
d->optionsCombo->insertItem(i18n("As well as"), 0);
d->optionsCombo->insertItem(i18n("Or"), 1);
@ -147,7 +147,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
d->addButton->setIconSet(SmallIcon("add"));
d->delButton->setIconSet(SmallIcon("remove"));
TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->tqlayout());
TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->layout());
box1->addWidget(d->optionsCombo);
box1->addWidget(d->addButton);
box1->addStretch(10);
@ -160,12 +160,12 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria "
"from the Search Rule set."));
groupbox2->setColumnLayout(0, Qt::Vertical);
groupbox2->tqlayout()->setSpacing( KDialog::spacingHint() );
groupbox2->tqlayout()->setMargin( KDialog::marginHint() );
groupbox2->layout()->setSpacing( KDialog::spacingHint() );
groupbox2->layout()->setMargin( KDialog::marginHint() );
d->groupButton = new TQPushButton(i18n("&Group"), groupbox2);
d->ungroupButton = new TQPushButton(i18n("&Ungroup"), groupbox2);
TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->tqlayout());
TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->layout());
box2->addWidget(d->groupButton);
box2->addStretch(10);
box2->addWidget(d->ungroupButton);
@ -175,14 +175,14 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3");
groupbox3->setColumnLayout(0, Qt::Vertical );
groupbox3->tqlayout()->setSpacing( KDialog::spacingHint() );
groupbox3->layout()->setSpacing( KDialog::spacingHint() );
groupbox3->setFrameStyle( TQFrame::NoFrame );
TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3);
d->title = new KLineEdit(groupbox3, "searchTitle");
TQWhatsThis::add(d->title, i18n("<p>Enter the name used to save the current search in "
"\"My Searches\" view"));
TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->tqlayout());
TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->layout());
box3->addWidget(label);
box3->addWidget(d->title);
label->setBuddy(d->title);
@ -369,8 +369,8 @@ void SearchAdvancedDialog::slotGroupRules()
for (BaseList::iterator it = d->baseList.begin();
it != d->baseList.end(); ++it)
{
d->rulesBox->tqlayout()->remove((*it)->widget());
d->rulesBox->tqlayout()->add((*it)->widget());
d->rulesBox->layout()->remove((*it)->widget());
d->rulesBox->layout()->add((*it)->widget());
}
connect( group, TQT_SIGNAL( signalBaseItemToggled() ),
@ -423,8 +423,8 @@ void SearchAdvancedDialog::slotUnGroupRules()
for (BaseList::iterator it = d->baseList.begin();
it != d->baseList.end(); ++it)
{
d->rulesBox->tqlayout()->remove((*it)->widget());
d->rulesBox->tqlayout()->add((*it)->widget());
d->rulesBox->layout()->remove((*it)->widget());
d->rulesBox->layout()->add((*it)->widget());
}
slotChangeButtonStates();

8
digikam/digikam/searchwidgets.cpp
Unescape View File

@ -126,7 +126,7 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt
: SearchAdvancedBase(SearchAdvancedBase::RULE)
{
m_box = new TQVBox(parent);
m_box->tqlayout()->setSpacing( KDialog::spacingHint() );
m_box->layout()->setSpacing( KDialog::spacingHint() );
m_box->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_optionsBox = 0;
@ -477,7 +477,7 @@ void SearchAdvancedRule::addOption(Option option)
return;
}
m_box->tqlayout()->remove(m_hbox);
m_box->layout()->remove(m_hbox);
m_optionsBox = new TQHBox(m_box);
new TQLabel(option == AND ? i18n("As well as") : i18n("Or"), m_optionsBox);
@ -486,7 +486,7 @@ void SearchAdvancedRule::addOption(Option option)
hline->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
m_optionsBox->show();
m_box->tqlayout()->add(m_hbox);
m_box->layout()->add(m_hbox);
m_option = option;
}
@ -518,7 +518,7 @@ SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent)
: SearchAdvancedBase(SearchAdvancedBase::GROUP)
{
m_box = new TQHBox(parent);
m_box->tqlayout()->setSpacing(KDialog::spacingHint());
m_box->layout()->setSpacing(KDialog::spacingHint());
m_groupbox = new TQVGroupBox(m_box);
m_check = new TQCheckBox(m_box);
m_option = SearchAdvancedRule::NONE;

8
digikam/digikam/tagspopupmenu.cpp
Unescape View File

@ -71,7 +71,7 @@ public:
{
TQFont fn = m_popup->font();
TQFontMetrics fm(fn);
int w = fm.width(m_txt) + 5 + kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
int w = fm.width(m_txt) + 5 + kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
int h = TQMAX(fm.height(), m_pix.height());
return TQSize( w, h );
}
@ -90,8 +90,8 @@ public:
p->drawPixmap( pixRect.topLeft(), m_pix );
}
int checkWidth = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
int checkHeight = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
int checkWidth = kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
int checkHeight = kapp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
TQStyle::SFlags flags = TQStyle::Style_Default;
flags |= TQStyle::Style_On;
@ -103,7 +103,7 @@ public:
TQFont fn = m_popup->font();
TQFontMetrics fm(fn);
TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight);
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags);
kapp->style().tqdrawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags);
}
private:

26
digikam/digikam/timelinewidget.cpp
Unescape View File

@ -610,7 +610,7 @@ void TimeLineWidget::updatePixmap()
{
// Drawing background and image.
d->pixmap = TQPixmap(size());
d->pixmap.fill(tqpalette().active().background());
d->pixmap.fill(palette().active().background());
TQPainter p(&d->pixmap);
@ -665,11 +665,11 @@ void TimeLineWidget::updatePixmap()
focusRect = barRect;
if (ref > d->maxDateTime)
dateColor = tqpalette().active().mid();
dateColor = palette().active().mid();
else
dateColor = tqpalette().active().foreground();
dateColor = palette().active().foreground();
p.setPen(tqpalette().active().foreground());
p.setPen(palette().active().foreground());
p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor()));
p.drawRect(barRect);
p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3);
@ -680,10 +680,10 @@ void TimeLineWidget::updatePixmap()
if (sel)
subDateColor = tqpalette().active().highlightedText();
else
subDateColor = tqpalette().active().foreground();
subDateColor = palette().active().foreground();
}
else
subDateColor = tqpalette().active().mid();
subDateColor = palette().active().mid();
if (sel == Selected || sel == FuzzySelection)
{
@ -849,11 +849,11 @@ void TimeLineWidget::updatePixmap()
focusRect = barRect;
if (ref < d->minDateTime)
dateColor = tqpalette().active().mid();
dateColor = palette().active().mid();
else
dateColor = tqpalette().active().foreground();
dateColor = palette().active().foreground();
p.setPen(tqpalette().active().foreground());
p.setPen(palette().active().foreground());
p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor()));
p.drawRect(barRect);
p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3);
@ -864,10 +864,10 @@ void TimeLineWidget::updatePixmap()
if (sel)
subDateColor = tqpalette().active().highlightedText();
else
subDateColor = tqpalette().active().foreground();
subDateColor = palette().active().foreground();
}
else
subDateColor = tqpalette().active().mid();
subDateColor = palette().active().mid();
if (sel == Selected || sel == FuzzySelection)
{
@ -1004,7 +1004,7 @@ void TimeLineWidget::updatePixmap()
TQPoint p2(focusRect.right(), height() - d->bottomMargin);
focusRect.setBottom(focusRect.bottom() + d->bottomMargin/2);
p.setPen(tqpalette().active().shadow());
p.setPen(palette().active().shadow());
p.drawLine(p1.x(), p1.y()+1, p2.x(), p2.y()+1);
p.drawRect(focusRect);
@ -1018,7 +1018,7 @@ void TimeLineWidget::updatePixmap()
p.drawLine(p1.x()-1, p1.y()-1, p2.x()+1, p2.y()-1);
focusRect.addCoords(-1,-1, 1, 1);
p.setPen(tqpalette().active().shadow());
p.setPen(palette().active().shadow());
p.drawRect(focusRect);
p.drawLine(p1.x(), p1.y()-2, p2.x(), p2.y()-2);
}

4
digikam/imageplugins/texture/texture.cpp
Unescape View File

@ -100,7 +100,7 @@ void Texture::filterImage(void)
else
blendGain = m_blendGain;
// Make textured transparent tqlayout.
// Make textured transparent layout.
for (int x = 0; !m_cancel && x < w; x++)
{
@ -139,7 +139,7 @@ void Texture::filterImage(void)
postProgress(progress);
}
// Merge tqlayout and image using overlay method.
// Merge layout and image using overlay method.
for (int x = 0; !m_cancel && x < w; x++)
{

6
digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
Unescape View File

@ -119,8 +119,8 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
// -------------------------------------------------------------
TQWidget *gboxSettings = new TQWidget(plainPage());
TQVBoxLayout* tqlayout2 = new TQVBoxLayout( gboxSettings, spacingHint() );
TQGridLayout *grid = new TQGridLayout( tqlayout2, 2, 4, spacingHint());
TQVBoxLayout* layout2 = new TQVBoxLayout( gboxSettings, spacingHint() );
TQGridLayout *grid = new TQGridLayout( layout2, 2, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
@ -185,7 +185,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
// -------------------------------------------------------------
TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5, spacingHint());
TQGridLayout *grid2 = new TQGridLayout(layout2, 13, 5, spacingHint());
m_temperatureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> "
" (K): </qt>"), gboxSettings);

6
digikam/imageplugins/whitebalance/whitebalancetool.cpp
Unescape View File

@ -115,8 +115,8 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
EditorToolSettings::Ok|
EditorToolSettings::Cancel);
TQVBoxLayout* tqlayout2 = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint());
TQGridLayout *grid = new TQGridLayout(tqlayout2, 2, 4);
TQVBoxLayout* layout2 = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint());
TQGridLayout *grid = new TQGridLayout(layout2, 2, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
@ -182,7 +182,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
// -------------------------------------------------------------
TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5);
TQGridLayout *grid2 = new TQGridLayout(layout2, 13, 5);
m_temperatureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> "
" (K): </qt>"), m_gboxSettings->plainPage());

4
digikam/libs/dialogs/deletedialogbase.ui
Unescape View File

@ -38,7 +38,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -62,7 +62,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">

2
digikam/libs/dialogs/imagedlgbase.cpp
Unescape View File

@ -5,7 +5,7 @@
*
* Date : 2005-07-23
* Description : simple plugins dialog without threadable
* filter interface. The dialog tqlayout is
* filter interface. The dialog layout is
* designed to accept custom widgets in
* preview and settings area.
*

2
digikam/libs/dialogs/imagedlgbase.h
Unescape View File

@ -5,7 +5,7 @@
*
* Date : 2005-07-23
* Description : simple plugins dialog without threadable
* filter interface. The dialog tqlayout is
* filter interface. The dialog layout is
* designed to accept custom widgets in
* preview and settings area.
*

2
digikam/libs/dimg/README
Unescape View File

@ -60,7 +60,7 @@ the image)
format. In QImage/Imlib2 the pixel data is stored as unsigned ints and to
access the individual colors you need to use bit-shifting to ensure
endian correctness. in DImg, the pixel data is stored as unsigned char.
the color tqlayout is B,G,R,A (blue, green, red, alpha)
the color layout is B,G,R,A (blue, green, red, alpha)
for 8bit images: you can access individual color components like this:

2
digikam/libs/imageproperties/cameraitempropertiestab.cpp
Unescape View File

@ -170,7 +170,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->settingsArea = new TQFrame(sv->viewport());
d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
d->settingsArea->setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
sv->addChild(d->settingsArea);
m_navigateBarLayout->addWidget(sv);

2
digikam/libs/imageproperties/imagepropertiestab.cpp
Unescape View File

@ -183,7 +183,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->settingsArea = new TQFrame(sv->viewport());
d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
d->settingsArea->setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
sv->addChild(d->settingsArea);
m_navigateBarLayout->addWidget(sv);

4
digikam/libs/widgets/common/colorgradientwidget.cpp
Unescape View File

@ -92,8 +92,8 @@ void ColorGradientWidget::drawContents(TQPainter *p)
// Widget is disable : drawing grayed frame.
if ( !isEnabled() )
{
color1 = tqpalette().disabled().foreground();
color2 = tqpalette().disabled().background();
color1 = palette().disabled().foreground();
color2 = palette().disabled().background();
}
else
{

26
digikam/libs/widgets/common/curveswidget.cpp
Unescape View File

@ -313,11 +313,11 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap anim(asize, asize);
TQPainter p2;
p2.begin(TQT_TQPAINTDEVICE(&anim), this);
p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
p2.setPen(TQPen(tqpalette().active().text()));
p2.setPen(TQPen(palette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@ -331,11 +331,11 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(TQT_TQPAINTDEVICE(&pm), this);
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.drawPixmap(width()/2 - asize /2, asize, anim);
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
if (d->clearFlag == CurvesWidgetPriv::HistogramDataLoading)
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@ -354,10 +354,10 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(TQT_TQPAINTDEVICE(&pm), this);
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
i18n("Histogram\ncalculation\nfailed."));
p1.end();
@ -483,14 +483,14 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing histogram
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
// Drawing curves.
p1.setPen(TQPen(tqpalette().active().link(), 2, TQt::SolidLine));
p1.setPen(TQPen(palette().active().link(), 2, TQt::SolidLine));
p1.drawLine(x - 1, wHeight - ((curvePrevVal * wHeight) / histogram->getHistogramSegment()),
x, wHeight - ((curveVal * wHeight) / histogram->getHistogramSegment()));
@ -518,7 +518,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing black/middle/highlight tone grid separators.
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(wWidth/4, 0, wWidth/4, wHeight);
p1.drawLine(wWidth/2, 0, wWidth/2, wHeight);
p1.drawLine(3*wWidth/4, 0, 3*wWidth/4, wHeight);
@ -601,7 +601,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing frame.
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();

6
digikam/libs/widgets/common/dpopupmenu.cpp
Unescape View File

@ -93,8 +93,8 @@ TQRect DPopupMenu::sideImageRect() const
TQColor DPopupMenu::calcPixmapColor()
{
TQColor color;
TQColor activeTitle = TQApplication::tqpalette().active().background();
TQColor inactiveTitle = TQApplication::tqpalette().inactive().background();
TQColor activeTitle = TQApplication::palette().active().background();
TQColor inactiveTitle = TQApplication::palette().inactive().background();
// figure out which color is most suitable for recoloring to
int h1, s1, v1, h2, s2, v2, h3, s3, v3;
@ -188,7 +188,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e)
drawContents(&p);
tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
TQRect(0, 0, width(), height()),
colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0));

80
digikam/libs/widgets/common/histogramwidget.cpp
Unescape View File

@ -385,9 +385,9 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPainter p1;
p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
bitBlt(this, 0, 0, &pm);
@ -406,11 +406,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap anim(asize, asize);
TQPainter p2;
p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
p2.setPen(TQPen(tqpalette().active().text()));
p2.setPen(TQPen(palette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@ -424,11 +424,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.drawPixmap(width()/2 - asize /2, asize, anim);
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
if (d->clearFlag == HistogramWidgetPriv::HistogramDataLoading)
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@ -448,10 +448,10 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
i18n("Histogram\ncalculation\nfailed."));
p1.end();
@ -525,7 +525,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.fillRect(0, 0, width(), height(), palette().active().background());
// Drawing selection or all histogram values.
@ -645,35 +645,35 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
}
else
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
}
}
else
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
}
@ -684,9 +684,9 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
// Witch color must be used on the foreground with all colors channel mode?
switch (m_colorType)
@ -717,16 +717,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yr);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -740,16 +740,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yg);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -763,16 +763,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yb);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -793,16 +793,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yr);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -816,16 +816,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yg);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -839,16 +839,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yb);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -973,7 +973,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQToolTip::add( this, tipText);
}
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
bitBlt(this, 0, 0, &pm);

2
digikam/libs/widgets/common/squeezedcombobox.cpp
Unescape View File

@ -97,7 +97,7 @@ TQSize SqueezedComboBox::sizeHint() const
int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18;
int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
return tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
return style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut());
}

10
digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
Unescape View File

@ -708,7 +708,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
{
d->painter.begin(&d->pixmap);
d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background());
d->painter.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
d->painter.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
d->painter.drawRect(0, 0, width(), height());
d->painter.end();
bitBlt(this, 0, 0, &d->pixmap);
@ -725,11 +725,11 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
TQPixmap anim(asize, asize);
TQPainter p2;
p2.begin(&anim, TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
p2.setPen(TQPen(tqpalette().active().text()));
p2.setPen(TQPen(palette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@ -743,7 +743,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
d->painter.begin(&d->pixmap);
d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background());
d->painter.drawPixmap(width()/2 - asize /2, asize, anim);
d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine));
d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine));
d->painter.drawRect(0, 0, width(), height());
d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter,
i18n("Loading image..."));
@ -759,7 +759,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
{
d->painter.begin(&d->pixmap);
d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background());
d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine));
d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine));
d->painter.drawRect(0, 0, width(), height());
d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter,
i18n("No profile available..."));

4
digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp
Unescape View File

@ -45,12 +45,12 @@ namespace Digikam
ICCPreviewWidget::ICCPreviewWidget(TQWidget *parent)
: KPreviewWidgetBase( parent )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );
TQVGroupBox *box = new TQVGroupBox( this );
box->setInsideMargin(0);
box->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
m_iccProfileWidget = new ICCProfileWidget(box);
tqlayout->addWidget( box );
layout->addWidget( box );
}
ICCPreviewWidget::~ICCPreviewWidget()

14
digikam/libs/widgets/metadata/gpswidget.cpp
Unescape View File

@ -105,7 +105,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
// --------------------------------------------------------
TQWidget *gpsInfo = new TQWidget(this);
TQGridLayout *tqlayout = new TQGridLayout(gpsInfo, 3, 2);
TQGridLayout *layout = new TQGridLayout(gpsInfo, 3, 2);
d->map = new WorldMapWidget(256, 256, gpsInfo);
// --------------------------------------------------------
@ -114,7 +114,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
box2->setInsideMargin(0);
box2->setInsideSpacing(0);
box2->setFrameStyle( TQFrame::NoFrame );
TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 0, 2, KDialog::spacingHint() );
TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 0, 2, KDialog::spacingHint() );
d->detailsCombo = new TQComboBox( false, box2 );
d->detailsButton = new TQPushButton(i18n("More Info..."), box2);
@ -129,12 +129,12 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
// --------------------------------------------------------
tqlayout->addMultiCellWidget(d->map, 0, 0, 0, 2);
tqlayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(),
layout->addMultiCellWidget(d->map, 0, 0, 0, 2);
layout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(),
TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 1, 1, 0, 2);
tqlayout->addMultiCellWidget(box2, 2, 2, 0, 0);
tqlayout->setColStretch(2, 10);
tqlayout->setRowStretch(3, 10);
layout->addMultiCellWidget(box2, 2, 2, 0, 0);
layout->setColStretch(2, 10);
layout->setRowStretch(3, 10);
// --------------------------------------------------------

2
digikam/libs/widgets/metadata/metadatawidget.cpp
Unescape View File

@ -295,7 +295,7 @@ void MetadataWidget::slotCopy2Clipboard()
++it;
}
TQApplication::tqclipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard);
TQApplication::clipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard);
}
void MetadataWidget::slotPrintMetadata()

2
digikam/libs/widgets/metadata/worldmapwidget.cpp
Unescape View File

@ -170,7 +170,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h)
}
else
{
p->fillRect(x, y, w, h, tqpalette().disabled().background());
p->fillRect(x, y, w, h, palette().disabled().background());
}
}

2
digikam/project/NEWS.0.9.0
Unescape View File

@ -265,7 +265,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b
127 ==> 131550 : digiKam/showfoto can't show jpeg image under PowerPC.
128 ==> 131549 : Endianess problem under Linux-PowerPC (with png images at least).
129 ==> 132011 : Add search criteria to take sub-tags into account.
130 ==> 131920 : Can't create preview folders with tqunicode characters in the name.
130 ==> 131920 : Can't create preview folders with unicode characters in the name.
131 ==> 132113 : Resize dialog limits image width/height to 4 digits.
132 ==> 132081 : Critical: ShowFoto silently aborts saving image when closed.
133 ==> 118535 : Add Border: use percent to designate border size.

2
digikam/project/NEWS.0.9.1
Unescape View File

@ -5,7 +5,7 @@ NEW FEATURES :
General : New native JPEG2000 image loader using Jasper library witch
can support 16 bits color depth pictures.
General : New optimized tqlayout to show Comments & Tags side bar contents.
General : New optimized layout to show Comments & Tags side bar contents.
General : Tags View from Comments & Tags side bar support drag & drop.
General : New Batch tool to sync all images metadata (EXIF/IPTC) with
digiKam database content.

12
digikam/showfoto/setup/setupeditor.cpp
Unescape View File

@ -97,7 +97,7 @@ SetupEditor::SetupEditor(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupEditorPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -176,11 +176,11 @@ SetupEditor::SetupEditor(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(interfaceOptionsGroup);
tqlayout->addWidget(exposureOptionsGroup);
tqlayout->addWidget(ExifGroupOptions);
tqlayout->addWidget(sortOptionsGroup);
tqlayout->addStretch();
layout->addWidget(interfaceOptionsGroup);
layout->addWidget(exposureOptionsGroup);
layout->addWidget(ExifGroupOptions);
layout->addWidget(sortOptionsGroup);
layout->addStretch();
// --------------------------------------------------------

10
digikam/showfoto/setup/setuptooltip.cpp
Unescape View File

@ -93,13 +93,13 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
: TQWidget(parent)
{
d = new SetupToolTipPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), parent);
TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when "
"the mouse hovers over a thumbbar item."));
tqlayout->addWidget(d->showToolTipsBox);
layout->addWidget(d->showToolTipsBox);
// --------------------------------------------------------
@ -120,7 +120,7 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
d->showImageDimBox = new TQCheckBox(i18n("Show image dimensions"), d->fileSettingBox);
TQWhatsThis::add( d->showImageDimBox, i18n("<p>Set this option to display the image dimensions in pixels."));
tqlayout->addWidget(d->fileSettingBox);
layout->addWidget(d->fileSettingBox);
// --------------------------------------------------------
@ -153,8 +153,8 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
TQWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings "
"used to take the image."));
tqlayout->addWidget(d->photoSettingBox);
tqlayout->addStretch();
layout->addWidget(d->photoSettingBox);
layout->addStretch();
// --------------------------------------------------------

4
digikam/showfoto/showfoto.cpp
Unescape View File

@ -413,7 +413,7 @@ void ShowFoto::setupUserArea()
TQWidget* widget = new TQWidget(this);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar tqlayout
if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar layout
{
TQHBoxLayout *hlay = new TQHBoxLayout(widget);
m_splitter = new TQSplitter(widget);
@ -428,7 +428,7 @@ void ShowFoto::setupUserArea()
hlay->addWidget(m_splitter);
hlay->addWidget(d->rightSidebar);
}
else //Qt::Horizontal thumbbar tqlayout
else //Qt::Horizontal thumbbar layout
{
m_splitter = new TQSplitter(Qt::Horizontal, widget);
TQWidget* widget2 = new TQWidget(m_splitter);

12
digikam/themedesigner/mainwindow.cpp
Unescape View File

@ -78,7 +78,7 @@ MainWindow::MainWindow()
// Actual views ------------------------------------------------
TQGridLayout* tqlayout = new TQGridLayout(this);
TQGridLayout* layout = new TQGridLayout(this);
TQSplitter* splitter = new TQSplitter(this);
splitter->setOrientation( Qt::Horizontal );
@ -131,10 +131,10 @@ MainWindow::MainWindow()
vlay->addWidget(m_borderColorBtn);
vlay->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
tqlayout->setMargin(5);
tqlayout->setSpacing(5);
tqlayout->addWidget(splitter, 0, 0);
tqlayout->addWidget(groupBox, 0, 1);
layout->setMargin(5);
layout->setSpacing(5);
layout->addWidget(splitter, 0, 0);
layout->addWidget(groupBox, 0, 1);
// -------------------------------------------------------------
@ -216,7 +216,7 @@ MainWindow::MainWindow()
closeButton->setText( "&Close" );
buttonLayout->addWidget( closeButton );
tqlayout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1);
layout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1);
connect(loadButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotLoad()));

2
digikam/utilities/cameragui/cameraiconview.cpp
Unescape View File

@ -739,7 +739,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&)
if (d->cameraUI->isBusy())
return;
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
return;

12
digikam/utilities/cameragui/camerainfodialog.cpp
Unescape View File

@ -50,32 +50,32 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co
// ----------------------------------------------------------
TQFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", KIcon::SizeMedium) );
TQVBoxLayout *p1tqlayout = new TQVBoxLayout( p1, 0, 6 );
TQVBoxLayout *p1layout = new TQVBoxLayout( p1, 0, 6 );
TQTextEdit *summaryView = new TQTextEdit(summary, TQString(), p1);
summaryView->setWordWrap(TQTextEdit::WidgetWidth);
summaryView->setReadOnly(true);
p1tqlayout->addWidget(summaryView);
p1layout->addWidget(summaryView);
// ----------------------------------------------------------
TQFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", KIcon::SizeMedium) );
TQVBoxLayout *p2tqlayout = new TQVBoxLayout( p2, 0, 6 );
TQVBoxLayout *p2layout = new TQVBoxLayout( p2, 0, 6 );
TQTextEdit *manualView = new TQTextEdit(manual, TQString(), p2);
manualView->setWordWrap(TQTextEdit::WidgetWidth);
manualView->setReadOnly(true);
p2tqlayout->addWidget(manualView);
p2layout->addWidget(manualView);
// ----------------------------------------------------------
TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", KIcon::SizeMedium) );
TQVBoxLayout *p3tqlayout = new TQVBoxLayout( p3, 0, 6 );
TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 );
TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3);
aboutView->setWordWrap(TQTextEdit::WidgetWidth);
aboutView->setReadOnly(true);
p3tqlayout->addWidget(aboutView);
p3layout->addWidget(aboutView);
}
CameraInfoDialog::~CameraInfoDialog()

10
digikam/utilities/cameragui/cameraui.cpp
Unescape View File

@ -364,7 +364,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->progress->hide();
TQWidget *frame = new TQWidget(plainPage());
TQHBoxLayout* tqlayout = new TQHBoxLayout(frame);
TQHBoxLayout* layout = new TQHBoxLayout(frame);
frame->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
KURLLabel *pixmapLogo = new KURLLabel( Digikam::webProjectUrl(), TQString(), frame );
@ -379,10 +379,10 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->anim = new AnimWidget(frame, pixmapLogo->height()-2);
tqlayout->setMargin(0);
tqlayout->setSpacing(0);
tqlayout->addWidget( pixmapLogo );
tqlayout->addWidget( d->anim );
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget( pixmapLogo );
layout->addWidget( d->anim );
d->freeSpaceWidget = new FreeSpaceWidget(plainPage(), 100);

6
digikam/utilities/cameragui/renamecustomizer.cpp
Unescape View File

@ -136,7 +136,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
setFrameStyle( TQFrame::NoFrame );
setRadioButtonExclusive(true);
setColumnLayout(0, Qt::Vertical);
TQGridLayout* mainLayout = new TQGridLayout(tqlayout(), 4, 1);
TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1);
// ----------------------------------------------------------------
@ -161,7 +161,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
TQWhatsThis::add( d->renameDefaultCaseType, i18n("<p>Set the method to use to change the case "
"of image filenames."));
TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->tqlayout() );
TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->layout() );
boxLayout1->addSpacing( 10 );
boxLayout1->addWidget( d->renameDefaultCase );
boxLayout1->addWidget( d->renameDefaultCaseType );
@ -180,7 +180,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameCustomBox->setInsideMargin(0);
d->renameCustomBox->setColumnLayout(0, Qt::Vertical);
TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->tqlayout(),
TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(),
6, 2, KDialogBase::spacingHint());
renameCustomBoxLayout->setColSpacing( 0, 10 );

4
digikam/utilities/imageeditor/canvas/canvas.cpp
Unescape View File

@ -637,7 +637,7 @@ void Canvas::drawRubber()
TQPoint pnt(r.x(), r.y());
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
style().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
TQRect(pnt.x(), pnt.y(), r.width(), r.height()),
colorGroup(), TQStyle::Style_Default,
TQStyleOption(colorGroup().base()));
@ -1265,7 +1265,7 @@ void Canvas::slotCopy()
delete [] data;
TQImage selImg = selDImg.copyTQImage();
TQApplication::tqclipboard()->setData(new TQImageDrag(selImg), TQClipboard::Clipboard);
TQApplication::clipboard()->setData(new TQImageDrag(selImg), TQClipboard::Clipboard);
TQApplication::restoreOverrideCursor ();
}

28
digikam/utilities/imageeditor/tools/imageprint.cpp
Unescape View File

@ -369,18 +369,18 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
readSettings();
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
tqlayout->setMargin( KDialog::marginHint() );
tqlayout->setSpacing( KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this );
layout->setMargin( KDialog::marginHint() );
layout->setSpacing( KDialog::spacingHint() );
// ------------------------------------------------------------------------
TQHBoxLayout *tqlayout2 = new TQHBoxLayout( tqlayout );
tqlayout2->setSpacing(3);
TQHBoxLayout *layout2 = new TQHBoxLayout( layout );
layout2->setSpacing(3);
TQLabel* textLabel = new TQLabel( this, "Image position:" );
textLabel->setText( i18n( "Image position:" ) );
tqlayout2->addWidget( textLabel );
layout2->addWidget( textLabel );
d->position = new KComboBox( false, this, "Print position" );
d->position->clear();
d->position->insertItem( i18n( "Top-Left" ) );
@ -392,21 +392,21 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
d->position->insertItem( i18n( "Bottom-Left" ) );
d->position->insertItem( i18n( "Bottom-Central" ) );
d->position->insertItem( i18n( "Bottom-Right" ) );
tqlayout2->addWidget( d->position );
layout2->addWidget( d->position );
TQSpacerItem *spacer1 = new TQSpacerItem( 101, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout2->addItem( spacer1 );
layout2->addItem( spacer1 );
d->addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this);
d->addFileName->setChecked( false );
tqlayout->addWidget( d->addFileName );
layout->addWidget( d->addFileName );
d->blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this);
d->blackwhite->setChecked( false );
tqlayout->addWidget (d->blackwhite );
layout->addWidget (d->blackwhite );
d->autoRotate = new TQCheckBox( i18n("&Auto-rotate page"), this );
d->autoRotate->setChecked( false );
tqlayout->addWidget( d->autoRotate );
layout->addWidget( d->autoRotate );
// ------------------------------------------------------------------------
@ -421,13 +421,13 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
cmbox->setStretchFactor(space, 10);
cmbox->setSpacing(KDialog::spacingHint());
tqlayout->addWidget(cmbox);
layout->addWidget(cmbox);
// ------------------------------------------------------------------------
TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this );
group->setRadioButtonExclusive( true );
tqlayout->addWidget( group );
layout->addWidget( group );
d->scaleToFit = new TQRadioButton( i18n("Scale image to &fit"), group );
d->scaleToFit->setChecked( true );
@ -437,7 +437,7 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
TQHBox *hb = new TQHBox( group );
hb->setSpacing( KDialog::spacingHint() );
TQWidget *w = new TQWidget(hb);
w->setFixedWidth(d->scale->tqstyle().subRect( TQStyle::SR_RadioButtonIndicator, d->scale ).width());
w->setFixedWidth(d->scale->style().subRect( TQStyle::SR_RadioButtonIndicator, d->scale ).width());
d->width = new KDoubleNumInput( hb, "exact width" );
d->width->setMinValue( 1 );

2
digikam/utilities/setup/cameraselection.cpp
Unescape View File

@ -176,7 +176,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, plainPage() );
box2->setFrameStyle( TQFrame::NoFrame );
TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 1, 5 );
TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 );
TQLabel* logo = new TQLabel( box2 );

6
digikam/utilities/setup/setupdcraw.cpp
Unescape View File

@ -74,13 +74,13 @@ SetupDcraw::SetupDcraw(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupDcrawPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
d->dcrawSettings = new DcrawSettingsWidget(parent, DcrawSettingsWidget::SIXTEENBITS);
d->dcrawSettings->setItemIconSet(0, SmallIconSet("kdcraw"));
d->dcrawSettings->setItemIconSet(1, SmallIconSet("whitebalance"));
d->dcrawSettings->setItemIconSet(2, SmallIconSet("lensdistortion"));
tqlayout->addWidget(d->dcrawSettings);
tqlayout->addStretch();
layout->addWidget(d->dcrawSettings);
layout->addStretch();
connect(d->dcrawSettings, TQT_SIGNAL(signalSixteenBitsImageToggled(bool)),
this, TQT_SLOT(slotSixteenBitsImageToggled(bool)));

8
digikam/utilities/setup/setupeditor.cpp
Unescape View File

@ -77,7 +77,7 @@ SetupEditor::SetupEditor(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupEditorPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -124,9 +124,9 @@ SetupEditor::SetupEditor(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(interfaceOptionsGroup);
tqlayout->addWidget(exposureOptionsGroup);
tqlayout->addStretch();
layout->addWidget(interfaceOptionsGroup);
layout->addWidget(exposureOptionsGroup);
layout->addStretch();
// --------------------------------------------------------

14
digikam/utilities/setup/setupgeneral.cpp
Unescape View File

@ -105,7 +105,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
{
d = new SetupGeneralPriv;
d->mainDialog = dialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -125,7 +125,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
connect(d->albumPathEdit, TQT_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT(slotPathEdited(const TQString&)) );
tqlayout->addWidget(albumPathBox);
layout->addWidget(albumPathBox);
// --------------------------------------------------------
@ -161,14 +161,14 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
TQWhatsThis::add( d->iconShowResolutionBox, i18n("<p>Set this option to show the image size in pixels "
"below the image thumbnail."));
tqlayout->addWidget(iconTextGroup);
layout->addWidget(iconTextGroup);
// --------------------------------------------------------
TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent);
interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical );
interfaceOptionsGroup->tqlayout()->setMargin(KDialog::marginHint());
TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->tqlayout(), 3, 4, KDialog::spacingHint());
interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint());
TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint());
d->iconTreeThumbLabel = new TQLabel(i18n("Sidebar thumbnail size:"), interfaceOptionsGroup);
d->iconTreeThumbSize = new TQComboBox(false, interfaceOptionsGroup);
@ -202,11 +202,11 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
"to load images, use it only if you have a fast computer."));
ifaceSettingsLayout->addMultiCellWidget(d->previewLoadFullImageSize, 3, 3, 0, 4);
tqlayout->addWidget(interfaceOptionsGroup);
layout->addWidget(interfaceOptionsGroup);
// --------------------------------------------------------
tqlayout->addStretch();
layout->addStretch();
readSettings();
adjustSize();

16
digikam/utilities/setup/setupicc.cpp
Unescape View File

@ -150,12 +150,12 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
{
d = new SetupICCPriv();
d->mainDialog = dialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint());
// --------------------------------------------------------
TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent);
TQGridLayout* grid = new TQGridLayout( colorPolicy->tqlayout(), 1, 2, KDialog::spacingHint());
TQGridLayout* grid = new TQGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint());
d->enableColorManagement = new TQCheckBox(colorPolicy);
d->enableColorManagement->setText(i18n("Enable Color Management"));
@ -193,7 +193,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
grid->addMultiCellWidget(d->behaviourGB, 1, 1, 0, 2);
grid->setColStretch(1, 10);
tqlayout->addWidget(colorPolicy);
layout->addWidget(colorPolicy);
// --------------------------------------------------------
@ -206,12 +206,12 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
TQWhatsThis::add( d->defaultPathKU, i18n("<p>Default path to the color profiles folder. "
"You must store all your color profiles in this directory.</p>"));
tqlayout->addWidget(d->defaultPathGB);
layout->addWidget(d->defaultPathGB);
// --------------------------------------------------------
d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent);
TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->tqlayout(), 4, 3, KDialog::spacingHint());
TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint());
grid2->setColStretch(2, 10);
d->managedView = new TQCheckBox(d->profilesGB);
@ -289,7 +289,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
grid2->addMultiCellWidget(d->proofProfilesKC, 4, 4, 2, 2);
grid2->addMultiCellWidget(d->infoProofProfiles, 4, 4, 3, 3);
tqlayout->addWidget(d->profilesGB);
layout->addWidget(d->profilesGB);
// --------------------------------------------------------
@ -334,8 +334,8 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
"<p>This intent is most suitable for business graphics such as charts, where it is more important that the "
"colors be vivid and contrast well with each other rather than a specific color.</p></li></ul>"));
tqlayout->addWidget(d->advancedSettingsGB);
tqlayout->addStretch();
layout->addWidget(d->advancedSettingsGB);
layout->addStretch();
// --------------------------------------------------------

14
digikam/utilities/setup/setupidentity.cpp
Unescape View File

@ -70,7 +70,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupIdentityPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -79,7 +79,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this));
TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent);
TQGridLayout* grid = new TQGridLayout( photographerIdGroup->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint());
TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup);
d->authorEdit = new KLineEdit(photographerIdGroup);
@ -109,7 +109,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
// --------------------------------------------------------
TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent);
TQGridLayout* grid2 = new TQGridLayout( creditsGroup->tqlayout(), 2, 1, KDialog::spacingHint());
TQGridLayout* grid2 = new TQGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint());
TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup);
d->creditEdit = new KLineEdit(creditsGroup);
@ -175,10 +175,10 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(photographerIdGroup);
tqlayout->addWidget(creditsGroup);
tqlayout->addWidget(note);
tqlayout->addStretch();
layout->addWidget(photographerIdGroup);
layout->addWidget(creditsGroup);
layout->addWidget(note);
layout->addStretch();
readSettings();
}

6
digikam/utilities/setup/setuplighttable.cpp
Unescape View File

@ -67,7 +67,7 @@ SetupLightTable::SetupLightTable(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupLightTablePriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -93,8 +93,8 @@ SetupLightTable::SetupLightTable(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(interfaceOptionsGroup);
tqlayout->addStretch();
layout->addWidget(interfaceOptionsGroup);
layout->addStretch();
// --------------------------------------------------------

20
digikam/utilities/setup/setupmime.cpp
Unescape View File

@ -80,12 +80,12 @@ SetupMime::SetupMime(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupMimePriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
// --------------------------------------------------------
TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent);
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox);
logoLabel1->setPixmap(DesktopIcon("image"));
@ -111,12 +111,12 @@ SetupMime::SetupMime(TQWidget* parent )
grid1->addMultiCellWidget(hbox1, 1, 1, 1, 1);
grid1->setColStretch(1, 10);
tqlayout->addWidget(imageFileFilterBox);
layout->addWidget(imageFileFilterBox);
// --------------------------------------------------------
TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent);
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox);
logoLabel2->setPixmap(DesktopIcon("video"));
@ -142,12 +142,12 @@ SetupMime::SetupMime(TQWidget* parent )
grid2->addMultiCellWidget(hbox2, 1, 1, 1, 1);
grid2->setColStretch(1, 10);
tqlayout->addWidget(movieFileFilterBox);
layout->addWidget(movieFileFilterBox);
// --------------------------------------------------------
TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent);
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox);
logoLabel3->setPixmap(DesktopIcon("sound"));
@ -173,12 +173,12 @@ SetupMime::SetupMime(TQWidget* parent )
grid3->addMultiCellWidget(hbox3, 1, 1, 1, 1);
grid3->setColStretch(1, 10);
tqlayout->addWidget(audioFileFilterBox);
layout->addWidget(audioFileFilterBox);
// --------------------------------------------------------
TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent);
TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox);
logoLabel4->setPixmap(DesktopIcon("kdcraw"));
@ -203,8 +203,8 @@ SetupMime::SetupMime(TQWidget* parent )
grid4->addMultiCellWidget(hbox4, 1, 1, 1, 1);
grid4->setColStretch(1, 10);
tqlayout->addWidget(rawFileFilterBox);
tqlayout->addStretch();
layout->addWidget(rawFileFilterBox);
layout->addStretch();
// --------------------------------------------------------

12
digikam/utilities/setup/setupmisc.cpp
Unescape View File

@ -65,31 +65,31 @@ SetupMisc::SetupMisc(TQWidget* parent)
d = new SetupMiscPriv;
TQVBoxLayout *mainLayout = new TQVBoxLayout(parent);
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
// --------------------------------------------------------
d->showTrashDeleteDialogCheck = new TQCheckBox(i18n("Show confirmation dialog when moving items to the &trash"), this);
tqlayout->addWidget(d->showTrashDeleteDialogCheck);
layout->addWidget(d->showTrashDeleteDialogCheck);
// --------------------------------------------------------
d->sidebarApplyDirectlyCheck = new TQCheckBox(i18n("Apply changes in the &right sidebar without confirmation"), this);
tqlayout->addWidget(d->sidebarApplyDirectlyCheck);
layout->addWidget(d->sidebarApplyDirectlyCheck);
// --------------------------------------------------------
d->showSplashCheck = new TQCheckBox(i18n("&Show splash screen at startup"), this);
tqlayout->addWidget(d->showSplashCheck);
layout->addWidget(d->showSplashCheck);
// --------------------------------------------------------
d->scanAtStart = new TQCheckBox(i18n("&Scan for new items on startup (slows down startup)"), this);
tqlayout->addWidget(d->scanAtStart);
layout->addWidget(d->scanAtStart);
// --------------------------------------------------------
tqlayout->addStretch();
layout->addStretch();
readSettings();
adjustSize();
mainLayout->addWidget(this);

10
digikam/utilities/setup/setupplugins.cpp
Unescape View File

@ -70,7 +70,7 @@ SetupPlugins::SetupPlugins(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupPluginsPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
TQVBoxLayout *layout = new TQVBoxLayout(parent);
d->pluginsNumber = new TQLabel(parent);
d->pluginsNumber->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
@ -78,10 +78,10 @@ SetupPlugins::SetupPlugins(TQWidget* parent )
TQString pluginsListHelp = i18n("<p>A list of available Kipi plugins appears below.");
TQWhatsThis::add(d->kipiConfig, pluginsListHelp);
tqlayout->addWidget(d->pluginsNumber);
tqlayout->addWidget(d->kipiConfig);
tqlayout->setMargin(0);
tqlayout->setSpacing(KDialog::spacingHint());
layout->addWidget(d->pluginsNumber);
layout->addWidget(d->kipiConfig);
layout->setMargin(0);
layout->setSpacing(KDialog::spacingHint());
}
SetupPlugins::~SetupPlugins()

22
digikam/utilities/setup/setupslideshow.cpp
Unescape View File

@ -77,7 +77,7 @@ SetupSlideShow::SetupSlideShow(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupSlideShowPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent );
TQVBoxLayout *layout = new TQVBoxLayout( parent );
d->delayInput = new KIntNumInput(5, parent);
d->delayInput->setRange(1, 3600, 1, true );
@ -109,16 +109,16 @@ SetupSlideShow::SetupSlideShow(TQWidget* parent )
d->printComment = new TQCheckBox(i18n("Print image caption"), parent);
TQWhatsThis::add( d->printComment, i18n("<p>Print the image caption at the bottom of the screen."));
tqlayout->addWidget(d->delayInput);
tqlayout->addWidget(d->startWithCurrent);
tqlayout->addWidget(d->loopMode);
tqlayout->addWidget(d->printName);
tqlayout->addWidget(d->printDate);
tqlayout->addWidget(d->printApertureFocal);
tqlayout->addWidget(d->printExpoSensitivity);
tqlayout->addWidget(d->printMakeModel);
tqlayout->addWidget(d->printComment);
tqlayout->addStretch();
layout->addWidget(d->delayInput);
layout->addWidget(d->startWithCurrent);
layout->addWidget(d->loopMode);
layout->addWidget(d->printName);
layout->addWidget(d->printDate);
layout->addWidget(d->printApertureFocal);
layout->addWidget(d->printExpoSensitivity);
layout->addWidget(d->printMakeModel);
layout->addWidget(d->printComment);
layout->addStretch();
readSettings();
}

12
digikam/utilities/setup/setuptooltip.cpp
Unescape View File

@ -104,13 +104,13 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
: TQWidget(parent)
{
d = new SetupToolTipPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), parent);
TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when "
"the mouse hovers over an album item."));
tqlayout->addWidget(d->showToolTipsBox);
layout->addWidget(d->showToolTipsBox);
// --------------------------------------------------------
@ -131,7 +131,7 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
d->showImageDimBox = new TQCheckBox(i18n("Show image dimensions"), d->fileSettingBox);
TQWhatsThis::add( d->showImageDimBox, i18n("<p>Set this option to display the image dimensions in pixels."));
tqlayout->addWidget(d->fileSettingBox);
layout->addWidget(d->fileSettingBox);
// --------------------------------------------------------
@ -164,7 +164,7 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
TQWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings "
"used to take the image."));
tqlayout->addWidget(d->photoSettingBox);
layout->addWidget(d->photoSettingBox);
// --------------------------------------------------------
@ -182,8 +182,8 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
d->showRatingBox = new TQCheckBox(i18n("Show image rating"), d->digikamSettingBox);
TQWhatsThis::add( d->showRatingBox, i18n("<p>Set this option to display the image rating."));
tqlayout->addWidget(d->digikamSettingBox);
tqlayout->addStretch();
layout->addWidget(d->digikamSettingBox);
layout->addStretch();
// --------------------------------------------------------

Write Preview
Loading…
Cancel
Save