diff options
Diffstat (limited to 'kutils')
-rw-r--r-- | kutils/kcmodulecontainer.cpp | 2 | ||||
-rw-r--r-- | kutils/kcmoduleloader.cpp | 2 | ||||
-rw-r--r-- | kutils/kcmoduleproxy.cpp | 8 | ||||
-rw-r--r-- | kutils/kcmultidialog.cpp | 2 | ||||
-rw-r--r-- | kutils/kfind.cpp | 2 | ||||
-rw-r--r-- | kutils/kfinddialog.cpp | 20 | ||||
-rw-r--r-- | kutils/kmultitabbar.cpp | 124 | ||||
-rw-r--r-- | kutils/kmultitabbar.h | 2 | ||||
-rw-r--r-- | kutils/kpluginselector.cpp | 6 | ||||
-rw-r--r-- | kutils/kreplace.cpp | 2 | ||||
-rw-r--r-- | kutils/kreplace.h | 2 | ||||
-rw-r--r-- | kutils/kreplacedialog.cpp | 2 | ||||
-rw-r--r-- | kutils/ksettings/componentsdialog.cpp | 2 | ||||
-rw-r--r-- | kutils/ksettings/pluginpage.cpp | 2 |
14 files changed, 89 insertions, 89 deletions
diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp index 2377d1be1..c613e4385 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/kcmodulecontainer.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <layout.h> +#include <tqlayout.h> #include <tqpixmap.h> #include <tqstringlist.h> #include <tqtabwidget.h> diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp index 5f3a98cb2..642e6f1bc 100644 --- a/kutils/kcmoduleloader.cpp +++ b/kutils/kcmoduleloader.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <kapplication.h> #include <kdebug.h> diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 182c7514b..b9f297d6e 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -24,10 +24,10 @@ #include <tqfileinfo.h> #include <tqframe.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpoint.h> #include <tqscrollview.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqvbox.h> #include <tqwhatsthis.h> #include <tqwidget.h> @@ -311,7 +311,7 @@ void KCModuleProxy::runAsRoot() TQPalette pal( red ); pal.setColor( TQColorGroup::Background, - colorGroup().background() ); + tqcolorGroup().background() ); d->embedFrame->setPalette( pal ); d->embedFrame->setLineWidth( 2 ); d->embedFrame->setMidLineWidth( 2 ); @@ -416,7 +416,7 @@ void KCModuleProxy::rootExited() /* Such that the "ordinary" module loads again */ d->rootMode = false; - d->topLayout->invalidate(); + d->topLayout->tqinvalidate(); TQShowEvent ev; showEvent( &ev ); diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index b5f67684c..768f787fe 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -23,7 +23,7 @@ #include <tqcursor.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kaboutdata.h> diff --git a/kutils/kfind.cpp b/kutils/kfind.cpp index f0f55cbc6..7b2da6899 100644 --- a/kutils/kfind.cpp +++ b/kutils/kfind.cpp @@ -26,7 +26,7 @@ #include <kmessagebox.h> #include <tqlabel.h> #include <tqregexp.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqguardedptr.h> #include <tqptrvector.h> #include <kdebug.h> diff --git a/kutils/kfinddialog.cpp b/kutils/kfinddialog.cpp index 7a8913679..4bf564b2e 100644 --- a/kutils/kfinddialog.cpp +++ b/kutils/kfinddialog.cpp @@ -23,7 +23,7 @@ #include <tqcursor.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> #include <tqregexp.h> @@ -117,9 +117,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->setMargin( 0 ); m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page); - m_findGrp->layout()->setSpacing( KDialog::spacingHint() ); - // m_findGrp->layout()->setMargin( KDialog::marginHint() ); - m_findLayout = new TQGridLayout(m_findGrp->layout()); + m_findGrp->tqlayout()->setSpacing( KDialog::spacingHint() ); + // m_findGrp->tqlayout()->setMargin( KDialog::marginHint() ); + m_findLayout = new TQGridLayout(m_findGrp->tqlayout()); m_findLayout->setSpacing( KDialog::spacingHint() ); // m_findLayout->setMargin( KDialog::marginHint() ); @@ -138,9 +138,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->addWidget(m_findGrp); m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page); - m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() ); - // m_replaceGrp->layout()->setMargin( KDialog::marginHint() ); - m_replaceLayout = new TQGridLayout(m_replaceGrp->layout()); + m_replaceGrp->tqlayout()->setSpacing( KDialog::spacingHint() ); + // m_replaceGrp->tqlayout()->setMargin( KDialog::marginHint() ); + m_replaceLayout = new TQGridLayout(m_replaceGrp->tqlayout()); m_replaceLayout->setSpacing( KDialog::spacingHint() ); // m_replaceLayout->setMargin( KDialog::marginHint() ); @@ -159,9 +159,9 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->addWidget(m_replaceGrp); m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page); - m_optionGrp->layout()->setSpacing(KDialog::spacingHint()); - // m_optionGrp->layout()->setMargin(KDialog::marginHint()); - optionsLayout = new TQGridLayout(m_optionGrp->layout()); + m_optionGrp->tqlayout()->setSpacing(KDialog::spacingHint()); + // m_optionGrp->tqlayout()->setMargin(KDialog::marginHint()); + optionsLayout = new TQGridLayout(m_optionGrp->tqlayout()); optionsLayout->setSpacing( KDialog::spacingHint() ); // optionsLayout->setMargin( KDialog::marginHint() ); diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp index 2d1043fbe..9c47e87e8 100644 --- a/kutils/kmultitabbar.cpp +++ b/kutils/kmultitabbar.cpp @@ -28,7 +28,7 @@ #include "kmultitabbar_p.moc" #include <tqbutton.h> #include <tqpopupmenu.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqtooltip.h> #include <tqfontmetrics.h> @@ -82,7 +82,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) { m_style=style; for (uint i=0;i<m_tabs.count();i++) - m_tabs.at(i)->setStyle(m_style); + m_tabs.tqat(i)->setStyle(m_style); if ( (m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON ) ) { @@ -106,11 +106,11 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) } addChild(box); for (uint i=0;i<m_tabs.count();i++) - mainLayout->add(m_tabs.at(i)); + mainLayout->add(m_tabs.tqat(i)); mainLayout->setAutoAdd(true); } - viewport()->repaint(); + viewport()->tqrepaint(); } void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip if (m_position==KMultiTabBar::Right) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(1,0,1,viewport()->height()); @@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip else if (m_position==KMultiTabBar::Left) { - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(23,0,23,viewport()->height()); paint->drawLine(22,0,22,viewport()->height()); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); } else if (m_position==KMultiTabBar::Bottom) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,viewport()->width(),0); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,1,viewport()->width(),1); } else { - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(0,23,viewport()->width(),23); paint->drawLine(0,22,viewport()->width(),22); -/* paint->setPen(colorGroup().shadow()); +/* paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height());*/ } @@ -175,7 +175,7 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev) uint ulen=0;\ diff=0; \ for (uint i2=i;i2<tabCount;i2++) {\ - uint l1=m_tabs.at(i2)->neededSize();\ + uint l1=m_tabs.tqat(i2)->neededSize();\ if ((ulen+l1)>space){\ if (ulen==0) diff=0;\ else diff=((float)(space-ulen))/(i2-i);\ @@ -208,7 +208,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { const uint tabCount=m_tabs.count(); for (uint i=0;i<tabCount;i++) { cnt++; - tmp+=m_tabs.at(i)->neededSize(); + tmp+=m_tabs.tqat(i)->neededSize(); if (tmp>space) { if (cnt>1)i--; else if (i==(tabCount-1)) break; @@ -232,7 +232,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { //kdDebug()<<"m_lines recalculated="<<m_lines<<endl; for (uint i=0;i<tabCount;i++) { - KMultiTabBarTab *tab=m_tabs.at(i); + KMultiTabBarTab *tab=m_tabs.tqat(i); cnt++; tmp+=tab->neededSize()+diff; if (tmp>space) { @@ -258,7 +258,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { //kdDebug()<<"starting new line:"<<lines<<endl; } else { - //kdDebug()<<"Placing line on line:"<<lines<<" pos: (x/y)=("<<tmp-m_tabs.at(i)->neededSize()<<"/"<<lines*24<<")"<<endl; + //kdDebug()<<"Placing line on line:"<<lines<<" pos: (x/y)=("<<tmp-m_tabs.tqat(i)->neededSize()<<"/"<<lines*24<<")"<<endl; //kdDebug()<<"diff="<<diff<<endl; tab->removeEventFilter(this); tab->move(NEARBYINT(tmp-tab->neededSize()),lines*24); @@ -279,7 +279,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { tmp=-diff; for (uint i=0;i<tabCount;i++) { - KMultiTabBarTab *tab=m_tabs.at(i); + KMultiTabBarTab *tab=m_tabs.tqat(i); cnt++; tmp+=tab->neededSize()+diff; if (tmp>space) { @@ -311,7 +311,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { } else { int size=0; /*move the calculation into another function and call it only on add tab and tab click events*/ for (int i=0;i<(int)m_tabs.count();i++) - size+=(m_barMode==KMultiTabBar::Vertical?m_tabs.at(i)->height():m_tabs.at(i)->width()); + size+=(m_barMode==KMultiTabBar::Vertical?m_tabs.tqat(i)->height():m_tabs.tqat(i)->width()); if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) box->setGeometry(0,0,size,height()); else box->setGeometry(0,0,width(),size); @@ -351,7 +351,7 @@ int KMultiTabBarInternal::appendTab(const TQPixmap &pic ,int id,const TQString& if (m_expandedTabSize<tab->neededSize()) { m_expandedTabSize=tab->neededSize(); for (uint i=0;i<m_tabs.count();i++) - m_tabs.at(i)->setSize(m_expandedTabSize); + m_tabs.tqat(i)->setSize(m_expandedTabSize); } else tab->setSize(m_expandedTabSize); } else tab->updateState(); @@ -364,7 +364,7 @@ void KMultiTabBarInternal::removeTab(int id) { for (uint pos=0;pos<m_tabs.count();pos++) { - if (m_tabs.at(pos)->id()==id) + if (m_tabs.tqat(pos)->id()==id) { m_tabs.remove(pos); resizeEvent(0); @@ -377,8 +377,8 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p { m_position=pos; for (uint i=0;i<m_tabs.count();i++) - m_tabs.at(i)->setTabsPosition(m_position); - viewport()->repaint(); + m_tabs.tqat(i)->setTabsPosition(m_position); + viewport()->tqrepaint(); } KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup, @@ -434,13 +434,13 @@ void KMultiTabBarButton::slotClicked() void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos) { m_position=pos; - repaint(); + tqrepaint(); } void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) { m_style=style; - repaint(); + tqrepaint(); } void KMultiTabBarButton::hideEvent( TQHideEvent* he) { @@ -472,7 +472,7 @@ TQSize KMultiTabBarButton::sizeHint() const } #endif if ( isMenuButton() ) - w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); @@ -482,7 +482,7 @@ TQSize KMultiTabBarButton::sizeHint() const TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::fromLatin1("XXXX"); + s = TQString::tqfromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -525,7 +525,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos) } setPosition(pos); -// repaint(); +// tqrepaint(); } void KMultiTabBarTab::setIcon(const TQString& icon) @@ -650,8 +650,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { if (isOn()) st|=TQStyle::Style_On; - tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); - tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); + tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); switch (m_position) { case KMultiTabBar::Left: @@ -667,8 +667,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { paint->drawPixmap(0,0,pixmap); break; } -// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), -// colorGroup(),TQStyle::Style_Enabled); +// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +// tqcolorGroup(),TQStyle::Style_Enabled); } @@ -678,58 +678,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap pixmap; if ( iconSet()) pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); - paint->fillRect(0, 0, 24, 24, colorGroup().background()); + paint->fillRect(0, 0, 24, 24, tqcolorGroup().background()); if (!isOn()) { if (m_position==KMultiTabBar::Right) { - paint->fillRect(0,0,21,21,TQBrush(colorGroup().background())); + paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background())); - paint->setPen(colorGroup().background().dark(150)); + paint->setPen(tqcolorGroup().background().dark(150)); paint->drawLine(0,22,23,22); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,23); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(1,0,1,23); } else if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) { - paint->fillRect(0,1,23,22,TQBrush(colorGroup().background())); + paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(23,0,23,23); - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(0,22,23,22); paint->drawLine(0,23,23,23); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,23,0); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,1,23,1); } else { - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,23,23,23); - paint->fillRect(0,0,23,21,TQBrush(colorGroup().background())); + paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(23,0,23,23); paint->drawLine(22,0,22,23); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,23); } @@ -740,12 +740,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) { if (m_position==KMultiTabBar::Right) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); paint->drawLine(23,0,23,height()-1); paint->drawLine(22,0,22,height()-1); - paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light())); + paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) @@ -755,9 +755,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); - painter.setPen(colorGroup().text()); + painter.setPen(tqcolorGroup().text()); painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(90); @@ -769,25 +769,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) else if (m_position==KMultiTabBar::Top) { - paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light())); + paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(colorGroup().text()); + paint->setPen(tqcolorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } } else if (m_position==KMultiTabBar::Bottom) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,23,width()-1,23); paint->drawLine(0,22,width()-1,22); - paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light())); + paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(colorGroup().text()); + paint->setPen(tqcolorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } @@ -796,10 +796,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); - paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light())); + paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { @@ -809,9 +809,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); - painter.setPen(colorGroup().text()); + painter.setPen(tqcolorGroup().text()); painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(-90); @@ -923,7 +923,7 @@ void KMultiTabBar::removeButton(int id) { for (uint pos=0;pos<m_buttons.count();pos++) { - if (m_buttons.at(pos)->id()==id) + if (m_buttons.tqat(pos)->id()==id) { m_buttons.take(pos)->deleteLater(); break; @@ -978,7 +978,7 @@ void KMultiTabBar::setPosition(KMultiTabBarPosition pos) m_position=pos; m_internal->setPosition(pos); for (uint i=0;i<m_buttons.count();i++) - m_buttons.at(i)->setPosition(pos); + m_buttons.tqat(i)->setPosition(pos); } KMultiTabBar::KMultiTabBarPosition KMultiTabBar::position() const @@ -988,8 +988,8 @@ KMultiTabBar::KMultiTabBarPosition KMultiTabBar::position() const void KMultiTabBar::fontChange(const TQFont& /* oldFont */) { for (uint i=0;i<tabs()->count();i++) - tabs()->at(i)->resize(); - repaint(); + tabs()->tqat(i)->resize(); + tqrepaint(); } TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();} diff --git a/kutils/kmultitabbar.h b/kutils/kmultitabbar.h index 1e3ed5b59..ffc3fca5f 100644 --- a/kutils/kmultitabbar.h +++ b/kutils/kmultitabbar.h @@ -28,7 +28,7 @@ #include <tqscrollview.h> #include <tqvbox.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> #include <tqptrlist.h> #include <tqpushbutton.h> diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 1ba9f89c3..585a02b6f 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -26,7 +26,7 @@ #include <tqstrlist.h> #include <tqfile.h> #include <tqstring.h> -#include <layout.h> +#include <tqlayout.h> #include <tqptrlist.h> #include <tqwidgetstack.h> #include <tqcursor.h> @@ -115,8 +115,8 @@ void KPluginListViewToolTip::maybeTip( const TQPoint &pos ) "<tr><td><b>License:</b></td><td>%4</td></tr></table></qt>" ).arg( item->pluginInfo()->comment(), item->pluginInfo()->author(), item->pluginInfo()->version(), item->pluginInfo()->license() ); - //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: itemRect: " << itemRect << ", tooltip: " << toolTip << endl; - tip( m_listView->itemRect( item ), toolTip ); + //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: tqitemRect: " << tqitemRect << ", tooltip: " << toolTip << endl; + tip( m_listView->tqitemRect( item ), toolTip ); } struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate diff --git a/kutils/kreplace.cpp b/kutils/kreplace.cpp index f825e93cc..204384ae3 100644 --- a/kutils/kreplace.cpp +++ b/kutils/kreplace.cpp @@ -50,7 +50,7 @@ KReplaceNextDialog::KReplaceNextDialog(TQWidget *parent) : { m_mainLabel = new TQLabel( this ); setMainWidget( m_mainLabel ); - resize(minimumSize()); + resize(tqminimumSize()); } void KReplaceNextDialog::setLabel( const TQString& pattern, const TQString& replacement ) diff --git a/kutils/kreplace.h b/kutils/kreplace.h index ea385189b..d4e9792e2 100644 --- a/kutils/kreplace.h +++ b/kutils/kreplace.h @@ -238,7 +238,7 @@ signals: * * Extra care must be taken to properly implement the "no prompt-on-replace" case. * For instance highlight isn't emitted in that case (some code might rely on it), - * and for performance reasons one should repaint after replace() ONLY if + * and for performance reasons one should tqrepaint after replace() ONLY if * prompt-on-replace was selected. * * @param text The text, in which the replacement has already been done. diff --git a/kutils/kreplacedialog.cpp b/kutils/kreplacedialog.cpp index 8f1df2ed1..88c006b4d 100644 --- a/kutils/kreplacedialog.cpp +++ b/kutils/kreplacedialog.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <kcombobox.h> #include <klocale.h> diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp index 5328e9704..097d1f6d7 100644 --- a/kutils/ksettings/componentsdialog.cpp +++ b/kutils/ksettings/componentsdialog.cpp @@ -19,7 +19,7 @@ #include "ksettings/componentsdialog.h" #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <klistview.h> #include <tqlabel.h> #include <tqheader.h> diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp index f1f220d36..99ea904f2 100644 --- a/kutils/ksettings/pluginpage.cpp +++ b/kutils/ksettings/pluginpage.cpp @@ -19,7 +19,7 @@ #include "ksettings/pluginpage.h" #include "kpluginselector.h" -#include <layout.h> +#include <tqlayout.h> #include <kdialog.h> #include "ksettings/dispatcher.h" |