Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

13 files changed, 62 insertions, 62 deletions

diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 95e4045ac..b012cef6b 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)
@@ -84,9 +84,9 @@ void KDateCombo::dateEnteredEvent(TQDate newDate)
 
 void KDateCombo::mousePressEvent (TQMouseEvent * e)
 {
-  if (e->button() & TQMouseEvent::LeftButton)
+  if (e->button() & Qt::LeftButton)
   {
-    if  (rect().contains( e->pos()))
+    if  (TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos()))
     {
       TQDate tempDate;
       getDate(& tempDate);
@@ -103,7 +103,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
   {
       TQMouseEvent *me = (TQMouseEvent *)e;
       TQPoint p = mapFromGlobal( me->globalPos() );
-      if (rect().contains( p ) )
+      if (TQT_TQRECT_OBJECT(rect()).tqcontains( p ) )
       {
         TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent()));
         return true;
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 8908b26c8..f10490315 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -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/kfind.h b/kfind/kfind.h
index fc18ca045..3919080e9 100644
--- a/kfind/kfind.h
+++ b/kfind/kfind.h
@@ -18,7 +18,7 @@ class KQuery;
 class KURL;
 class KfindTabWidget;
 
-class Kfind: public QWidget
+class Kfind: public TQWidget
 {
     Q_OBJECT
 
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index aeb6d2708..557d4b04e 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -31,7 +31,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
 	KStdGuiItem::saveAs())
 {
   TQWidget::setCaption( i18n("Find Files/Folders" ) );
-  setButtonBoxOrientation(Vertical);
+  setButtonBoxOrientation(Qt::Vertical);
 
   enableButton(Apply, true); // Enable "Find"
   enableButton(User1, false); // Disable "Stop"
@@ -72,7 +72,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
   connect(win ,TQT_SIGNAL(resultSelected(bool)),
 	  this,TQT_SIGNAL(resultSelected(bool)));
 
-  query = new KQuery(frame);
+  query = new KQuery(TQT_TQOBJECT(frame));
   connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)),
 	  TQT_SLOT(addFile(const KFileItem*,const TQString&)));
   connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int)));
@@ -236,7 +236,7 @@ void  KfindDlg::about ()
 
 void KfindDlg::slotDeleteItem(const TQString& file)
 {
-  kdDebug()<<TQString("Will remove one item: %1").arg(file)<<endl;
+  kdDebug()<<TQString(TQString("Will remove one item: %1").arg(file))<<endl;
   TQListViewItem *iter;
   TQString iterwithpath;
 
@@ -260,7 +260,7 @@ void KfindDlg::slotNewItems( const TQString& file )
   TQListViewItem *checkiter;
   TQString checkiterwithpath;
 
-  if(file.find(query->url().path(+1))==0)
+  if(file.tqfind(query->url().path(+1))==0)
   {
     kdDebug()<<TQString("Can be added, path OK")<<endl;
     checkiter=win->firstChild();
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 92082019f..252aca295 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -33,7 +33,7 @@ class KonqDirPart;
 typedef KParts::GenericFactory<KFindPart> KFindFactory;
 K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory )
 
-KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, 
+KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName, 
 	              TQObject *parent, const char *name ,
 		      const TQStringList & /*args*/ )
     : KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/
@@ -43,8 +43,8 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName,
     setBrowserExtension( new KonqDirPartBrowserExtension( this ) );
 
     kdDebug() << "KFindPart::KFindPart " << this << endl;
-    m_kfindWidget = new Kfind( parentWidget, widgetName );
-    m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height());
+    m_kfindWidget = new Kfind( tqparentWidget, widgetName );
+    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/kfindpart.h b/kfind/kfindpart.h
index 47d75a53c..f9a0d6cde 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -44,7 +44,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
     Q_OBJECT
     Q_PROPERTY( bool showsResult READ showsResult )
 public:
-    KFindPart( TQWidget * parentWidget, const char *widgetName, 
+    KFindPart( TQWidget * tqparentWidget, const char *widgetName, 
 	       TQObject *parent, const char *name, const TQStringList & /*args*/ );
     virtual ~KFindPart();
 
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 3d7615afd..95a8c3048 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -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);
@@ -212,7 +212,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     grid1->addWidget(rb[0], 1, 1 );
     grid1->addWidget(fromDate, 1, 2 );
-    grid1->addWidget(andL, 1, 3, AlignHCenter );
+    grid1->addWidget(andL, 1, 3, Qt::AlignHCenter );
     grid1->addWidget(toDate, 1, 4 );
 
     grid1->addWidget(rb[1], 2, 1 );
@@ -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(),
@@ -330,7 +330,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     grid2->addWidget( textMetaKey, 4, 0 );
     grid2->addWidget( metainfokeyEdit, 4, 1 );
-    grid2->addWidget( textMetaInfo, 4, 2, AlignHCenter  );
+    grid2->addWidget( textMetaInfo, 4, 2, Qt::AlignHCenter  );
     grid2->addWidget( metainfoEdit, 4, 3 );
 
     metainfokeyEdit->setText("*");
@@ -390,7 +390,7 @@ void KfindTabWidget::setURL( const KURL & url )
     dirBox->insertStringList(sl);
     // If the _searchPath already exists in the list we do not
     // want to add it again
-    int indx = sl.findIndex(m_url.prettyURL());
+    int indx = sl.tqfindIndex(m_url.prettyURL());
     if(indx == -1)
       dirBox->insertItem(m_url.prettyURL(), 0); // make it the first one
     else
@@ -472,7 +472,7 @@ void KfindTabWidget::loadHistory()
     dirBox->insertStringList(sl);
     // If the _searchPath already exists in the list we do not
     // want to add it again
-    int indx = sl.findIndex(m_url.prettyURL());
+    int indx = sl.tqfindIndex(m_url.prettyURL());
     if(indx == -1)
       dirBox->insertItem(m_url.prettyURL(), 0); // make it the first one
     else
@@ -496,9 +496,9 @@ void KfindTabWidget::loadHistory()
 void KfindTabWidget::slotEditRegExp()
 {
   if ( ! regExpDialog )
-    regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
+    regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
 
-  KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->qt_cast( "KRegExpEditorInterface" ) );
+  KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->tqqt_cast( "KRegExpEditorInterface" ) );
   if ( !iface )
        return;
 
@@ -651,8 +651,8 @@ void KfindTabWidget::setQuery(KQuery *query)
       toDate->getDate(&q2);
 
       // do not generate negative numbers .. find doesn't handle that
-      time_t time1 = epoch.secsTo(q1);
-      time_t time2 = epoch.secsTo(q2.addDays(1)) - 1; // Include the last day
+      time_t time1 = epoch.secsTo(TQDateTime(q1));
+      time_t time2 = epoch.secsTo(TQDateTime(q2.addDays(1))) - 1; // Include the last day
 
       query->setTimeRange(time1, time2);
     }
@@ -712,7 +712,7 @@ void KfindTabWidget::setQuery(KQuery *query)
   }
   else
   {
-     query->setMimeType( TQString::null );
+     query->setMimeType( TQString() );
   }
 
   //Metainfo
@@ -807,7 +807,7 @@ bool KfindTabWidget::isSearchRecursive()
    Digit validator. Allows only digits to be typed.
 **/
 KDigitValidator::KDigitValidator( TQWidget * parent, const char *name )
-  : TQValidator( parent, name )
+  : TQValidator( TQT_TQOBJECT(parent), name )
 {
   r = new TQRegExp("^[0-9]*$");
 }
@@ -854,15 +854,15 @@ 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<KfindTabWidget*>( this );
-  const int screenWidth = qApp->desktop()->screenGeometry(me).width();
+  const int screenWidth = tqApp->desktop()->screenGeometry(me).width();
   if ( sz.width() > screenWidth / 2 )
     sz.setWidth( screenWidth / 2 );
   return sz;
diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h
index 157a1fa44..dfea860da 100644
--- a/kfind/kftabdlg.h
+++ b/kfind/kftabdlg.h
@@ -29,7 +29,7 @@ class TQSpinBox;
 
 class KfDirDialog;
 
-class KfindTabWidget: public QTabWidget
+class KfindTabWidget: public TQTabWidget
 {
   Q_OBJECT
 
@@ -49,7 +49,7 @@ public:
 
   void setURL( const KURL & url );
 
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
 public slots:
   void setFocus();
@@ -119,7 +119,7 @@ private:
   TQStringList m_AudioTypes;
 };
 
-class KDigitValidator : public QValidator
+class KDigitValidator : public TQValidator
 {
   Q_OBJECT
 
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 2ee69aa14..963fdaf92 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -146,7 +146,7 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name )
 
 TQString KfindWindow::reducedDir(const TQString& fullDir)
 {
-   if (fullDir.find(m_baseDir)==0)
+   if (fullDir.tqfind(m_baseDir)==0)
    {
       TQString tmp=fullDir.mid(m_baseDir.length());
       return tmp;
@@ -156,7 +156,7 @@ TQString KfindWindow::reducedDir(const TQString& fullDir)
 
 void KfindWindow::beginSearch(const KURL& baseUrl)
 {
-  kdDebug()<<TQString("beginSearch in: %1").arg(baseUrl.path())<<endl;
+  kdDebug()<<TQString(TQString("beginSearch in: %1").arg(baseUrl.path()))<<endl;
   m_baseDir=baseUrl.path(+1);
   haveSelection = false;
   clear();
@@ -178,7 +178,7 @@ void KfindWindow::copySelection()
 
   if (drag_obj)
   {
-    QClipboard *cb = kapp->clipboard();
+    TQClipboard *cb = kapp->tqclipboard();
     cb->setData(drag_obj);
   }
 }
@@ -215,14 +215,14 @@ void KfindWindow::saveResults()
   TQFile file(filename);
 
   if ( !file.open(IO_WriteOnly) )
-    KMessageBox::error(parentWidget(),
+    KMessageBox::error(tqparentWidget(),
 		       i18n("Unable to save results."));
   else {
     TQTextStream stream( &file );
     stream.setEncoding( TQTextStream::Locale );
 
     if ( mimeType->name() == "text/html") {
-      stream << TQString::fromLatin1("<HTML><HEAD>\n"
+      stream << TQString::tqfromLatin1("<HTML><HEAD>\n"
 				    "<!DOCTYPE %1>\n"
 				    "<TITLE>%2</TITLE></HEAD>\n"
 				    "<BODY><H1>%3</H1>"
@@ -236,13 +236,13 @@ void KfindWindow::saveResults()
 	{
 	  TQString path=((KfFileLVI*)item)->fileitem.url().url();
 	  TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL();
-	  stream << TQString::fromLatin1("<DT><A HREF=\"") << path
-		 << TQString::fromLatin1("\">") << pretty
-		 << TQString::fromLatin1("</A>\n");
+	  stream << TQString::tqfromLatin1("<DT><A HREF=\"") << path
+		 << TQString::tqfromLatin1("\">") << pretty
+		 << TQString::tqfromLatin1("</A>\n");
 
 	  item = item->nextSibling();
 	}
-      stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n");
+      stream << TQString::tqfromLatin1("</DL><P></BODY></HTML>\n");
     }
     else {
       item = firstChild();
@@ -255,7 +255,7 @@ void KfindWindow::saveResults()
     }
 
     file.close();
-    KMessageBox::information(parentWidget(),
+    KMessageBox::information(tqparentWidget(),
 			     i18n("Results were saved to file\n")+
 			     filename);
   }
@@ -287,7 +287,7 @@ void KfindWindow::deleteFiles()
 {
   TQString tmp = i18n("Do you really want to delete the selected file?",
                      "Do you really want to delete the %n selected files?",selectedItems().count());
-  if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
+  if (KMessageBox::warningContinueCancel(tqparentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
     return;
 
   // Iterate on all selected elements
@@ -335,7 +335,7 @@ void KfindWindow::resizeEvent(TQResizeEvent *e)
 {
   KListView::resizeEvent(e);
   resetColumns(false);
-  clipper()->repaint();
+  clipper()->tqrepaint();
 }
 
 TQDragObject * KfindWindow::dragObject()
@@ -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);
diff --git a/kfind/kfwin.h b/kfind/kfwin.h
index a011f45df..4ff7041ff 100644
--- a/kfind/kfwin.h
+++ b/kfind/kfwin.h
@@ -17,7 +17,7 @@ class TQFileInfo;
 class KPopupMenu;
 class KfindWindow;
 
-class KfFileLVI : public QListViewItem
+class KfFileLVI : public TQListViewItem
 {
  public:
   KfFileLVI(KfindWindow* lv, const KFileItem &item,const TQString& matchingLine);
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 4231f1aab..4fd874c96 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -242,7 +242,7 @@ void KQuery::processQuery( KFileItem* file)
           return;
         break;
       default:
-        if (!m_mimetype.isEmpty() && !m_mimetype.contains(file->mimetype()))
+        if (!m_mimetype.isEmpty() && !m_mimetype.tqcontains(file->mimetype()))
           return;
     }
 
@@ -270,7 +270,7 @@ void KQuery::processQuery( KFileItem* file)
              continue;
           metaitem=metadatas.item(*it);
           strmetakeycontent=metaitem.string();
-          if(strmetakeycontent.find(m_metainfo)!=-1)
+          if(strmetakeycontent.tqfind(m_metainfo)!=-1)
           {
              foundmeta=true;
              break;
@@ -285,7 +285,7 @@ void KQuery::processQuery( KFileItem* file)
     if (!m_context.isEmpty())
     {
 
-       if( !m_search_binary && ignore_mimetypes.findIndex(file->mimetype()) != -1 ) {
+       if( !m_search_binary && ignore_mimetypes.tqfindIndex(file->mimetype()) != -1 ) {
          kdDebug() << "ignoring, mime type is in exclusion list: " << file->url() << endl;
          return;
        }
@@ -303,8 +303,8 @@ void KQuery::processQuery( KFileItem* file)
        TQByteArray zippedXmlFileContent;
 
        // KWord's and OpenOffice.org's files are zipped...
-       if( ooo_mimetypes.findIndex(file->mimetype()) != -1 ||
-           koffice_mimetypes.findIndex(file->mimetype()) != -1 )
+       if( ooo_mimetypes.tqfindIndex(file->mimetype()) != -1 ||
+           koffice_mimetypes.tqfindIndex(file->mimetype()) != -1 )
        {
          KZip zipfile(file->url().path());
          KZipFileEntry *zipfileEntry;
@@ -313,7 +313,7 @@ void KQuery::processQuery( KFileItem* file)
          {
            const KArchiveDirectory *zipfileContent = zipfile.directory();
 
-           if( koffice_mimetypes.findIndex(file->mimetype()) != -1 )
+           if( koffice_mimetypes.tqfindIndex(file->mimetype()) != -1 )
              zipfileEntry = (KZipFileEntry*)zipfileContent->entry("maindoc.xml");
            else
              zipfileEntry = (KZipFileEntry*)zipfileContent->entry("content.xml"); //for OpenOffice.org
@@ -359,7 +359,7 @@ void KQuery::processQuery( KFileItem* file)
 
           if (str.isNull()) break;
           if(isZippedOfficeDocument)
-            str.replace(xmlTags, "");
+            str.tqreplace(xmlTags, "");
 
           if (m_regexpForContent)
           {
@@ -373,7 +373,7 @@ void KQuery::processQuery( KFileItem* file)
           else
           {
              if ((!str.isNull()) && (!m_context.isNull())) {
-                 if (str.find(m_context, 0, m_casesensitive) != -1)
+                 if (str.tqfind(m_context, 0, m_casesensitive) != -1)
                  {
                     matchingLine=TQString::number(matchingLineNumber)+": "+str;
                     found = true;
@@ -458,7 +458,7 @@ void KQuery::setRegExp(const TQString &regexp, bool caseSensitive)
 //  m_regexpsContainsGlobs.clear();
   for ( TQStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) {
     regExp = new TQRegExp((*it),caseSensitive,true);
-//    m_regexpsContainsGlobs.append(regExp->pattern().contains(globChars));
+//    m_regexpsContainsGlobs.append(regExp->pattern().tqcontains(globChars));
     m_regexps.append(regExp);
   }
 }
diff --git a/kfind/kquery.h b/kfind/kquery.h
index a599cdbf1..ecd83b348 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -15,7 +15,7 @@
 
 class KFileItem;
 
-class KQuery : public QObject
+class KQuery : public TQObject
 {
   Q_OBJECT