TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1 files changed, 19 insertions, 19 deletions

diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index 11ec6134..8d039558 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -42,46 +42,46 @@ class ResultsSearchBar::ResultsSearchBarPrivate
 {
 public:
     ResultsSearchBarPrivate()
-    : layout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
+    : tqlayout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
     {}
 
     TQString searchText;
     TQTimer timer;
-    TQHBoxLayout* layout;
+    TQHBoxLayout* tqlayout;
     KLineEdit* searchLine;
     KComboBox* searchCombo;
     int delay;
     int m_lastComboIndex;
 };
 
-ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
-        : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate)
+ResultsSearchBar::ResultsSearchBar(TQWidget* tqparent, const char* name)
+        : TQWidget(tqparent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate)
 {
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     
-    d->layout = new TQHBoxLayout(this);    
-    d->layout->setMargin(2);
-    d->layout->setSpacing(5);
+    d->tqlayout = new TQHBoxLayout(this);    
+    d->tqlayout->setMargin(2);
+    d->tqlayout->setSpacing(5);
     
     TQToolButton* clearButton = new TQToolButton(this);
     clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
     clearButton->setAutoRaise(true);
-    d->layout->addWidget(clearButton);
+    d->tqlayout->addWidget(clearButton);
 
     TQLabel* searchLabel = new TQLabel(this);
     searchLabel->setText(i18n("S&earch:"));
-    d->layout->addWidget(searchLabel);
+    d->tqlayout->addWidget(searchLabel);
 
     d->searchLine = new KLineEdit(this, "searchline");
     connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)),
             this, TQT_SLOT(slotSearchStringChanged(const TQString &)));
 
     searchLabel->setBuddy(d->searchLine);
-    d->layout->addWidget(d->searchLine);
+    d->tqlayout->addWidget(d->searchLine);
 
     TQLabel* statusLabel = new TQLabel(this);
-    statusLabel->setText( i18n("Status:") );
-    d->layout->addWidget(statusLabel);
+    statusLabel->setText( i18n("tqStatus:") );
+    d->tqlayout->addWidget(statusLabel);
 
     d->searchCombo = new KComboBox(this, "searchcombo");
     TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
@@ -95,7 +95,7 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
     d->searchCombo->insertItem(iconBroken, i18n("Broken Links"));
     d->searchCombo->insertItem(iconMalformed, i18n("Malformed Links"));
     d->searchCombo->insertItem(iconUndetermined, i18n("Undetermined Links"));
-    d->layout->addWidget(d->searchCombo);
+    d->tqlayout->addWidget(d->searchCombo);
 
     TQToolTip::add(clearButton, i18n("Clear filter"));
     TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list"));
@@ -147,7 +147,7 @@ void ResultsSearchBar::slotClearSearch()
     }
 }
 
-void ResultsSearchBar::slotSetStatus(int status)
+void ResultsSearchBar::slotSettqStatus(int status)
 {
     d->searchCombo->setCurrentItem(status);
 }
@@ -187,19 +187,19 @@ void ResultsSearchBar::slotActivateSearch()
 {
     kdDebug(23100) << "ResultsSearchBar::slotActivateSearch" << endl;
     
-    ResultView::Status status = selectedStatus();
+    ResultView::tqStatus status = selectedtqStatus();
     
     emit signalSearch(LinkMatcher(d->searchLine->text(), status));
 }
 
 LinkMatcher ResultsSearchBar::currentLinkMatcher() const
 {
-    return LinkMatcher(d->searchLine->text(), selectedStatus());
+    return LinkMatcher(d->searchLine->text(), selectedtqStatus());
 }
 
-ResultView::Status ResultsSearchBar::selectedStatus() const
+ResultView::tqStatus ResultsSearchBar::selectedtqStatus() const
 {
-    ResultView::Status status = ResultView::none;
+    ResultView::tqStatus status = ResultView::none;
     
     if(d->searchCombo->currentItem())
     {