Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

18 files changed, 65 insertions, 65 deletions

diff --git a/src/gui/boolfieldwidget.cpp b/src/gui/boolfieldwidget.cpp
index 6e7771d..b1dbdad 100644
--- a/src/gui/boolfieldwidget.cpp
+++ b/src/gui/boolfieldwidget.cpp
@@ -25,7 +25,7 @@ BoolFieldWidget::BoolFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const
     : FieldWidget(field_, parent_, name_) {
 
   m_checkBox = new TQCheckBox(this);
-  connect(m_checkBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(modified()));
+  connect(m_checkBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(modified()));
   registerWidget();
 }
 
diff --git a/src/gui/choicefieldwidget.cpp b/src/gui/choicefieldwidget.cpp
index 83e31f9..ee40c26 100644
--- a/src/gui/choicefieldwidget.cpp
+++ b/src/gui/choicefieldwidget.cpp
@@ -25,7 +25,7 @@ ChoiceFieldWidget::ChoiceFieldWidget(Data::FieldPtr field_, TQWidget* parent_, c
     : FieldWidget(field_, parent_, name_), m_comboBox(0) {
 
   m_comboBox = new KComboBox(this);
-  connect(m_comboBox, TQT_SIGNAL(activated(int)), TQT_SIGNAL(modified()));
+  connect(m_comboBox, TQ_SIGNAL(activated(int)), TQ_SIGNAL(modified()));
   // always have empty choice
   m_comboBox->insertItem(TQString());
   m_comboBox->insertStringList(field_->allowed());
diff --git a/src/gui/datefieldwidget.cpp b/src/gui/datefieldwidget.cpp
index 8f308f8..deae553 100644
--- a/src/gui/datefieldwidget.cpp
+++ b/src/gui/datefieldwidget.cpp
@@ -21,7 +21,7 @@ DateFieldWidget::DateFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const
     : FieldWidget(field_, parent_, name_) {
 
   m_widget = new DateWidget(this);
-  connect(m_widget, TQT_SIGNAL(signalModified()), TQT_SIGNAL(modified()));
+  connect(m_widget, TQ_SIGNAL(signalModified()), TQ_SIGNAL(modified()));
 
   registerWidget();
 }
diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
index b6ad777..08a0eab 100644
--- a/src/gui/datewidget.cpp
+++ b/src/gui/datewidget.cpp
@@ -66,13 +66,13 @@ DateWidget::DateWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_,
                            locale->calendar()->maxValidYear(), this);
   l->addWidget(m_yearSpin, 1);
 
-  connect(m_daySpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDateChanged()));
-  connect(m_monthCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDateChanged()));
-  connect(m_yearSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDateChanged()));
+  connect(m_daySpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDateChanged()));
+  connect(m_monthCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotDateChanged()));
+  connect(m_yearSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDateChanged()));
 
   m_dateButton = new KPushButton(this);
   m_dateButton->setIconSet(SmallIconSet(TQString::fromLatin1("date")));
-  connect(m_dateButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowPicker()));
+  connect(m_dateButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowPicker()));
   l->addWidget(m_dateButton, 0);
 
   m_frame = new TQVBox(0, 0, WType_Popup);
@@ -81,8 +81,8 @@ DateWidget::DateWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_,
   m_frame->hide();
 
   m_picker = new KDatePicker(m_frame, 0); // must include name to get correct constructor
-  connect(m_picker, TQT_SIGNAL(dateEntered(TQDate)), TQT_SLOT(slotDateEntered(TQDate)));
-  connect(m_picker, TQT_SIGNAL(dateSelected(TQDate)), TQT_SLOT(slotDateSelected(TQDate)));
+  connect(m_picker, TQ_SIGNAL(dateEntered(TQDate)), TQ_SLOT(slotDateEntered(TQDate)));
+  connect(m_picker, TQ_SIGNAL(dateSelected(TQDate)), TQ_SLOT(slotDateSelected(TQDate)));
 }
 
 void DateWidget::slotDateChanged() {
diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp
index 41d3d82..c443ae8 100644
--- a/src/gui/fieldwidget.cpp
+++ b/src/gui/fieldwidget.cpp
@@ -121,12 +121,12 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n
   m_editMultiple = new TQCheckBox(this);
   m_editMultiple->setChecked(true);
   m_editMultiple->setFixedWidth(m_editMultiple->sizeHint().width()); // don't let it have any extra space
-  connect(m_editMultiple, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setEnabled(bool)));
+  connect(m_editMultiple, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setEnabled(bool)));
   l->addWidget(m_editMultiple);
 
   TQWhatsThis::add(this, field_->description());
   // after letting the subclass get created, insert default value
-  TQTimer::singleShot(0, this, TQT_SLOT(insertDefault()));
+  TQTimer::singleShot(0, this, TQ_SLOT(insertDefault()));
 }
 
 void FieldWidget::insertDefault() {
@@ -166,10 +166,10 @@ void FieldWidget::editMultiple(bool show_) {
   // FIXME: maybe modified should only be signaled when the button is toggle on
   if(show_) {
     m_editMultiple->show();
-    connect(m_editMultiple, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(modified()));
+    connect(m_editMultiple, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(modified()));
   } else {
     m_editMultiple->hide();
-    disconnect(m_editMultiple, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(modified()));
+    disconnect(m_editMultiple, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(modified()));
   }
   // the widget length needs to be updated since it gets shorter
   widget()->updateGeometry();
diff --git a/src/gui/imagefieldwidget.cpp b/src/gui/imagefieldwidget.cpp
index 77f67b9..68f889c 100644
--- a/src/gui/imagefieldwidget.cpp
+++ b/src/gui/imagefieldwidget.cpp
@@ -23,7 +23,7 @@ ImageFieldWidget::ImageFieldWidget(Data::FieldPtr field_, TQWidget* parent_, con
 
   m_widget = new ImageWidget(this);
   m_widget->setLinkOnlyChecked(field_->property(TQString::fromLatin1("link")) == Latin1Literal("true"));
-  connect(m_widget, TQT_SIGNAL(signalModified()), TQT_SIGNAL(modified()));
+  connect(m_widget, TQ_SIGNAL(signalModified()), TQ_SIGNAL(modified()));
 
   registerWidget();
 }
diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp
index 75fe95f..73997ee 100644
--- a/src/gui/imagewidget.cpp
+++ b/src/gui/imagewidget.cpp
@@ -54,14 +54,14 @@ ImageWidget::ImageWidget(TQWidget* parent_, const char* name_) : TQWidget(parent
   boxLayout->addStretch(1);
 
   KButtonBox* box = new KButtonBox(this,TQt::Vertical);
-  box->addButton(i18n("Select Image..."), this, TQT_SLOT(slotGetImage()));
-  box->addButton(i18n("Clear"), this, TQT_SLOT(slotClear()));
+  box->addButton(i18n("Select Image..."), this, TQ_SLOT(slotGetImage()));
+  box->addButton(i18n("Clear"), this, TQ_SLOT(slotClear()));
   box->layout();
   boxLayout->addWidget(box);
 
   boxLayout->addSpacing(8);
   m_cbLinkOnly = new TQCheckBox(i18n("Save link only"), this);
-  connect(m_cbLinkOnly, TQT_SIGNAL(clicked()), TQT_SLOT(slotLinkOnlyClicked()));
+  connect(m_cbLinkOnly, TQ_SIGNAL(clicked()), TQ_SLOT(slotLinkOnlyClicked()));
   boxLayout->addWidget(m_cbLinkOnly);
 
   boxLayout->addStretch(1);
diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp
index 90fc007..edbda13 100644
--- a/src/gui/kwidgetlister.cpp
+++ b/src/gui/kwidgetlister.cpp
@@ -71,12 +71,12 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent,
   mButtonBox->setStretchFactor( mBtnClear, 0 );
 
   //---------- connect everything
-  connect( mBtnMore, TQT_SIGNAL(clicked()),
-     this, TQT_SLOT(slotMore()) );
-  connect( mBtnFewer, TQT_SIGNAL(clicked()),
-     this, TQT_SLOT(slotFewer()) );
-  connect( mBtnClear, TQT_SIGNAL(clicked()),
-     this, TQT_SLOT(slotClear()) );
+  connect( mBtnMore, TQ_SIGNAL(clicked()),
+     this, TQ_SLOT(slotMore()) );
+  connect( mBtnFewer, TQ_SIGNAL(clicked()),
+     this, TQ_SLOT(slotFewer()) );
+  connect( mBtnClear, TQ_SIGNAL(clicked()),
+     this, TQ_SLOT(slotClear()) );
 
   enableControls();
 }
diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp
index 1096671..814fee8 100644
--- a/src/gui/lineedit.cpp
+++ b/src/gui/lineedit.cpp
@@ -28,7 +28,7 @@ LineEdit::LineEdit(TQWidget* parent_, const char* name_) : KLineEdit(parent_, na
     , m_allowSpellCheck(false)
     , m_enableSpellCheck(true)
     , m_spell(0) {
-  m_spellAction = KStdAction::spelling(this, TQT_SLOT(slotCheckSpelling()), new TDEActionCollection(this));
+  m_spellAction = KStdAction::spelling(this, TQ_SLOT(slotCheckSpelling()), new TDEActionCollection(this));
 }
 
 void LineEdit::clear() {
@@ -110,19 +110,19 @@ void LineEdit::slotCheckSpelling() {
   delete m_spell;
   // re-use the action string to get translations
   m_spell = new KSpell(this, m_spellAction->text(),
-                       this, TQT_SLOT(slotSpellCheckReady(KSpell*)), 0, true, true);
-
-  connect(m_spell, TQT_SIGNAL(death()),
-          TQT_SLOT(spellCheckerFinished()));
-  connect(m_spell, TQT_SIGNAL(misspelling( const TQString &, const TQStringList &, unsigned int)),
-          TQT_SLOT(spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int)));
-  connect(m_spell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)),
-          TQT_SLOT(spellCheckerCorrected(const TQString &, const TQString &, unsigned int)));
+                       this, TQ_SLOT(slotSpellCheckReady(KSpell*)), 0, true, true);
+
+  connect(m_spell, TQ_SIGNAL(death()),
+          TQ_SLOT(spellCheckerFinished()));
+  connect(m_spell, TQ_SIGNAL(misspelling( const TQString &, const TQStringList &, unsigned int)),
+          TQ_SLOT(spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int)));
+  connect(m_spell, TQ_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)),
+          TQ_SLOT(spellCheckerCorrected(const TQString &, const TQString &, unsigned int)));
 }
 
 void LineEdit::slotSpellCheckReady(KSpell* spell) {
   spell->check(text());
-  connect(spell, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotSpellCheckDone(const TQString&)));
+  connect(spell, TQ_SIGNAL(done(const TQString&)), TQ_SLOT(slotSpellCheckDone(const TQString&)));
 }
 
 void LineEdit::slotSpellCheckDone(const TQString& newText) {
diff --git a/src/gui/linefieldwidget.cpp b/src/gui/linefieldwidget.cpp
index ee4474a..86b0ab8 100644
--- a/src/gui/linefieldwidget.cpp
+++ b/src/gui/linefieldwidget.cpp
@@ -27,7 +27,7 @@ LineFieldWidget::LineFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const
   m_lineEdit = new GUI::LineEdit(this);
   m_lineEdit->setAllowSpellCheck(true);
   m_lineEdit->setEnableSpellCheck(field_->formatFlag() != Data::Field::FormatName);
-  connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified()));
+  connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified()));
 
   registerWidget();
 
diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp
index 37673e0..2634097 100644
--- a/src/gui/listview.cpp
+++ b/src/gui/listview.cpp
@@ -28,16 +28,16 @@ using Tellico::GUI::ListViewItem;
 ListView::ListView(TQWidget* parent_, const char* name_) : TDEListView(parent_, name_/*=0*/),
     m_sortStyle(SortByText), m_isClear(true) {
   setSelectionMode(TQListView::Extended);
-  connect(this, TQT_SIGNAL(selectionChanged()),
-          TQT_SLOT(slotSelectionChanged()));
-  connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-          TQT_SLOT(slotDoubleClicked(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(selectionChanged()),
+          TQ_SLOT(slotSelectionChanged()));
+  connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+          TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
 #if !KDE_IS_VERSION(3,3,90)
   m_shadeSortColumn = false;
   // call it once to initialize
   slotUpdateColors();
 #endif
-  connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotUpdateColors()));
+  connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotUpdateColors()));
   m_comparisons.setAutoDelete(true);
 }
 
diff --git a/src/gui/numberfieldwidget.cpp b/src/gui/numberfieldwidget.cpp
index 3893f08..4fc1f46 100644
--- a/src/gui/numberfieldwidget.cpp
+++ b/src/gui/numberfieldwidget.cpp
@@ -36,8 +36,8 @@ NumberFieldWidget::NumberFieldWidget(Data::FieldPtr field_, TQWidget* parent_, c
 
 void NumberFieldWidget::initLineEdit() {
   m_lineEdit = new KLineEdit(this);
-  connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified()));
-  // connect(kl, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotHandleReturn()));
+  connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified()));
+  // connect(kl, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotHandleReturn()));
 
   // regexp is any number of digits followed optionally by any number of
   // groups of a semi-colon followed optionally by a space, followed by digits
@@ -48,10 +48,10 @@ void NumberFieldWidget::initLineEdit() {
 void NumberFieldWidget::initSpinBox() {
   // intentionally allow only positive numbers
   m_spinBox = new GUI::SpinBox(-1, INT_MAX, this);
-  connect(m_spinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(modified()));
+  connect(m_spinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(modified()));
   // TQSpinBox doesn't emit valueChanged if you edit the value with
   // the lineEdit until you change the keyboard focus
-  connect(m_spinBox->child("qt_spinbox_edit"), TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified()));
+  connect(m_spinBox->child("qt_spinbox_edit"), TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified()));
   // I want to allow no value, so set space as special text. Empty text is ignored
   m_spinBox->setSpecialValueText(TQChar(' '));
 }
diff --git a/src/gui/parafieldwidget.cpp b/src/gui/parafieldwidget.cpp
index 12444f0..28a4a25 100644
--- a/src/gui/parafieldwidget.cpp
+++ b/src/gui/parafieldwidget.cpp
@@ -27,7 +27,7 @@ ParaFieldWidget::ParaFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const
   if(field_->property(TQString::fromLatin1("tools-check-spelling")) != Latin1Literal("false")) {
     m_textEdit->setCheckSpellingEnabled(true);
   }
-  connect(m_textEdit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(modified()));
+  connect(m_textEdit, TQ_SIGNAL(textChanged()), TQ_SIGNAL(modified()));
 
   registerWidget();
 }
diff --git a/src/gui/previewdialog.cpp b/src/gui/previewdialog.cpp
index 673c465..9b129b2 100644
--- a/src/gui/previewdialog.cpp
+++ b/src/gui/previewdialog.cpp
@@ -27,7 +27,7 @@ PreviewDialog::PreviewDialog(TQWidget* parent_)
                       i18n("Template Preview"), KDialogBase::Ok)
         , m_tempDir(new KTempDir()) {
   m_tempDir->setAutoDelete(true);
-  connect(this, TQT_SIGNAL(finished()), TQT_SLOT(delayedDestruct()));
+  connect(this, TQ_SIGNAL(finished()), TQ_SLOT(delayedDestruct()));
 
   m_view = new EntryView(this);
   setMainWidget(m_view->view());
diff --git a/src/gui/ratingfieldwidget.cpp b/src/gui/ratingfieldwidget.cpp
index 77b1677..5a88adc 100644
--- a/src/gui/ratingfieldwidget.cpp
+++ b/src/gui/ratingfieldwidget.cpp
@@ -20,7 +20,7 @@ using Tellico::GUI::RatingFieldWidget;
 RatingFieldWidget::RatingFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/)
     : FieldWidget(field_, parent_, name_) {
   m_rating = new RatingWidget(field_, this);
-  connect(m_rating, TQT_SIGNAL(modified()), TQT_SIGNAL(modified()));
+  connect(m_rating, TQ_SIGNAL(modified()), TQ_SIGNAL(modified()));
 
   registerWidget();
 }
diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp
index 28867a0..2e75e67 100644
--- a/src/gui/stringmapdialog.cpp
+++ b/src/gui/stringmapdialog.cpp
@@ -41,8 +41,8 @@ StringMapDialog::StringMapDialog(const TQMap<TQString, TQString>& map_, TQWidget
   m_listView->setColumnWidthMode(0, TQListView::Maximum);
   m_listView->setColumnWidthMode(1, TQListView::Maximum);
   m_listView->setResizeMode(TQListView::AllColumns);
-  connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(slotUpdate(TQListViewItem*)));
-  connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotUpdate(TQListViewItem*)));
+  connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(slotUpdate(TQListViewItem*)));
+  connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotUpdate(TQListViewItem*)));
   l->addWidget(m_listView);
 
   TQHBox* box = new TQHBox(page);
@@ -54,9 +54,9 @@ StringMapDialog::StringMapDialog(const TQMap<TQString, TQString>& map_, TQWidget
   m_edit2 = new KLineEdit(box);
   KButtonBox* bb = new KButtonBox(box);
   bb->addStretch();
-  TQPushButton* btn = bb->addButton(i18n("&Set"), this, TQT_SLOT(slotAdd()));
+  TQPushButton* btn = bb->addButton(i18n("&Set"), this, TQ_SLOT(slotAdd()));
   btn->setIconSet(BarIcon(TQString::fromLatin1("document-new"), TDEIcon::SizeSmall));
-  btn = bb->addButton(i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  btn = bb->addButton(i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   btn->setIconSet(BarIcon(TQString::fromLatin1("edit-delete"), TDEIcon::SizeSmall));
 
   l->addWidget(box);
diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp
index d030968..724918c 100644
--- a/src/gui/tablefieldwidget.cpp
+++ b/src/gui/tablefieldwidget.cpp
@@ -49,7 +49,7 @@ TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* parent_, con
 
   m_table->verticalHeader()->setClickEnabled(true);
   m_table->verticalHeader()->installEventFilter(this);
-  connect(m_table->verticalHeader(), TQT_SIGNAL(indexChange(int, int, int)), TQT_SIGNAL(modified()));
+  connect(m_table->verticalHeader(), TQ_SIGNAL(indexChange(int, int, int)), TQ_SIGNAL(modified()));
 
   m_table->setDragEnabled(false);
   m_table->setFocusStyle(TQTable::FollowStyle);
@@ -61,10 +61,10 @@ TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* parent_, con
   m_table->setSelectionMode(TQTable::NoSelection);
   m_table->setHScrollBarMode(TQScrollView::AlwaysOff);
 
-  connect(m_table, TQT_SIGNAL(valueChanged(int, int)), TQT_SIGNAL(modified()));
-  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(slotCheckRows(int, int)));
-  connect(m_table, TQT_SIGNAL(valueChanged(int, int)), TQT_SLOT(slotResizeColumn(int, int)));
-  connect(m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint&)), TQT_SLOT(contextMenu(int, int, const TQPoint&)));
+  connect(m_table, TQ_SIGNAL(valueChanged(int, int)), TQ_SIGNAL(modified()));
+  connect(m_table, TQ_SIGNAL(currentChanged(int, int)), TQ_SLOT(slotCheckRows(int, int)));
+  connect(m_table, TQ_SIGNAL(valueChanged(int, int)), TQ_SLOT(slotResizeColumn(int, int)));
+  connect(m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint&)), TQ_SLOT(contextMenu(int, int, const TQPoint&)));
 
   registerWidget();
 }
@@ -239,7 +239,7 @@ bool TableFieldWidget::eventFilter(TQObject* obj_, TQEvent* ev_) {
       m_col = col;
       TDEPopupMenu menu(this);
       menu.insertItem(SmallIconSet(TQString::fromLatin1("edit")), i18n("Rename Column..."),
-                      this, TQT_SLOT(slotRenameColumn()));
+                      this, TQ_SLOT(slotRenameColumn()));
       menu.exec(ev->globalPos());
       return true;
     } else if(obj_ == m_table->verticalHeader()) {
@@ -272,28 +272,28 @@ void TableFieldWidget::contextMenu(int row_, int col_, const TQPoint& p_) {
   int id;
   TDEPopupMenu menu(this);
   menu.insertItem(SmallIconSet(TQString::fromLatin1("insrow")), i18n("Insert Row"),
-                  this, TQT_SLOT(slotInsertRow()));
+                  this, TQ_SLOT(slotInsertRow()));
   menu.insertItem(SmallIconSet(TQString::fromLatin1("remrow")), i18n("Remove Row"),
-                  this, TQT_SLOT(slotRemoveRow()));
+                  this, TQ_SLOT(slotRemoveRow()));
   id = menu.insertItem(SmallIconSet(TQString::fromLatin1("1uparrow")), i18n("Move Row Up"),
-                       this, TQT_SLOT(slotMoveRowUp()));
+                       this, TQ_SLOT(slotMoveRowUp()));
   if(m_row == 0) {
     menu.setItemEnabled(id, false);
   }
   id = menu.insertItem(SmallIconSet(TQString::fromLatin1("1downarrow")), i18n("Move Row Down"),
-                       this, TQT_SLOT(slotMoveRowDown()));
+                       this, TQ_SLOT(slotMoveRowDown()));
   if(m_row == m_table->numRows()-1) {
     menu.setItemEnabled(id, false);
   }
   menu.insertSeparator();
   id = menu.insertItem(SmallIconSet(TQString::fromLatin1("edit")), i18n("Rename Column..."),
-                       this, TQT_SLOT(slotRenameColumn()));
+                       this, TQ_SLOT(slotRenameColumn()));
   if(m_col < 0 || m_col > m_columns-1) {
     menu.setItemEnabled(id, false);
   }
   menu.insertSeparator();
   menu.insertItem(SmallIconSet(TQString::fromLatin1("locationbar_erase")), i18n("Clear Table"),
-                  this, TQT_SLOT(clear()));
+                  this, TQ_SLOT(clear()));
   menu.exec(p_);
 }
 
diff --git a/src/gui/urlfieldwidget.cpp b/src/gui/urlfieldwidget.cpp
index 187f8bb..6b28013 100644
--- a/src/gui/urlfieldwidget.cpp
+++ b/src/gui/urlfieldwidget.cpp
@@ -38,9 +38,9 @@ URLFieldWidget::URLFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const c
   m_requester = new KURLRequester(this);
   m_requester->lineEdit()->setCompletionObject(new URLCompletion());
   m_requester->lineEdit()->setAutoDeleteCompletionObject(true);
-  connect(m_requester, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified()));
-  connect(m_requester, TQT_SIGNAL(textChanged(const TQString&)), label(), TQT_SLOT(setURL(const TQString&)));
-  connect(label(), TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(slotOpenURL(const TQString&)));
+  connect(m_requester, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified()));
+  connect(m_requester, TQ_SIGNAL(textChanged(const TQString&)), label(), TQ_SLOT(setURL(const TQString&)));
+  connect(label(), TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(slotOpenURL(const TQString&)));
   registerWidget();
 
   // special case, remember if it's a relative url