From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- kfind/kdatecombo.cpp | 6 +++--- kfind/kdatecombo.h | 2 +- kfind/kfind.cpp | 4 ++-- kfind/kfinddlg.cpp | 2 +- kfind/kfindpart.cpp | 2 +- kfind/kftabdlg.cpp | 16 ++++++++-------- kfind/kftabdlg.h | 2 +- kfind/kfwin.cpp | 24 ++++++++++++------------ 8 files changed, 29 insertions(+), 29 deletions(-) (limited to 'kfind') diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 5ac494f86..8f3758344 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame = new KPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); - datePicker->setMinimumSize(datePicker->sizeHint()); + datePicker->setMinimumSize(datePicker->tqsizeHint()); datePicker->installEventFilter(this); popupFrame->setMainWidget(datePicker); setDate(date); @@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd) return *qd = KGlobal::locale()->readDate(str); } -TQDate & KDateCombo::getDate(TQDate *currentDate) +TQDate & KDateCombo::getDate(TQDate *tqcurrentDate) { - return string2Date(currentText(), currentDate); + return string2Date(currentText(), tqcurrentDate); } bool KDateCombo::setDate(const TQDate & newDate) diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h index ab714a3ba..d8da787b8 100644 --- a/kfind/kdatecombo.h +++ b/kfind/kdatecombo.h @@ -26,7 +26,7 @@ public: KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0); ~KDateCombo(); - TQDate & getDate(TQDate *currentDate); + TQDate & getDate(TQDate *tqcurrentDate); bool setDate(const TQDate & newDate); private: diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index 60892828d..f10490315 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -26,7 +26,7 @@ **********************************************************************/ #include -#include +#include #include #include @@ -70,7 +70,7 @@ Kfind::Kfind(TQWidget *parent, const char *name) mTopLayout->addWidget(mButtonBox); mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox ); - mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); + mButtonBox->setSpacing( (tabWidget->tqsizeHint().height()-4*mSearch->tqsizeHint().height()) / 4); connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox ); connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 4a1d826aa..747f69811 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -4,7 +4,7 @@ * **********************************************************************/ -#include +#include #include #include diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 92082019f..0cce510f2 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -44,7 +44,7 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, kdDebug() << "KFindPart::KFindPart " << this << endl; m_kfindWidget = new Kfind( parentWidget, widgetName ); - m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height()); + m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height()); const KFileItem *item = ((KonqDirPart*)parent)->currentItem(); kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl; TQDir d; diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index ddb8a91f4..1dbe6b58a 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,11 +60,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[0] = new TQWidget( this, "page1" ); nameBox = new KComboBox(TRUE, pages[0], "combo1"); - nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + nameBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named"); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); dirBox = new KComboBox(TRUE, pages[0], "combo2"); - dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + dirBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named"); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]); @@ -187,7 +187,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) sizeUnitBox ->setCurrentItem(1); int tmp = sizeEdit->fontMetrics().width(" 000000000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); m_usernameBox->setDuplicatesEnabled(FALSE); m_groupBox->setDuplicatesEnabled(FALSE); @@ -245,7 +245,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[2] = new TQWidget( this, "page3" ); typeBox =new KComboBox(FALSE, pages[2], "typeBox"); - typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + typeBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type"); textEdit=new KLineEdit(pages[2], "textEdit" ); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); @@ -315,7 +315,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) // Layout tmp = sizeEdit->fontMetrics().width(" 00000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4, KDialog::marginHint(), @@ -854,13 +854,13 @@ static void save_pattern(TQComboBox *obj, conf->writePathEntry(entry, sl); } -TQSize KfindTabWidget::sizeHint() const +TQSize KfindTabWidget::tqsizeHint() const { // #44662: avoid a huge default size when the comboboxes have very large items // Like in minicli, we changed the combobox size policy so that they can resize down, // and then we simply provide a reasonable size hint for the whole window, depending // on the screen width. - TQSize sz = TQTabWidget::sizeHint(); + TQSize sz = TQTabWidget::tqsizeHint(); KfindTabWidget* me = const_cast( this ); const int screenWidth = tqApp->desktop()->screenGeometry(me).width(); if ( sz.width() > screenWidth / 2 ) diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h index c080c44d4..dfea860da 100644 --- a/kfind/kftabdlg.h +++ b/kfind/kftabdlg.h @@ -49,7 +49,7 @@ public: void setURL( const KURL & url ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: void setFocus(); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index dc30aa55d..c5c375c22 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -14,10 +14,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include @@ -178,7 +178,7 @@ void KfindWindow::copySelection() if (drag_obj) { - TQClipboard *cb = kapp->clipboard(); + TQClipboard *cb = kapp->tqclipboard(); cb->setData(drag_obj); } } @@ -222,7 +222,7 @@ void KfindWindow::saveResults() stream.setEncoding( TQTextStream::Locale ); if ( mimeType->name() == "text/html") { - stream << TQString::fromLatin1("\n" + stream << TQString::tqfromLatin1("\n" "\n" "%2\n" "

%3

" @@ -236,13 +236,13 @@ void KfindWindow::saveResults() { TQString path=((KfFileLVI*)item)->fileitem.url().url(); TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL(); - stream << TQString::fromLatin1("
") << pretty - << TQString::fromLatin1("\n"); + stream << TQString::tqfromLatin1("
") << pretty + << TQString::tqfromLatin1("\n"); item = item->nextSibling(); } - stream << TQString::fromLatin1("

\n"); + stream << TQString::tqfromLatin1("

\n"); } else { item = firstChild(); @@ -293,7 +293,7 @@ void KfindWindow::deleteFiles() // Iterate on all selected elements TQPtrList selected = selectedItems(); for ( uint i = 0; i < selected.count(); i++ ) { - KfFileLVI *item = (KfFileLVI *) selected.at(i); + KfFileLVI *item = (KfFileLVI *) selected.tqat(i); KFileItem file = item->fileitem; KIO::NetAccess::del(file.url(), this); @@ -335,7 +335,7 @@ void KfindWindow::resizeEvent(TQResizeEvent *e) { KListView::resizeEvent(e); resetColumns(false); - clipper()->repaint(); + clipper()->tqrepaint(); } TQDragObject * KfindWindow::dragObject() @@ -346,7 +346,7 @@ TQDragObject * KfindWindow::dragObject() // create a list of URIs from selection for ( uint i = 0; i < selected.count(); i++ ) { - KfFileLVI *item = (KfFileLVI *) selected.at( i ); + KfFileLVI *item = (KfFileLVI *) selected.tqat( i ); if (item) { uris.append( item->fileitem.url() ); @@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init) { setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15); TQString sampleDate = - KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15); setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15); setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15); -- cgit v1.2.3