Rename obsolete tq methods to standard names

11 files changed, 53 insertions, 53 deletions

diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp
index 8559660..55307ac 100644
--- a/digikam/digikam/albumfiletip.cpp
+++ b/digikam/digikam/albumfiletip.cpp
@@ -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();
 }
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index 6d97e80..adb0f2e 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -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;
 
diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp
index f1bac2e..fb376b9 100644
--- a/digikam/digikam/firstrun.cpp
+++ b/digikam/digikam/firstrun.cpp
@@ -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()) );
diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp
index 5350176..eae4491 100644
--- a/digikam/digikam/folderitem.cpp
+++ b/digikam/digikam/folderitem.cpp
@@ -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));
     }
diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp
index 3c7e1d6..4160dbf 100644
--- a/digikam/digikam/folderview.cpp
+++ b/digikam/digikam/folderview.cpp
@@ -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));
 }
diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp
index c4cf184..b9a5ac9 100644
--- a/digikam/digikam/iconview.cpp
+++ b/digikam/digikam/iconview.cpp
@@ -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,
diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp
index 375268f..0504652 100644
--- a/digikam/digikam/ratingwidget.cpp
+++ b/digikam/digikam/ratingwidget.cpp
@@ -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()));
diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp
index 2c9ca5a..0a10e23 100644
--- a/digikam/digikam/searchadvanceddialog.cpp
+++ b/digikam/digikam/searchadvanceddialog.cpp
@@ -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();
diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp
index 8bbfffb..402313d 100644
--- a/digikam/digikam/searchwidgets.cpp
+++ b/digikam/digikam/searchwidgets.cpp
@@ -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;
diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp
index 99ccb19..8968630 100644
--- a/digikam/digikam/tagspopupmenu.cpp
+++ b/digikam/digikam/tagspopupmenu.cpp
@@ -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:
diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp
index 956fc1c..99eab6a 100644
--- a/digikam/digikam/timelinewidget.cpp
+++ b/digikam/digikam/timelinewidget.cpp
@@ -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);
     }