From b88830e9111dc4375bc1461c3f7b3e7b3e73f733 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:28:11 -0600 Subject: Rename old tq methods that no longer need a unique name --- konq-plugins/adblock/adblock.cpp | 2 +- konq-plugins/akregator/konqfeedicon.cpp | 2 +- konq-plugins/domtreeviewer/attributeeditdialog.ui | 2 +- konq-plugins/domtreeviewer/domtreeviewbase.ui | 8 ++--- konq-plugins/domtreeviewer/domtreewindow.cpp | 2 +- konq-plugins/domtreeviewer/elementeditdialog.ui | 2 +- konq-plugins/domtreeviewer/messagedialog.ui | 2 +- konq-plugins/domtreeviewer/texteditdialog.ui | 2 +- konq-plugins/fsview/inode.cpp | 2 +- konq-plugins/fsview/treemap.cpp | 40 +++++++++++----------- konq-plugins/fsview/treemap.h | 2 +- konq-plugins/imagerotation/exif.py | 2 +- konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 16 ++++----- konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui | 4 +-- konq-plugins/microformat/konqmficon.cpp | 2 +- konq-plugins/minitools/minitoolsplugin.cpp | 4 +-- konq-plugins/searchbar/searchbar.cpp | 6 ++-- .../sidebar/mediaplayer/mediawidget_skel.ui | 20 +++++------ .../mediaplayer/mediawidget_skel_designer.ui | 20 +++++------ konq-plugins/sidebar/metabar/src/configdialog.cpp | 22 ++++++------ konq-plugins/sidebar/metabar/src/defaultplugin.cpp | 4 +-- konq-plugins/sidebar/metabar/src/httpplugin.cpp | 2 +- konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 12 +++---- .../sidebar/metabar/src/protocolplugin.cpp | 2 +- konq-plugins/sidebar/newsticker/norsswidget.cpp | 2 +- konq-plugins/sidebar/newsticker/nspanel.cpp | 2 +- .../sidebar/newsticker/nsstacktabwidget.cpp | 2 +- konq-plugins/uachanger/uachangerplugin.cpp | 2 +- 28 files changed, 95 insertions(+), 95 deletions(-) (limited to 'konq-plugins') diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 57cf2cc..c18c061 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -95,7 +95,7 @@ void AdBlock::initLabel() KIconLoader *loader = instance()->iconLoader(); m_label->setFixedHeight(loader->currentSize(KIcon::Small)); - m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_label->setUseCursor(false); m_label->setPixmap(loader->loadIcon("filter", KIcon::Small)); diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 57bddf3..9350bb4 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon() // from khtmlpart's ualabel m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_feedIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_feedIcon->setUseCursor(false); //FIXME hackish m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png"))); diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui index c0abc0e..1a1eafa 100644 --- a/konq-plugins/domtreeviewer/attributeeditdialog.ui +++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui @@ -119,7 +119,7 @@ Expanding - + 121 20 diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui index 0d3a204..9d1c575 100644 --- a/konq-plugins/domtreeviewer/domtreeviewbase.ui +++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui @@ -12,7 +12,7 @@ 508 - + 600 380 @@ -108,7 +108,7 @@ Fixed - + 10 20 @@ -173,7 +173,7 @@ groupBox1 - + 300 400 @@ -424,7 +424,7 @@ Expanding - + 81 20 diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 11b6a1d..5fc3b87 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event) void DOMTreeWindow::addMessage(int msg_id, const TQString &msg) { - TQDateTime t(TQDateTime::tqcurrentDateTime()); + TQDateTime t(TQDateTime::currentDateTime()); TQString fullmsg = t.toString(); fullmsg += ":"; diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui index d703eeb..be8eaaf 100644 --- a/konq-plugins/domtreeviewer/elementeditdialog.ui +++ b/konq-plugins/domtreeviewer/elementeditdialog.ui @@ -145,7 +145,7 @@ Expanding - + 60 20 diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui index c6d20bc..35a7b38 100644 --- a/konq-plugins/domtreeviewer/messagedialog.ui +++ b/konq-plugins/domtreeviewer/messagedialog.ui @@ -68,7 +68,7 @@ Expanding - + 300 20 diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui index b68a31e..250df1b 100644 --- a/konq-plugins/domtreeviewer/texteditdialog.ui +++ b/konq-plugins/domtreeviewer/texteditdialog.ui @@ -101,7 +101,7 @@ Expanding - + 60 20 diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index d4875c2..c84f5d5 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -284,7 +284,7 @@ TQColor Inode::backColor() const if (id>0) n = TQString::number(id); if (n.isEmpty()) - return widget()->tqcolorGroup().button(); + return widget()->colorGroup().button(); const char* str = n.ascii(); int h = 0, s = 100; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index fc83601..bcc5b3e 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -1491,11 +1491,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << " Checking " << i->path(0).join("/") << " (" - << i->tqitemRect().x() << "/" << i->tqitemRect().y() - << "-" << i->tqitemRect().width() - << "x" << i->tqitemRect().height() << ")" << endl; + << i->itemRect().x() << "/" << i->itemRect().y() + << "-" << i->itemRect().width() + << "x" << i->itemRect().height() << ")" << endl; - if (i->tqitemRect().contains(x, y)) { + if (i->itemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1513,7 +1513,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "): Got " << p->path(0).join("/") << " (Size " - << p->tqitemRect().width() << "x" << p->tqitemRect().height() + << p->itemRect().width() << "x" << p->itemRect().height() << ", Val " << p->value() << ")" << endl; } @@ -1542,8 +1542,8 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const { if (i) { /* Must have a visible area */ - while(i && ((i->tqitemRect().width() <1) || - (i->tqitemRect().height() <1))) { + while(i && ((i->itemRect().width() <1) || + (i->itemRect().height() <1))) { TreeMapItem* p = i->parent(); if (!p) break; int idx = p->tqchildren()->findRef(i); @@ -1772,7 +1772,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { - TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect(); + TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } @@ -1936,14 +1936,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) int nextVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->tqitemRect().isEmpty()) return -1; + if (!p || p->itemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx < (int)p->tqchildren()->count()-1) { idx++; - TQRect r = p->tqchildren()->at(idx)->tqitemRect(); + TQRect r = p->tqchildren()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1954,14 +1954,14 @@ int nextVisible(TreeMapItem* i) int prevVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->tqitemRect().isEmpty()) return -1; + if (!p || p->itemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->tqchildren()->at(idx)->tqitemRect(); + TQRect r = p->tqchildren()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap() } else { // only subitem - if (!_needsRefresh->tqitemRect().isValid()) return; + if (!_needsRefresh->itemRect().isValid()) return; } // reset cached font object; it could have been changed @@ -2154,7 +2154,7 @@ void TreeMapWidget::drawTreeMap() TQPainter p(this); tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, TQRect(0, 0, TQWidget::width(), TQWidget::height()), - tqcolorGroup() ); + colorGroup() ); } } @@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p, bool isCurrent = _current && item->isChildOf(_current); - RectDrawing d(item->tqitemRect()); + RectDrawing d(item->itemRect()); item->setSelected(isSelected); item->setCurrent(isCurrent); item->setShaded(_shading); @@ -2232,15 +2232,15 @@ void TreeMapWidget::drawItems(TQPainter* p, { if (DEBUG_DRAWING) kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", " - << item->tqitemRect().x() << "/" << item->tqitemRect().y() - << "-" << item->tqitemRect().width() << "x" - << item->tqitemRect().height() << "), Val " << item->value() + << item->itemRect().x() << "/" << item->itemRect().y() + << "-" << item->itemRect().width() << "x" + << item->itemRect().height() << "), Val " << item->value() << ", Sum " << item->sum() << endl; drawItem(p, item); item->clearFreeRects(); - TQRect origRect = item->tqitemRect(); + TQRect origRect = item->itemRect(); int bw = item->borderWidth(); TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); @@ -2288,7 +2288,7 @@ void TreeMapWidget::drawItems(TQPainter* p, i->clearItemRect(); } // tooltip apears on whole item rect - item->addFreeRect(item->tqitemRect()); + item->addFreeRect(item->itemRect()); // if we have space for text... if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return; diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 0aa5a9d..6cb5edd 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -290,7 +290,7 @@ public: */ void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const TQRect& tqitemRect() const { return _rect; } + const TQRect& itemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py index ea65c6e..1f71387 100755 --- a/konq-plugins/imagerotation/exif.py +++ b/konq-plugins/imagerotation/exif.py @@ -240,7 +240,7 @@ GPS_TAGS={ 0x0006: ('GPSAltitude', ), 0x0007: ('GPSTimeStamp', ), 0x0008: ('GPSSatellites', ), - 0x0009: ('GPStqStatus', ), + 0x0009: ('GPSStatus', ), 0x000A: ('GPSMeasureMode', ), 0x000B: ('GPSDOP', ), 0x000C: ('GPSSpeedRef', ), diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 981eeb8..36092c7 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -163,7 +163,7 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi { int numOfImages = imageDir.count(); const TQString imgGalleryDir = url.directory(); - const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); stream << "\n

" << TQStyleSheet::escape(m_configDlg->getTitle()) << "

" << endl; stream << i18n("Number of images: %1").tqarg(numOfImages) << "
" << endl; @@ -293,12 +293,12 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl; // Create the "thumbs" subdirectory if necessary - TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) return false; // Create the "images" subdirectory if necessary - TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); if (m_copyFiles) { if (createDirectory(images_dir, imgGalleryDir, "images") == false) return false; @@ -344,8 +344,8 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& s } const TQString imgGalleryDir = url.directory(); - TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); - TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP", TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable); TQFile file( url.path() ); @@ -424,18 +424,18 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou const TQString& imgGalleryDir, const TQString& imageFormat) { TQImage img; - const TQString pixPath = sourceDirName + TQString::tqfromLatin1("/") + imgName; + const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName; if (m_copyFiles) { KURL srcURL = KURL::fromPathOrURL(pixPath); //kdDebug(90170) << "srcURL: " << srcURL << endl; - KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName); + KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; KIO::NetAccess::copy(srcURL, destURL, static_cast(parent())->widget()); } const TQString imgNameFormat = imgName + extension(imageFormat); - const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/"); + const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); int extent = m_configDlg->getThumbnailSize(); // this code is stolen from tdebase/kioslave/thumbnail/imagecreator.cpp diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui index 1869438..5d2a239 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui +++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui @@ -100,7 +100,7 @@ Expanding - + 20 20 @@ -171,7 +171,7 @@ Expanding - + 20 20 diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 341cc2e..6375363 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() { m_mfIcon = new KURLLabel(m_statusBarEx->statusBar()); m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_mfIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mfIcon->setUseCursor(false); //FIXME hackish m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png"))); diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 60eb724..6616e0e 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -133,8 +133,8 @@ void MinitoolsPlugin::endFolderCallback() { } TQString MinitoolsPlugin::minitoolsFilename(bool local) { - return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml")) - : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml")); + return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml")) + : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml")); } void MinitoolsPlugin::slotEditBookmarks() { diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index a820d87..d099e7e 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -281,7 +281,7 @@ void SearchBarPlugin::startSearch(const TQString &_search) if(!service || !KURIFilter::self()->filterURI(data, list)) { - data.setData( TQString::tqfromLatin1( "google" ) + delimiter() + search ); + data.setData( TQString::fromLatin1( "google" ) + delimiter() + search ); KURIFilter::self()->filterURI( data, list ); } @@ -364,7 +364,7 @@ void SearchBarPlugin::setIcon() p.drawPixmap(0, 2, m_searchIcon); TQStyle::SFlags arrowFlags = TQStyle::Style_Default; m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, - arrowmap.height()-6, 6, 5), m_searchCombo->tqcolorGroup(), arrowFlags, TQStyleOption() ); + arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() ); p.end(); m_searchIcon = arrowmap; @@ -590,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText) void SearchBarCombo::mousePressEvent(TQMouseEvent *e) { - int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if(e->x() > x0 + 2 && e->x() < lineEdit()->x()) { diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui index 4f07e62..14dc7b4 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui +++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -71,7 +71,7 @@ 0 - + 20 20 @@ -88,7 +88,7 @@ Pause - + 20 20 @@ -105,7 +105,7 @@ Stop - + 20 20 @@ -128,7 +128,7 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ Expanding - + 20 20 @@ -215,7 +215,7 @@ Expanding - + 20 20 @@ -266,7 +266,7 @@ Expanding - + 20 20 @@ -291,7 +291,7 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 20 diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui index 9027637..4acfca0 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui +++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -71,7 +71,7 @@ 0 - + 20 20 @@ -88,7 +88,7 @@ Pause - + 20 20 @@ -105,7 +105,7 @@ Stop - + 20 20 @@ -128,7 +128,7 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ Expanding - + 20 20 @@ -215,7 +215,7 @@ Expanding - + 20 20 @@ -266,7 +266,7 @@ Expanding - + 20 20 @@ -291,7 +291,7 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 20 diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 2585c7b..63a62a6 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -58,7 +58,7 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { - topWidgetName = parent->tqtopLevelWidget()->name(); + topWidgetName = parent->topLevelWidget()->name(); config = new KConfig("metabarrc"); iconConfig = new KConfig(locate("data", "metabar/iconsrc")); @@ -78,7 +78,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQWidget *general = new TQWidget; TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general); - entries_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group); max_entries = new KIntSpinBox(entries_group); @@ -98,7 +98,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); - appearance_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); animate = new TQCheckBox(i18n("Animate resize"), appearance_group); animate->setChecked(config->readBoolEntry("AnimateResize", false)); @@ -110,13 +110,13 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent showframe->setChecked(config->readBoolEntry("ShowFrame", true)); TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general); - theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); themes = new KComboBox(theme_group); - themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); - install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); loadThemes(); @@ -144,7 +144,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); link_list = new KListView(links); - link_list->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); @@ -320,7 +320,7 @@ void ConfigDialog::createLink() TQLineEdit *url = new TQLineEdit("file:/", main); KIconButton *icon = new KIconButton(main); - icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon("folder"); @@ -342,7 +342,7 @@ void ConfigDialog::createLink() main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); - main->resize(300, main->tqsizeHint().height()); + main->resize(300, main->sizeHint().height()); if(main->exec() == TQDialog::Accepted){ TQString name_str = name->text(); @@ -403,7 +403,7 @@ void ConfigDialog::editLink(TQListViewItem *item) TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); KIconButton *icon = new KIconButton(main); - icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon(linkList[item]->icon); @@ -425,7 +425,7 @@ void ConfigDialog::editLink(TQListViewItem *item) main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); - main->resize(300, main->tqsizeHint().height()); + main->resize(300, main->sizeHint().height()); if(main->exec() == TQDialog::Accepted){ TQString name_str = name->text(); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 3f2f7c9..e6c594c 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) } } else{ - DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ @@ -364,7 +364,7 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); + TQString src = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); bool media = item->mimetype().startsWith("video/"); DOM::DOMString innerHTML; diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index aa09cd3..bbfb9e2 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url) KURL url("http://www.google.com/search"); url.addQueryItem("q", keyword); - DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url.url()); } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 0439c98..700cb74 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -94,7 +94,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare html->setCaretVisible(false); html->setDNDEnabled(false); html->setJavaEnabled(false); - html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); html->view()->hide(); connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); @@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) TQString MetabarWidget::getCurrentURL() { - DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("currentURL()"); if (reply.isValid()) { @@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL() void MetabarWidget::openURL(const TQString &url) { - DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url); } void MetabarWidget::openTab(const TQString &url) { - DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("newTab", url); } void MetabarWidget::callAction(const TQString &action) { - DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8()); + DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8()); if(ref.call("enabled()")){ ref.call("activate()"); } @@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name) buffer.open(IO_WriteOnly); icon.save(&buffer, "PNG"); - return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); + return TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); } void MetabarWidget::slotShowSharingDialog() diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index 333aab5..1779b37 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); + TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data()); icon.setSrc(icondata); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index 99e8fb4..9af7e65 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -45,7 +45,7 @@ namespace KSB_News { topLayout->addStretch(); KPushButton *btn = new KPushButton(i18n("&Configure"), this); - btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); topLayout->addWidget(btn, 0, TQt::AlignHCenter); diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index 56a7c52..a5c1261 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -54,7 +54,7 @@ namespace KSB_News { int textWidth = fm.width(text); int widgetSpace = visibleWidth(); if ((textWidth > widgetSpace) || (contentsX() > 0)) - tip(tqitemRect(item), text); + tip(itemRect(item), text); } } } diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 6bc6d1a..59e0e0d 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -115,7 +115,7 @@ namespace KSB_News { button->setText(KStringHandler::rPixelSqueeze(nsp->title(), button->fontMetrics(), button->width() - 4 )); - button->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked())); TQToolTip::add(button, nsp->title()); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index d376d73..dbafc59 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda #define UA_PTOS(x) (*it)->property(x).toString() -#define TQFL1(x) TQString::tqfromLatin1(x) +#define TQFL1(x) TQString::fromLatin1(x) UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, -- cgit v1.2.1